Make Fn::Select accept an integer selector again

Closes-Bug: #1245863 Change-Id: I364da88f1c581b406d51e1b584778c7dd4e2564f
openstack · Oct 29, 2013 · 11ac4dd · 11ac4dd
1 parent 614e196
commit 11ac4dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/heat/engine/template.py b/heat/engine/template.py
@@ -233,7 +233,7 @@ def resolve_select(s):
         Note: can raise ValueError and TypeError
         '''
         def handle_select(args):
-            example = '"Fn::Select": ["4", ["str1", "str2"]]'
+            example = '"Fn::Select": [1, ["str1", "str2"]]'
             if not isinstance(args, (list, tuple)):
                 raise TypeError(_('Arguments to "Fn::Select" must be a list'))
 
@@ -244,9 +244,9 @@ def handle_select(args):
                                    '"Fn::Select" should be: %s') %
                                  example)
 
-            if not isinstance(lookup, basestring):
-                raise TypeError(_('Index to "Fn::Select" '
-                                  'should be a string: %s') %
+            if not isinstance(lookup, (basestring, int)):
+                raise TypeError(_('Index to "Fn::Select" should be either a '
+                                  'string or an integer value: %s') %
                                 example)
             try:
                 index = int(lookup)

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
@@ -237,6 +237,10 @@ def test_select_from_list(self):
         data = {"Fn::Select": ["1", ["foo", "bar"]]}
         self.assertEqual(parser.Template.resolve_select(data), "bar")
 
+    def test_select_from_list_integer_index(self):
+        data = {"Fn::Select": [1, ["foo", "bar"]]}
+        self.assertEqual(parser.Template.resolve_select(data), "bar")
+
     def test_select_from_list_out_of_bound(self):
         data = {"Fn::Select": ["0", ["foo", "bar"]]}
         self.assertEqual(parser.Template.resolve_select(data), "foo")