Changes to checkeddict for tuples and required

diff --git a/heat/engine/checkeddict.py b/heat/engine/checkeddict.py
index a2b6d55750b2d75146ab2854d2b965b68fb6cb3a..0a0cdb04889a8d89f1aff2a7b158eff4195a6250 100644 (file)
--- a/heat/engine/checkeddict.py
+++ b/heat/engine/checkeddict.py
@@ -135,9 +135,11 @@ class Properties(CheckedDict):
     def validate(self):
         for key in self.data:
             # are there missing required Properties
-            if 'Required' in self.data[key] and not 'Value' in self.data[key]:
-                return {'Error': \
-                    '%s Property must be provided' % key}
+            if 'Required' in self.data[key]:
+                if self.data[key]['Required'] \
+                    and not 'Value' in self.data[key]:
+                    return {'Error': \
+                        '%s Property must be provided' % key}
 
             # are there unimplemented Properties
             if not self.data[key]['Implemented'] and 'Value' in self.data[key]:

diff --git a/heat/engine/security_group.py b/heat/engine/security_group.py
index 43083facbecb4424ea780bcc6fd3b946f37cb8e3..82a463ecdbb7dca27a2e5b2339181540b21893ed 100644 (file)
--- a/heat/engine/security_group.py
+++ b/heat/engine/security_group.py
@@ -29,9 +29,9 @@ class SecurityGroup(Resource):
                                               'Required': True},
                          'VpcId': {'Type': 'String',
                                    'Implemented': False},
-                         'SecurityGroupIngress': {'Type': 'CommaDelimitedList',
+                         'SecurityGroupIngress': {'Type': 'TuplesList',
                                                   'Implemented': False},
-                         'SecurityGroupEgress': {'Type': 'CommaDelimitedList'}}
+                         'SecurityGroupEgress': {'Type': 'TuplesList'}}
 
     def __init__(self, name, json_snippet, stack):
         super(SecurityGroup, self).__init__(name, json_snippet, stack)

diff --git a/heat/engine/volume.py b/heat/engine/volume.py
index b506ce218cfeb6dca93efa9020de879f3e07cf99..df49b20edd95a629f14774ee4175d164d7c2292d 100644 (file)
--- a/heat/engine/volume.py
+++ b/heat/engine/volume.py
@@ -28,7 +28,8 @@ class Volume(Resource):
     properties_schema = {'AvailabilityZone': {'Type': 'String',
                                               'Required': True},
                          'Size': {'Type': 'Number'},
-                         'SnapshotId': {'Type': 'String'}}
+                         'SnapshotId': {'Type': 'String'},
+                         'Tags': {'Type': 'TuplesList'}}
 
     def __init__(self, name, json_snippet, stack):
         super(Volume, self).__init__(name, json_snippet, stack)