SDK integration extensions and server create networks

TerryHowe · TerryHowe · commit 7aa6e5e36c2a · 2015-12-09T11:39:20.000-07:00
Finish up the SDK integration with server create network and port
find and extension list.

Change-Id: I18dbada784d8aa92a45a937f251023ddf899c53e
diff --git a/openstackclient/common/extension.py b/openstackclient/common/extension.py
@@ -111,9 +111,9 @@ def take_action(self, parsed_args):
         if parsed_args.network or show_all:
             network_client = self.app.client_manager.network
             try:
-                data = network_client.list_extensions()['extensions']
+                data = network_client.extensions()
                 dict_tuples = (
-                    utils.get_dict_properties(
+                    utils.get_item_properties(
                         s,
                         columns,
                         formatters={},
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
@@ -37,7 +37,6 @@
 from openstackclient.common import utils
 from openstackclient.i18n import _  # noqa
 from openstackclient.identity import common as identity_common
-from openstackclient.network import common as network_common
 
 
 def _format_servers_list_networks(networks):
@@ -476,19 +475,13 @@ def take_action(self, parsed_args):
             if neutron_enabled:
                 network_client = self.app.client_manager.network
                 if nic_info["net-id"]:
-                    nic_info["net-id"] = network_common.find(
-                        network_client,
-                        'network',
-                        'networks',
-                        nic_info["net-id"]
-                    )
+                    net = network_client.find_network(
+                        nic_info["net-id"], ignore_missing=False)
+                    nic_info["net-id"] = net.id
                 if nic_info["port-id"]:
-                    nic_info["port-id"] = network_common.find(
-                        network_client,
-                        'port',
-                        'ports',
-                        nic_info["port-id"]
-                    )
+                    port = network_client.find_port(
+                        nic_info["port-id"], ignore_missing=False)
+                    nic_info["port-id"] = port.id
             else:
                 if nic_info["net-id"]:
                     nic_info["net-id"] = utils.find_resource(
diff --git a/openstackclient/network/common.py b/openstackclient/network/common.py
diff --git a/openstackclient/tests/common/test_extension.py b/openstackclient/tests/common/test_extension.py
@@ -34,9 +34,9 @@ def setUp(self):
             self.app.client_manager.identity.extensions)
         self.identity_extensions_mock.reset_mock()
 
-        network = network_fakes.FakeNetworkV2Client()
-        self.app.client_manager.network = network
-        self.network_extensions_mock = network.list_extensions
+        network_client = network_fakes.FakeNetworkV2Client()
+        self.app.client_manager.network = network_client
+        self.network_extensions_mock = network_client.extensions
         self.network_extensions_mock.reset_mock()
 
 
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
@@ -215,12 +215,17 @@ def test_server_create_with_network(self):
         self.app.client_manager.auth_ref.service_catalog.get_endpoints = (
             get_endpoints)
 
-        list_networks = mock.Mock()
-        list_ports = mock.Mock()
-        self.app.client_manager.network.list_networks = list_networks
-        self.app.client_manager.network.list_ports = list_ports
-        list_networks.return_value = {'networks': [{'id': 'net1_uuid'}]}
-        list_ports.return_value = {'ports': [{'id': 'port1_uuid'}]}
+        find_network = mock.Mock()
+        find_port = mock.Mock()
+        network_client = self.app.client_manager.network
+        network_client.find_network = find_network
+        network_client.find_port = find_port
+        netty = mock.Mock()
+        netty.id = 'net1_uuid'
+        porty = mock.Mock()
+        porty.id = 'port1_uuid'
+        find_network.return_value = netty
+        find_port.return_value = porty
 
         # Mock sdk APIs.
         _network = mock.Mock()
diff --git a/openstackclient/tests/network/test_common.py b/openstackclient/tests/network/test_common.py
diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py
@@ -27,19 +27,21 @@
 extension_alias = 'Dystopian'
 extension_links = '[{"href":''"https://github.com/os/network", "type"}]'
 
-NETEXT = {
-    'name': extension_name,
-    'namespace': extension_namespace,
-    'description': extension_description,
-    'updated': extension_updated,
-    'alias': extension_alias,
-    'links': extension_links,
-}
+
+def create_extension():
+    extension = mock.Mock()
+    extension.name = extension_name
+    extension.namespace = extension_namespace
+    extension.description = extension_description
+    extension.updated = extension_updated
+    extension.alias = extension_alias
+    extension.links = extension_links
+    return extension
 
 
 class FakeNetworkV2Client(object):
     def __init__(self, **kwargs):
-        self.list_extensions = mock.Mock(return_value={'extensions': [NETEXT]})
+        self.extensions = mock.Mock(return_value=[create_extension()])
 
 
 class TestNetworkV2(utils.TestCommand):
