Low-level Compute v2 API: network

api.compute.APIv2 network functions.

novaclient 8.0 is now released without support for the previously
deprecated nova-net functions, so include a new low-level REST
implementation of the removed APIs.

Change-Id: If230f128e91cda44461fe93c976cac2aecec2252

2 files changed, 22 insertions, 29 deletions

diff --git a/openstackclient/tests/unit/compute/v2/fakes.py b/openstackclient/tests/unit/compute/v2/fakes.py
index df674cd8..ff50f4fe 100644
--- a/openstackclient/tests/unit/compute/v2/fakes.py
+++ b/openstackclient/tests/unit/compute/v2/fakes.py
@@ -190,9 +190,6 @@ class FakeComputev2Client(object):
         self.floating_ip_pools = mock.Mock()
         self.floating_ip_pools.resource_class = fakes.FakeResource(None, {})
 
-        self.networks = mock.Mock()
-        self.networks.resource_class = fakes.FakeResource(None, {})
-
         self.keypairs = mock.Mock()
         self.keypairs.resource_class = fakes.FakeResource(None, {})
 
@@ -1155,10 +1152,7 @@ class FakeNetwork(object):
         # Overwrite default attributes.
         network_attrs.update(attrs)
 
-        network = fakes.FakeResource(info=copy.deepcopy(network_attrs),
-                                     loaded=True)
-
-        return network
+        return network_attrs
 
     @staticmethod
     def create_networks(attrs=None, count=2):
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 71288a31..cde43d32 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -91,9 +91,6 @@ class TestServerAddFixedIP(TestServer):
     def setUp(self):
         super(TestServerAddFixedIP, self).setUp()
 
-        # Get a shortcut to the compute client ServerManager Mock
-        self.networks_mock = self.app.client_manager.compute.networks
-
         # Get the command object to test
         self.cmd = server.AddFixedIP(self.app, None)
 
@@ -105,25 +102,30 @@ class TestServerAddFixedIP(TestServer):
     def _test_server_add_fixed_ip(self, extralist, fixed_ip_address):
         servers = self.setup_servers_mock(count=1)
         network = compute_fakes.FakeNetwork.create_one_network()
-        self.networks_mock.get.return_value = network
+        with mock.patch(
+            'openstackclient.api.compute_v2.APIv2.network_find'
+        ) as net_mock:
+            net_mock.return_value = network
 
-        arglist = [
-            servers[0].id,
-            network.id,
-        ] + extralist
-        verifylist = [
-            ('server', servers[0].id),
-            ('network', network.id),
-            ('fixed_ip_address', fixed_ip_address)
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+            arglist = [
+                servers[0].id,
+                network['id'],
+            ] + extralist
+            verifylist = [
+                ('server', servers[0].id),
+                ('network', network['id']),
+                ('fixed_ip_address', fixed_ip_address),
+            ]
+            parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+            result = self.cmd.take_action(parsed_args)
 
-        servers[0].interface_attach.assert_called_once_with(
-            port_id=None, net_id=network.id, fixed_ip=fixed_ip_address
-        )
-        self.assertIsNone(result)
+            servers[0].interface_attach.assert_called_once_with(
+                port_id=None,
+                net_id=network['id'],
+                fixed_ip=fixed_ip_address,
+            )
+            self.assertIsNone(result)
 
     def test_server_add_fixed_ip(self):
         self._test_server_add_fixed_ip([], None)
@@ -138,9 +140,6 @@ class TestServerAddFloatingIP(TestServer):
     def setUp(self):
         super(TestServerAddFloatingIP, self).setUp()
 
-        # Get a shortcut to the compute client ServerManager Mock
-        self.networks_mock = self.app.client_manager.compute.networks
-
         # Get the command object to test
         self.cmd = server.AddFloatingIP(self.app, None)