openstack/heat
Code Issues Proposed changes

Handle list properties that do not contain objects

Browse Source 
The previous implementation of schema verfication on properties required
that the schema for the contents of a property list always be a map. Now
this is specified explicitly, so that in theory a property could also be a
list of Strings or Integers.

Change-Id: Icdd9a6c9f9b1e884f959c74f0803b7f3bd2aecc4
Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
Zane Bitter 2012-10-30 21:50:00 +01:00
parent 8e16b5168c
commit f8f6bf2a57
7 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/resources/autoscaling.py
View File

@ -43,8 +43,8 @@ class AutoScalingGroup(resource.Resource):
'AllowedValues': ['EC2', 'ELB'],
'Implemented': False},
'LoadBalancerNames': {'Type': 'List'},
'Tags': {'Type': 'List',
'Schema': tags_schema}
'Tags': {'Type': 'List', 'Schema': {'Type': 'Map',
'Schema': tags_schema}}
}
def __init__(self, name, json_snippet, stack):
@ -163,7 +163,8 @@ class LaunchConfiguration(resource.Resource):
'BlockDeviceMappings': {'Type': 'String',
'Implemented': False},
'NovaSchedulerHints': {'Type': 'List',
'Schema': tags_schema},
'Schema': {'Type': 'Map',
'Schema': tags_schema}},
}
def __init__(self, name, json_snippet, stack):

8
heat/engine/resources/instance.py
View File

@ -94,9 +94,13 @@ class Instance(resource.Resource):
'SubnetId': {'Type': 'String',
'Implemented': False},
'Tags': {'Type': 'List',
'Schema': tags_schema},
'Schema': {'Type': 'Map',
'Schema': tags_schema}},
'NovaSchedulerHints': {'Type': 'List',
'Schema': tags_schema},
'Schema': {
'Type': 'Map',
'Schema': tags_schema
}},
'Tenancy': {'Type': 'String',
'AllowedValues': ['dedicated', 'default'],
'Implemented': False},

3
heat/engine/resources/loadbalancer.py
View File

@ -192,7 +192,8 @@ class LoadBalancer(stack.Stack):
'Schema': healthcheck_schema},
'Instances': {'Type': 'List'},
'Listeners': {'Type': 'List',
'Schema': listeners_schema},
'Schema': {'Type': 'Map',
'Schema': listeners_schema}},
'AppCookieStickinessPolicy': {'Type': 'String',
'Implemented': False},
'LBCookieStickinessPolicy': {'Type': 'String',

2
heat/engine/resources/properties.py
View File

@ -110,7 +110,7 @@ class Property(object):
self._check_allowed(v)
if SCHEMA in self.schema:
prop = Property({TYPE: MAP, SCHEMA: self.schema[SCHEMA]})
prop = Property(self.schema[SCHEMA])
children = [prop.validate_data(d) for d in value]
else:
children = value

3
heat/engine/resources/quantum/port.py
View File

@ -33,7 +33,8 @@ class Port(quantum.QuantumResource):
'Default': {}},
'admin_state_up': {'Default': True},
'fixed_ips': {'Type': 'List',
'Schema': fixed_ip_schema},
'Schema': {'Type': 'Map',
'Schema': fixed_ip_schema}},
'mac_address': {'Type': 'String'},
'device_id': {'Type': 'String'},
}

5
heat/engine/resources/quantum/subnet.py
View File

@ -41,7 +41,10 @@ class Subnet(quantum.QuantumResource):
'Default': 4},
'gateway_ip': {'Type': 'String'},
'allocation_pools': {'Type': 'List',
'Schema': allocation_schema}
'Schema': {
'Type': 'Map',
'Schema': allocation_schema
}}
}
def __init__(self, name, json_snippet, stack):

16
heat/tests/test_properties.py
View File

@ -231,7 +231,8 @@ class PropertyTest(unittest.TestCase):
def test_list_schema_good(self):
map_schema = {'valid': {'Type': 'Boolean'}}
p = properties.Property({'Type': 'List', 'Schema': map_schema})
list_schema = {'Type': 'Map', 'Schema': map_schema}
p = properties.Property({'Type': 'List', 'Schema': list_schema})
self.assertEqual(p.validate_data([{'valid': 'TRUE'},
{'valid': 'False'}]),
[{'valid': 'true'},
@ -239,10 +240,21 @@ class PropertyTest(unittest.TestCase):
def test_list_schema_bad_data(self):
map_schema = {'valid': {'Type': 'Boolean'}}
p = properties.Property({'Type': 'List', 'Schema': map_schema})
list_schema = {'Type': 'Map', 'Schema': map_schema}
p = properties.Property({'Type': 'List', 'Schema': list_schema})
self.assertRaises(ValueError, p.validate_data, [{'valid': 'True'},
{'valid': 'fish'}])
def test_list_schema_int_good(self):
list_schema = {'Type': 'Integer'}
p = properties.Property({'Type': 'List', 'Schema': list_schema})
self.assertEqual(p.validate_data([1, 2, 3]), [1, 2, 3])
def test_list_schema_int_bad_data(self):
list_schema = {'Type': 'Integer'}
p = properties.Property({'Type': 'List', 'Schema': list_schema})
self.assertRaises(TypeError, p.validate_data, [42, 'fish'])
@attr(tag=['unit', 'properties'])
@attr(speed='fast')