From c035f9299ffcb474021732429d1277ed844abab2 Mon Sep 17 00:00:00 2001
From: Ricardo Rocha <rocha.porto@gmail.com>
Date: Tue, 1 Aug 2017 14:36:24 +0000
Subject: [PATCH] OSC: Add --master-flavor to coe cluster create

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

Partial-Bug: #1699247
Depends-On: Id1d973167b381538121583a0a9691304b39e98de
Change-Id: I7ef1c2d7c19be96089fbe0f0847294073ccab04e
---
 magnumclient/osc/v1/clusters.py                 | 10 +++++++++-
 magnumclient/tests/osc/unit/v1/fakes.py         |  3 ++-
 magnumclient/tests/osc/unit/v1/test_clusters.py |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/magnumclient/osc/v1/clusters.py b/magnumclient/osc/v1/clusters.py
index bb3e75cb..27d3caef 100644
--- a/magnumclient/osc/v1/clusters.py
+++ b/magnumclient/osc/v1/clusters.py
@@ -42,7 +42,8 @@ CLUSTER_ATTRIBUTES = [
     'discovery_url',
     'master_count',
     'container_version',
-    'name'
+    'name',
+    'master_flavor_id',
 ]
 
 
@@ -101,6 +102,12 @@ class CreateCluster(command.Command):
                             metavar='<timeout>',
                             help=('The timeout for cluster creation time. The '
                                   'default is 60 minutes.'))
+        parser.add_argument(
+            '--master-flavor',
+            dest='master_flavor',
+            metavar='<master-flavor>',
+            help=_('The nova flavor name or UUID to use when launching the '
+                   'master node of the Cluster.'))
 
         return parser
 
@@ -117,6 +124,7 @@ class CreateCluster(command.Command):
             'master_count': parsed_args.master_count,
             'name': parsed_args.name,
             'node_count': parsed_args.node_count,
+            'master_flavor_id': parsed_args.master_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 cabfb85a..076aaacb 100644
--- a/magnumclient/tests/osc/unit/v1/fakes.py
+++ b/magnumclient/tests/osc/unit/v1/fakes.py
@@ -200,7 +200,8 @@ class FakeCluster(object):
             'discovery_url': 'https://fake.cluster',
             'master_count': 1,
             'container_version': None,
-            'name': 'fake-cluster'
+            'name': 'fake-cluster',
+            'master_flavor_id': None,
         }
 
         # Overwrite default attributes.
diff --git a/magnumclient/tests/osc/unit/v1/test_clusters.py b/magnumclient/tests/osc/unit/v1/test_clusters.py
index fe11764d..065f8ee2 100644
--- a/magnumclient/tests/osc/unit/v1/test_clusters.py
+++ b/magnumclient/tests/osc/unit/v1/test_clusters.py
@@ -47,7 +47,8 @@ class TestClusterCreate(TestCluster):
             'keypair': None,
             'master_count': 1,
             'name': 'fake-cluster-1',
-            'node_count': 1
+            'node_count': 1,
+            'master_flavor_id': None,
         }
 
         self.clusters_mock.create = mock.Mock()