Merge "Return parsed list value in CommaDelimitedList"

openstack · Sep 27, 2013 · dcbd7b6 · dcbd7b6
2 parents be21622 + 7f81f29
commit dcbd7b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/heat/engine/parameters.py b/heat/engine/parameters.py
@@ -249,6 +249,9 @@ def parse(self, value):
             raise ValueError(message % str(err))
         return value
 
+    def value(self):
+        return self.parsed
+
     def __len__(self):
         '''Return the length of the list.'''
         return len(self.parsed)

diff --git a/heat/tests/test_parameters.py b/heat/tests/test_parameters.py
@@ -259,7 +259,13 @@ def test_list_value_list_good(self):
         schema = {'Type': 'CommaDelimitedList',
                   'AllowedValues': ['foo', 'bar', 'baz']}
         p = self.new_parameter('p', schema, 'baz,foo,bar')
-        self.assertEqual(p.value(), 'baz,foo,bar')
+        self.assertEqual(p.value(), 'baz,foo,bar'.split(','))
+        schema['Default'] = []
+        p = self.new_parameter('p', schema)
+        self.assertEqual(p.value(), [])
+        schema['Default'] = 'baz,foo,bar'
+        p = self.new_parameter('p', schema)
+        self.assertEqual(p.value(), 'baz,foo,bar'.split(','))
 
     def test_list_value_list_bad(self):
         schema = {'Type': 'CommaDelimitedList',