OSC: Add --flavor to coe cluster create

Add a flavor override parameter on osc cluster create to override
the value present on the cluster template.

Partial-Bug: #1699245
Depends-On: Ib60c05cce1cf2639ca4740abdd264403033433f9
Change-Id: Ib00514b66ee2d0a2ee4ddafb5b8c2ff8fa82de77

4 files changed, 10 insertions, 0 deletions

diff --git a/magnumclient/osc/v1/clusters.py b/magnumclient/osc/v1/clusters.py
index 27d3cae..3a92acd 100644
--- a/magnumclient/osc/v1/clusters.py
+++ b/magnumclient/osc/v1/clusters.py
@@ -44,6 +44,7 @@ CLUSTER_ATTRIBUTES = [
     'container_version',
     'name',
     'master_flavor_id',
+    'flavor_id',
 ]
 
 
@@ -108,6 +109,11 @@ class CreateCluster(command.Command):
             metavar='<master-flavor>',
             help=_('The nova flavor name or UUID to use when launching the '
                    'master node of the Cluster.'))
+        parser.add_argument(
+            '--flavor',
+            metavar='<flavor>',
+            help=_('The nova flavor name or UUID to use when launching the '
+                   'Cluster.'))
 
         return parser
 
@@ -125,6 +131,7 @@ class CreateCluster(command.Command):
             'name': parsed_args.name,
             'node_count': parsed_args.node_count,
             'master_flavor_id': parsed_args.master_flavor,
+            'flavor_id': parsed_args.flavor,
         }
 
         if parsed_args.labels is not None:
diff --git a/magnumclient/tests/osc/unit/v1/fakes.py b/magnumclient/tests/osc/unit/v1/fakes.py
index 034dfe7..703e3c4 100644
--- a/magnumclient/tests/osc/unit/v1/fakes.py
+++ b/magnumclient/tests/osc/unit/v1/fakes.py
@@ -203,6 +203,7 @@ class FakeCluster(object):
             'container_version': None,
             'name': 'fake-cluster',
             'master_flavor_id': None,
+            'flavor_id': 'm1.medium',
         }
 
         # Overwrite default attributes.
diff --git a/magnumclient/tests/osc/unit/v1/test_clusters.py b/magnumclient/tests/osc/unit/v1/test_clusters.py
index 065f8ee..62f7671 100644
--- a/magnumclient/tests/osc/unit/v1/test_clusters.py
+++ b/magnumclient/tests/osc/unit/v1/test_clusters.py
@@ -44,6 +44,7 @@ class TestClusterCreate(TestCluster):
             'discovery_url': None,
             'docker_volume_size': None,
             'labels': {},
+            'flavor_id': None,
             'keypair': None,
             'master_count': 1,
             'name': 'fake-cluster-1',
diff --git a/magnumclient/v1/clusters.py b/magnumclient/v1/clusters.py
index df5ebfe..cdb599a 100644
--- a/magnumclient/v1/clusters.py
+++ b/magnumclient/v1/clusters.py
@@ -22,6 +22,7 @@ CREATION_ATTRIBUTES.append('keypair')
 CREATION_ATTRIBUTES.append('docker_volume_size')
 CREATION_ATTRIBUTES.append('labels')
 CREATION_ATTRIBUTES.append('master_flavor_id')
+CREATION_ATTRIBUTES.append('flavor_id')
 
 
 class Cluster(baseunit.BaseTemplate):