Follow Boolean Option rule

OSC has a specific rule for handling boolean based options
in  [1]. This patch modifies the exisiting code so that it
matches the criteria that have been specified in [1].

[1]: http://docs.openstack.org/developer/python-openstackclient/command-options.html#boolean-options

Closes-Bug: #1559418
Change-Id: I182381d5579efbc75a5d3e8a91f412398abf5c3c

3 files changed, 23 insertions, 25 deletions

diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 884a6e81..26b98f77 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -116,8 +116,8 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         ]
         verifylist = [
             ('name', self._network.name),
-            ('admin_state', True),
-            ('shared', None),
+            ('enable', True),
+            ('share', None),
             ('project', None),
         ]
 
@@ -141,8 +141,8 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             self._network.name,
         ]
         verifylist = [
-            ('admin_state', False),
-            ('shared', True),
+            ('disable', True),
+            ('share', True),
             ('project', identity_fakes_v3.project_name),
             ('project_domain', identity_fakes_v3.domain_name),
             ('availability_zone_hints', ["nova"]),
@@ -169,8 +169,8 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             self._network.name,
         ]
         verifylist = [
-            ('admin_state', True),
-            ('shared', False),
+            ('enable', True),
+            ('no_share', True),
             ('name', self._network.name),
         ]
 
@@ -249,8 +249,8 @@ class TestCreateNetworkIdentityV2(TestNetwork):
             self._network.name,
         ]
         verifylist = [
-            ('admin_state', True),
-            ('shared', None),
+            ('enable', True),
+            ('share', None),
             ('name', self._network.name),
             ('project', identity_fakes_v2.project_name),
         ]
@@ -273,8 +273,8 @@ class TestCreateNetworkIdentityV2(TestNetwork):
             self._network.name,
         ]
         verifylist = [
-            ('admin_state', True),
-            ('shared', None),
+            ('enable', True),
+            ('share', None),
             ('project', identity_fakes_v3.project_name),
             ('project_domain', identity_fakes_v3.domain_name),
             ('name', self._network.name),
@@ -455,9 +455,9 @@ class TestSetNetwork(TestNetwork):
         ]
         verifylist = [
             ('network', self._network.name),
-            ('admin_state', True),
+            ('enable', True),
             ('name', 'noob'),
-            ('shared', True),
+            ('share', True),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -480,8 +480,8 @@ class TestSetNetwork(TestNetwork):
         ]
         verifylist = [
             ('network', self._network.name),
-            ('admin_state', False),
-            ('shared', False),
+            ('disable', True),
+            ('no_share', True),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/network/v2/test_port.py b/openstackclient/tests/network/v2/test_port.py
index cdbc699a..cb1af2b8 100644
--- a/openstackclient/tests/network/v2/test_port.py
+++ b/openstackclient/tests/network/v2/test_port.py
@@ -103,7 +103,7 @@ class TestCreatePort(TestPort):
         ]
         verifylist = [
             ('network', self._port.network_id,),
-            ('admin_state', True),
+            ('enable', True),
             ('name', 'test-port'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -143,7 +143,7 @@ class TestCreatePort(TestPort):
             ),
             ('device', 'deviceid'),
             ('device_owner', 'fakeowner'),
-            ('admin_state', False),
+            ('disable', True),
             ('vnic_type', 'macvtap'),
             ('binding_profile', {'foo': 'bar', 'foo2': 'bar2'}),
             ('network', self._port.network_id),
@@ -301,7 +301,7 @@ class TestSetPort(TestPort):
             self._port.name,
         ]
         verifylist = [
-            ('admin_state', False),
+            ('disable', True),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -322,7 +322,7 @@ class TestSetPort(TestPort):
             self._port.name,
         ]
         verifylist = [
-            ('admin_state', True),
+            ('enable', True),
             ('vnic_type', 'macvtap'),
             ('binding_profile', {'foo': 'bar'}),
             ('host', 'binding-host-id-xxxx'),
diff --git a/openstackclient/tests/network/v2/test_router.py b/openstackclient/tests/network/v2/test_router.py
index f3bf363d..4aaa68e4 100644
--- a/openstackclient/tests/network/v2/test_router.py
+++ b/openstackclient/tests/network/v2/test_router.py
@@ -73,7 +73,7 @@ class TestCreateRouter(TestRouter):
         ]
         verifylist = [
             ('name', self.new_router.name),
-            ('admin_state_up', True),
+            ('enable', True),
             ('distributed', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -83,7 +83,6 @@ class TestCreateRouter(TestRouter):
         self.network.create_router.assert_called_once_with(**{
             'admin_state_up': True,
             'name': self.new_router.name,
-            'distributed': False,
         })
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
@@ -97,7 +96,7 @@ class TestCreateRouter(TestRouter):
         verifylist = [
             ('name', self.new_router.name),
             ('availability_zone_hints', ['fake-az', 'fake-az2']),
-            ('admin_state_up', True),
+            ('enable', True),
             ('distributed', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -106,7 +105,6 @@ class TestCreateRouter(TestRouter):
         self.network.create_router.assert_called_once_with(**{
             'admin_state_up': True,
             'name': self.new_router.name,
-            'distributed': False,
             'availability_zone_hints': ['fake-az', 'fake-az2'],
         })
 
@@ -252,7 +250,7 @@ class TestSetRouter(TestRouter):
         ]
         verifylist = [
             ('router', self._router.name),
-            ('admin_state_up', True),
+            ('enable', True),
             ('distributed', True),
             ('name', 'noob'),
         ]
@@ -277,8 +275,8 @@ class TestSetRouter(TestRouter):
         ]
         verifylist = [
             ('router', self._router.name),
-            ('admin_state_up', False),
-            ('distributed', False),
+            ('disable', True),
+            ('centralized', True),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)