From 7aa6e5e36c2aee4bbffda0a1ed56f7e6e508e52d Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Wed, 9 Dec 2015 11:38:31 -0700
Subject: SDK integration extensions and server create networks

Finish up the SDK integration with server create network and port
find and extension list.

Change-Id: I18dbada784d8aa92a45a937f251023ddf899c53e
---
 openstackclient/tests/network/test_common.py | 57 ----------------------------
 openstackclient/tests/network/v2/fakes.py    | 20 +++++-----
 2 files changed, 11 insertions(+), 66 deletions(-)
 delete mode 100644 openstackclient/tests/network/test_common.py

(limited to 'openstackclient/tests/network')

diff --git a/openstackclient/tests/network/test_common.py b/openstackclient/tests/network/test_common.py
deleted file mode 100644
index 58586ac0..00000000
--- a/openstackclient/tests/network/test_common.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
-
-import mock
-
-from openstackclient.network import common
-from openstackclient.tests import utils
-
-RESOURCE = 'resource'
-RESOURCES = 'resources'
-NAME = 'matrix'
-ID = 'Fishburne'
-
-
-class TestFind(utils.TestCase):
-    def setUp(self):
-        super(TestFind, self).setUp()
-        self.mock_client = mock.Mock()
-        self.list_resources = mock.Mock()
-        self.mock_client.find_resource = self.list_resources
-        self.resource = mock.Mock()
-        self.resource.id = ID
-
-    def test_name(self):
-        self.list_resources.return_value = self.resource
-
-        result = common.find(self.mock_client, RESOURCE, RESOURCES, NAME)
-
-        self.assertEqual(ID, result)
-        self.list_resources.assert_called_with(NAME, ignore_missing=False)
-
-    def test_id(self):
-        self.list_resources.return_value = self.resource
-
-        result = common.find(self.mock_client, RESOURCE, RESOURCES, NAME)
-
-        self.assertEqual(ID, result)
-        self.list_resources.assert_called_with(NAME, ignore_missing=False)
-
-    def test_nameo(self):
-        self.list_resources.return_value = self.resource
-
-        result = common.find(self.mock_client, RESOURCE, RESOURCES, NAME,
-                             name_attr='nameo')
-
-        self.assertEqual(ID, result)
-        self.list_resources.assert_called_with(NAME, ignore_missing=False)
diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py
index 10814f96..9e999114 100644
--- a/openstackclient/tests/network/v2/fakes.py
+++ b/openstackclient/tests/network/v2/fakes.py
@@ -27,19 +27,21 @@ extension_updated = '2013-07-09T12:00:0-00:00'
 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):
-- 
cgit v1.2.1