From 19c0dc5fd9a30ed8877bd6451f0136dcd509188e Mon Sep 17 00:00:00 2001
From: "OTSUKA, Yuanying" <yuanying@fraction.jp>
Date: Thu, 30 Jun 2016 17:10:29 +0900
Subject: [PATCH] Add fixed_subnet attributes to baymodel

fixed_subnet option is added by server, so we should add
this option to client too.

Change-Id: I3963b069ae8dde09f696e03cc43c5c37f8cc971b
Partial-Implements: blueprint magnum-baremetal-full-support
Depends-On: Ia21ad6e3e1472a0d078d08369ef62601034fcc17
---
 magnumclient/tests/v1/test_baymodels.py       | 3 +++
 magnumclient/tests/v1/test_baymodels_shell.py | 3 ++-
 magnumclient/v1/baymodels.py                  | 6 +++---
 magnumclient/v1/baymodels_shell.py            | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/magnumclient/tests/v1/test_baymodels.py b/magnumclient/tests/v1/test_baymodels.py
index fb4f6fe..fba9030 100644
--- a/magnumclient/tests/v1/test_baymodels.py
+++ b/magnumclient/tests/v1/test_baymodels.py
@@ -30,6 +30,7 @@ BAYMODEL1 = {'id': 123,
              'keypair_id': 'keypair1',
              'external_network_id': 'd1f02cfb-d27f-4068-9332-84d907cb0e21',
              'fixed_network': 'private',
+             'fixed_subnet': 'private-subnet',
              'network_driver': 'libnetwork',
              'volume_driver': 'rexray',
              'dns_nameserver': '8.8.1.1',
@@ -247,6 +248,7 @@ class BayModelManagerTest(testtools.TestCase):
         self.assertEqual(BAYMODEL1['docker_storage_driver'],
                          baymodel.docker_storage_driver)
         self.assertEqual(BAYMODEL1['fixed_network'], baymodel.fixed_network)
+        self.assertEqual(BAYMODEL1['fixed_subnet'], baymodel.fixed_subnet)
         self.assertEqual(BAYMODEL1['coe'], baymodel.coe)
         self.assertEqual(BAYMODEL1['http_proxy'], baymodel.http_proxy)
         self.assertEqual(BAYMODEL1['https_proxy'], baymodel.https_proxy)
@@ -272,6 +274,7 @@ class BayModelManagerTest(testtools.TestCase):
         self.assertEqual(BAYMODEL1['docker_storage_driver'],
                          baymodel.docker_storage_driver)
         self.assertEqual(BAYMODEL1['fixed_network'], baymodel.fixed_network)
+        self.assertEqual(BAYMODEL1['fixed_subnet'], baymodel.fixed_subnet)
         self.assertEqual(BAYMODEL1['coe'], baymodel.coe)
         self.assertEqual(BAYMODEL1['http_proxy'], baymodel.http_proxy)
         self.assertEqual(BAYMODEL1['https_proxy'], baymodel.https_proxy)
diff --git a/magnumclient/tests/v1/test_baymodels_shell.py b/magnumclient/tests/v1/test_baymodels_shell.py
index b54d930..b90d5e6 100644
--- a/magnumclient/tests/v1/test_baymodels_shell.py
+++ b/magnumclient/tests/v1/test_baymodels_shell.py
@@ -46,7 +46,8 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
                                '--coe swarm '
                                '--dns-nameserver test_dns '
                                '--flavor-id test_flavor '
-                               '--fixed-network public '
+                               '--fixed-network private '
+                               '--fixed-network private-subnet '
                                '--volume-driver test_volume '
                                '--network-driver test_driver '
                                '--labels key=val '
diff --git a/magnumclient/v1/baymodels.py b/magnumclient/v1/baymodels.py
index 582519d..55bed8b 100644
--- a/magnumclient/v1/baymodels.py
+++ b/magnumclient/v1/baymodels.py
@@ -17,9 +17,9 @@ from magnumclient import exceptions
 
 CREATION_ATTRIBUTES = ['name', 'image_id', 'flavor_id', 'master_flavor_id',
                        'keypair_id', 'external_network_id', 'fixed_network',
-                       'dns_nameserver', 'docker_volume_size', 'labels',
-                       'coe', 'http_proxy', 'https_proxy', 'no_proxy',
-                       'network_driver', 'tls_disabled', 'public',
+                       'fixed_subnet', 'dns_nameserver', 'docker_volume_size',
+                       'labels', 'coe', 'http_proxy', 'https_proxy',
+                       'no_proxy', 'network_driver', 'tls_disabled', 'public',
                        'registry_enabled', 'volume_driver', 'server_type',
                        'docker_storage_driver']
 
diff --git a/magnumclient/v1/baymodels_shell.py b/magnumclient/v1/baymodels_shell.py
index 6e0e411..9fc58c4 100644
--- a/magnumclient/v1/baymodels_shell.py
+++ b/magnumclient/v1/baymodels_shell.py
@@ -49,6 +49,9 @@ def _show_baymodel(baymodel):
            metavar='<fixed-network>',
            help='The private Neutron network name to connect to this bay'
            ' model.')
+@utils.arg('--fixed-subnet',
+           metavar='<fixed-subnet>',
+           help='The private Neutron subnet name to connect to bay.')
 @utils.arg('--network-driver',
            metavar='<network-driver>',
            help='The network driver name for instantiating container'
@@ -118,6 +121,7 @@ def do_baymodel_create(cs, args):
     opts['keypair_id'] = args.keypair_id
     opts['external_network_id'] = args.external_network_id
     opts['fixed_network'] = args.fixed_network
+    opts['fixed_subnet'] = args.fixed_subnet
     opts['network_driver'] = args.network_driver
     opts['volume_driver'] = args.volume_driver
     opts['dns_nameserver'] = args.dns_nameserver