Merge "SDK refactor: Prepare network commands"

2 files changed, 53 insertions, 23 deletions

diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py
index b19a33b8..84f145fb 100644
--- a/openstackclient/tests/unit/network/v2/fakes.py
+++ b/openstackclient/tests/unit/network/v2/fakes.py
@@ -297,15 +297,17 @@ class FakeNetwork(object):
             'admin_state_up': True,
             'shared': False,
             'subnets': ['a', 'b'],
-            'provider_network_type': 'vlan',
-            'provider_physical_network': 'physnet1',
-            'provider_segmentation_id': "400",
+            'provider:network_type': 'vlan',
+            'provider:physical_network': 'physnet1',
+            'provider:segmentation_id': "400",
             'router:external': True,
             'availability_zones': [],
             'availability_zone_hints': [],
             'is_default': False,
             'port_security_enabled': True,
             'qos_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
+            'ipv4_address_scope': 'ipv4' + uuid.uuid4().hex,
+            'ipv6_address_scope': 'ipv6' + uuid.uuid4().hex,
         }
 
         # Overwrite default attributes.
@@ -317,8 +319,21 @@ class FakeNetwork(object):
         # Set attributes with special mapping in OpenStack SDK.
         network.project_id = network_attrs['tenant_id']
         network.is_router_external = network_attrs['router:external']
+        network.is_admin_state_up = network_attrs['admin_state_up']
         network.is_port_security_enabled = \
             network_attrs['port_security_enabled']
+        network.subnet_ids = network_attrs['subnets']
+        network.is_shared = network_attrs['shared']
+        network.provider_network_type = \
+            network_attrs['provider:network_type']
+        network.provider_physical_network = \
+            network_attrs['provider:physical_network']
+        network.provider_segmentation_id = \
+            network_attrs['provider:segmentation_id']
+        network.ipv4_address_scope_id = \
+            network_attrs['ipv4_address_scope']
+        network.ipv6_address_scope_id = \
+            network_attrs['ipv6_address_scope']
 
         return network
 
diff --git a/openstackclient/tests/unit/network/v2/test_network.py b/openstackclient/tests/unit/network/v2/test_network.py
index 96b1b102..c5283443 100644
--- a/openstackclient/tests/unit/network/v2/test_network.py
+++ b/openstackclient/tests/unit/network/v2/test_network.py
@@ -62,13 +62,15 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         'availability_zones',
         'description',
         'id',
+        'ipv4_address_scope',
+        'ipv6_address_scope',
         'is_default',
         'name',
         'port_security_enabled',
         'project_id',
-        'provider_network_type',
-        'provider_physical_network',
-        'provider_segmentation_id',
+        'provider:network_type',
+        'provider:physical_network',
+        'provider:segmentation_id',
         'qos_policy_id',
         'router:external',
         'shared',
@@ -82,6 +84,8 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         utils.format_list(_network.availability_zones),
         _network.description,
         _network.id,
+        _network.ipv4_address_scope_id,
+        _network.ipv6_address_scope_id,
         _network.is_default,
         _network.name,
         _network.is_port_security_enabled,
@@ -236,13 +240,15 @@ class TestCreateNetworkIdentityV2(TestNetwork):
         'availability_zones',
         'description',
         'id',
+        'ipv4_address_scope',
+        'ipv6_address_scope',
         'is_default',
         'name',
         'port_security_enabled',
         'project_id',
-        'provider_network_type',
-        'provider_physical_network',
-        'provider_segmentation_id',
+        'provider:network_type',
+        'provider:physical_network',
+        'provider:segmentation_id',
         'qos_policy_id',
         'router:external',
         'shared',
@@ -256,6 +262,8 @@ class TestCreateNetworkIdentityV2(TestNetwork):
         utils.format_list(_network.availability_zones),
         _network.description,
         _network.id,
+        _network.ipv4_address_scope_id,
+        _network.ipv6_address_scope_id,
         _network.is_default,
         _network.name,
         _network.is_port_security_enabled,
@@ -512,7 +520,7 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'router:external': True}
+            **{'router:external': True, 'is_router_external': True}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -529,7 +537,7 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'router:external': False}
+            **{'router:external': False, 'is_router_external': False}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -585,7 +593,7 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'admin_state_up': True}
+            **{'admin_state_up': True, 'is_admin_state_up': True}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -603,7 +611,7 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'admin_state_up': False}
+            **{'admin_state_up': False, 'is_admin_state_up': False}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -621,7 +629,7 @@ class TestListNetwork(TestNetwork):
 
         columns, data = self.cmd.take_action(parsed_args)
         self.network.networks.assert_called_once_with(
-            **{'tenant_id': project.id}
+            **{'tenant_id': project.id, 'project_id': project.id}
         )
 
         self.assertEqual(self.columns, columns)
@@ -640,7 +648,7 @@ class TestListNetwork(TestNetwork):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        filters = {'tenant_id': project.id}
+        filters = {'tenant_id': project.id, 'project_id': project.id}
 
         self.network.networks.assert_called_once_with(**filters)
         self.assertEqual(self.columns, columns)
@@ -658,7 +666,7 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'shared': True}
+            **{'shared': True, 'is_shared': True}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -675,7 +683,7 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'shared': False}
+            **{'shared': False, 'is_shared': False}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -711,7 +719,8 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'provider:network_type': network_type}
+            **{'provider:network_type': network_type,
+               'provider_network_type': network_type}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -728,7 +737,8 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'provider:physical_network': physical_network}
+            **{'provider:physical_network': physical_network,
+               'provider_physical_network': physical_network}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -745,7 +755,8 @@ class TestListNetwork(TestNetwork):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.networks.assert_called_once_with(
-            **{'provider:segmentation_id': segmentation_id}
+            **{'provider:segmentation_id': segmentation_id,
+               'provider_segmentation_id': segmentation_id}
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
@@ -878,13 +889,15 @@ class TestShowNetwork(TestNetwork):
         'availability_zones',
         'description',
         'id',
+        'ipv4_address_scope',
+        'ipv6_address_scope',
         'is_default',
         'name',
         'port_security_enabled',
         'project_id',
-        'provider_network_type',
-        'provider_physical_network',
-        'provider_segmentation_id',
+        'provider:network_type',
+        'provider:physical_network',
+        'provider:segmentation_id',
         'qos_policy_id',
         'router:external',
         'shared',
@@ -898,6 +911,8 @@ class TestShowNetwork(TestNetwork):
         utils.format_list(_network.availability_zones),
         _network.description,
         _network.id,
+        _network.ipv4_address_scope_id,
+        _network.ipv6_address_scope_id,
         _network.is_default,
         _network.name,
         _network.is_port_security_enabled,