Migrate "flavor_id" to "flavor" in scenario tests

Now you can set flavor name in scenario tests.
Also, section "flavor_id" renamed to "flavor".
Update README.rst

Change-Id: I2f57232e9666b2f56ab97595b6c09df69df75c67

etc/scenario/sahara-ci/cdh-5.3.0.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${cdh_image}
     node_group_templates:
       - name: worker-dn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - HDFS_DATANODE
         volumes_per_node: 2
@@ -15,12 +15,12 @@ clusters:
           DATANODE:
             dfs_datanode_du_reserved: 0
       - name: worker-nm
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - YARN_NODEMANAGER
         auto_security_group: true
       - name: worker-nm-dn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - YARN_NODEMANAGER
           - HDFS_DATANODE
@@ -30,12 +30,12 @@ clusters:
         node_configs:
           *ng_configs
       - name: manager
-        flavor_id: ${medium_flavor_id}
+        flavor: ${medium_flavor_id}
         node_processes:
           - CLOUDERA_MANAGER
         auto_security_group: true
       - name: master-core
-        flavor_id: ${medium_flavor_id}
+        flavor: ${medium_flavor_id}
         node_processes:
           - HDFS_NAMENODE
           - YARN_RESOURCEMANAGER
@@ -43,7 +43,7 @@ clusters:
           - ZOOKEEPER_SERVER
         auto_security_group: true
       - name: master-additional
-        flavor_id: ${medium_flavor_id}
+        flavor: ${medium_flavor_id}
         node_processes:
           - OOZIE_SERVER
           - YARN_JOBHISTORY

etc/scenario/sahara-ci/cdh-5.4.0.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${cdh_5_4_0_image}
     node_group_templates:
       - name: worker-dn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - HDFS_DATANODE
         volumes_per_node: 2
@@ -15,12 +15,12 @@ clusters:
           DATANODE:
             dfs_datanode_du_reserved: 0
       - name: worker-nm
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - YARN_NODEMANAGER
         auto_security_group: true
       - name: worker-nm-dn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - YARN_NODEMANAGER
           - HDFS_DATANODE
@@ -30,19 +30,19 @@ clusters:
         node_configs:
           *ng_configs
       - name: manager
-        flavor_id: ${large_flavor_id}
+        flavor: ${large_flavor_id}
         node_processes:
           - CLOUDERA_MANAGER
           - KMS
         auto_security_group: true
       - name: master-core
-        flavor_id: ${medium_flavor_id}
+        flavor: ${medium_flavor_id}
         node_processes:
           - HDFS_NAMENODE
           - YARN_RESOURCEMANAGER
         auto_security_group: true
       - name: master-additional
-        flavor_id: ${medium_flavor_id}
+        flavor: ${medium_flavor_id}
         node_processes:
           - OOZIE_SERVER
           - YARN_JOBHISTORY

etc/scenario/sahara-ci/fake.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${fake_plugin_image}
     node_group_templates:
       - name: worker
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - datanode
           - tasktracker
@@ -12,7 +12,7 @@ clusters:
         volumes_size: 2
         auto_security_group: true
       - name: master
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - jobtracker
           - namenode

etc/scenario/sahara-ci/hdp-1.3.2.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${hdp_image}
     node_group_templates:
       - name: master
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - JOBTRACKER
           - NAMENODE
@@ -15,7 +15,7 @@ clusters:
           - OOZIE_SERVER
         auto_security_group: false
       - name: worker
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - TASKTRACKER
           - DATANODE

etc/scenario/sahara-ci/hdp-2.0.6.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${hdp_two_image}
     node_group_templates:
       - name: master
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - AMBARI_SERVER
           - GANGLIA_SERVER
@@ -17,7 +17,7 @@ clusters:
           - ZOOKEEPER_SERVER
         auto_security_group: true
       - name: worker
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - DATANODE
           - HDFS_CLIENT

etc/scenario/sahara-ci/mapr-4.0.2.mrv2.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${mapr_402mrv2_image}
     node_group_templates:
       - name: master
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - Metrics
           - Webserver
@@ -26,7 +26,7 @@ clusters:
         volumes_per_node: 2
         volumes_size: 20
       - name: worker
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - NodeManager
           - FileServer

etc/scenario/sahara-ci/spark-1.0.0.yaml.mako

@@ -4,13 +4,13 @@ clusters:
     image: ${spark_image}
     node_group_templates:
       - name: master
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - master
           - namenode
         auto_security_group: true
       - name: worker
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - datanode
           - slave

etc/scenario/sahara-ci/transient.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${vanilla_two_six_image}
     node_group_templates:
       - name: worker
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - datanode
           - nodemanager
@@ -21,7 +21,7 @@ clusters:
             yarn.scheduler.maximum-allocation-mb: 1024
             yarn.nodemanager.vmem-check-enabled: false
       - name: master
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - oozie
           - historyserver

etc/scenario/sahara-ci/vanilla-1.2.1.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${vanilla_image}
     node_group_templates:
       - name: worker-tt-dn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - datanode
           - tasktracker
@@ -12,25 +12,25 @@ clusters:
         volumes_size: 2
         auto_security_group: true
       - name: worker-tt
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - tasktracker
         auto_security_group: true
       - name: worker-dn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - datanode
         volumes_per_node: 2
         volumes_size: 2
         auto_security_group: true
       - name: master-jt-nn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - namenode
           - jobtracker
         auto_security_group: true
       - name: master-sec-nn-oz
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - oozie
           - secondarynamenode

etc/scenario/sahara-ci/vanilla-2.6.0.yaml.mako

@@ -4,7 +4,7 @@ clusters:
     image: ${vanilla_two_six_image}
     node_group_templates:
       - name: worker-dn-nm
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - datanode
           - nodemanager
@@ -21,14 +21,14 @@ clusters:
             yarn.scheduler.maximum-allocation-mb: 1024
             yarn.nodemanager.vmem-check-enabled: false
       - name: worker-nm
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - nodemanager
         auto_security_group: true
         node_configs:
           *ng_configs
       - name: worker-dn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - datanode
         volumes_per_node: 2
@@ -37,7 +37,7 @@ clusters:
         node_configs:
           *ng_configs
       - name: master-rm-nn-hvs
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - namenode
           - resourcemanager
@@ -46,7 +46,7 @@ clusters:
         node_configs:
           *ng_configs
       - name: master-oo-hs-sn
-        flavor_id: ${ci_flavor_id}
+        flavor: ${ci_flavor_id}
         node_processes:
           - oozie
           - historyserver

sahara/tests/scenario/README.rst

@@ -199,7 +199,7 @@ This section is an array-type.
 +===========================+=========+==========+==========+=======================================+
 | name                      | string  | True     |          | name for node group template          |
 +---------------------------+---------+----------+----------+---------------------------------------+
-| flavor_id                 | string  | True     |          | id of flavor                          |
+| flavor                    | string  | True     |          | name or id of flavor                  |
 +---------------------------+---------+----------+----------+---------------------------------------+
 | node_processes            | string  | True     |          | name of process                       |
 +---------------------------+---------+----------+----------+---------------------------------------+

sahara/tests/scenario/base.py

@@ -387,10 +387,8 @@ class BaseTestCase(base.BaseTestCase):
         for ng in node_groups:
             kwargs = dict(ng)
             kwargs.update(self.plugin_opts)
-            if not kwargs.get('flavor_id'):
-                kwargs['flavor_id'] = self.nova.get_flavor_id(kwargs['flavor'])
-            if kwargs.get('flavor'):
-                del kwargs['flavor']
+            kwargs['flavor_id'] = self.nova.get_flavor_id(kwargs['flavor'])
+            del kwargs['flavor']
             kwargs['name'] = utils.rand_name(kwargs['name'])
             kwargs['floating_ip_pool'] = floating_ip_pool
             ng_id = self.__create_node_group_template(**kwargs)

sahara/tests/scenario/templates/cdh/5.3.0/node_group_template_master.json

@@ -1,6 +1,6 @@
 {
     "name": "cdh-530-master",
-    "flavor_id": "4",
+    "flavor": "4",
     "node_processes": [
         "HDFS_NAMENODE",
         "YARN_RESOURCEMANAGER",

sahara/tests/scenario/templates/cdh/5.3.0/node_group_template_master_additional.json

@@ -1,6 +1,6 @@
 {
     "name": "cdh-530-master-additional",
-    "flavor_id": "4",
+    "flavor": "4",
     "node_processes": [
         "CLOUDERA_MANAGER",
         "OOZIE_SERVER",

sahara/tests/scenario/templates/cdh/5.3.0/node_group_template_worker.json

@@ -1,6 +1,6 @@
 {
     "name": "cdh-530-worker",
-    "flavor_id": "3",
+    "flavor": "3",
     "node_processes": [
         "YARN_NODEMANAGER",
         "HDFS_DATANODE"

sahara/tests/scenario/templates/hdp/2.0.6/node_group_template_master.json

@@ -1,6 +1,6 @@
 {
     "name": "hdp-master",
-    "flavor_id": "3",
+    "flavor": "3",
     "node_processes": [
         "NAMENODE",
         "SECONDARY_NAMENODE",

sahara/tests/scenario/templates/hdp/2.0.6/node_group_template_worker.json

@@ -1,6 +1,6 @@
 {
     "name": "hdp-worker",
-    "flavor_id": "3",
+    "flavor": "3",
     "node_processes": [
         "HDFS_CLIENT",
         "DATANODE",

sahara/tests/scenario/templates/vanilla/2.6.0/node_group_template_master.json

@@ -1,6 +1,6 @@
 {
     "name": "vanilla-master",
-    "flavor_id": "3",
+    "flavor": "3",
     "node_processes": [
         "namenode",
         "resourcemanager",

sahara/tests/scenario/templates/vanilla/2.6.0/node_group_template_worker.json

@@ -1,6 +1,6 @@
 {
     "name": "vanilla-worker",
-    "flavor_id": "3",
+    "flavor": "3",
     "node_processes": [
         "datanode",
         "nodemanager"

sahara/tests/scenario/validation.py

@@ -114,10 +114,6 @@ SCHEMA = {
                                         "minLength": 1
                                     }
                                 },
-                                "flavor_id": {
-                                    "type": "string",
-                                    "minLength": 1
-                                },
                                 "flavor": {
                                     "type": "string",
                                     "minLength": 1
@@ -162,8 +158,7 @@ SCHEMA = {
                                     "type": "boolean"
                                 }
                             },
-                            "required": ["name", "flavor_id",
-                                         "node_processes"],
+                            "required": ["name", "flavor", "node_processes"],
                             "additionalProperties": False
                         }
                     },

sahara/tests/scenario_unit/test_base.py

@@ -89,12 +89,12 @@ class TestBase(testtools.TestCase):
                 {
                     'name': 'master',
                     'node_processes': ['namenode', 'oozie', 'resourcemanager'],
-                    'flavor_id': '2'
+                    'flavor': '2'
                 },
                 {
                     'name': 'worker',
                     'node_processes': ['datanode', 'nodemanager'],
-                    'flavor_id': '2'
+                    'flavor': '2'
                 }],
             'cluster_template':
                 {

sahara/tests/scenario_unit/vanilla2_6_0.yaml

@@ -23,12 +23,12 @@ clusters:
             - oozie
             - historyserver
             - secondarynamenode
-          flavor_id: '2'
+          flavor: '2'
         - name: worker
           node_processes:
             - datanode
             - nodemanager
-          flavor_id: '2'
+          flavor: '2'
       cluster_template:
           name: vanilla
           node_group_templates:

sahara/tests/scenario_unit/vanilla2_6_0.yaml.mako

@@ -24,12 +24,12 @@ clusters:
             - oozie
             - historyserver
             - secondarynamenode
-          flavor_id: ${ci_flavor_id}
+          flavor: ${ci_flavor_id}
         - name: worker
           node_processes:
             - datanode
             - nodemanager
-          flavor_id: ${ci_flavor_id}
+          flavor: ${ci_flavor_id}
       cluster_template:
           name: vanilla
           node_group_templates: