Merge "Use "flavor" service attribute to select OpenStack flavor"

conductor/workflow.py

@@ -95,22 +95,27 @@ class Workflow(object):
             return position + suffix.split('.')
 
     @staticmethod
-    def _select_func(context, path='', source=None, **kwargs):
+    def _select_func(context, path='', source=None, default=None, **kwargs):
 
+        result = None
         if path.startswith('##'):
             config = context['/config']
-            return config[path[2:]]
+            result = config[path[2:]]
         elif path.startswith('#'):
-            return context[path[1:]]
+            result = context[path[1:]]
-
+        elif source is not None:
-        if source is not None:
+            result = Workflow._get_path(
-            return Workflow._get_path(
                 context[source], path.split('.'))
         else:
-            return Workflow._get_path(
+            result = Workflow._get_path(
                 context['/dataSource'],
                 Workflow._correct_position(path, context))
 
+        if not result and default is not None:
+            result = default
+
+        return result
+
     @staticmethod
     def _set_func(path, context, body, engine, target=None, **kwargs):
         body_data = engine.evaluate_content(body, context)

data/workflows/AD.xml

@@ -25,7 +25,7 @@
 			</parameter>
 			<parameter name="arguments">
 				<map>
-					<argument name="InstanceType">m1.medium</argument>
+					<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
 					<argument name="ImageName">ws-2012-full</argument>
 				</map>
 			</parameter>

data/workflows/AspNetApps.xml

@@ -25,7 +25,7 @@
 			</parameter>
 			<parameter name="arguments">
 				<map>
-					<argument name="InstanceType">m1.medium</argument>
+					<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
 					<argument name="ImageName">ws-2012-full</argument>
 				</map>
 			</parameter>

data/workflows/MsSqlServer.xml

@@ -25,7 +25,7 @@
 			</parameter>
 			<parameter name="arguments">
 				<map>
-					<argument name="InstanceType">m1.medium</argument>
+					<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
 					<argument name="ImageName">ws-2012-full</argument>
 				</map>
 			</parameter>