Complete basic test infrastructure

This finally gets all of the API tests into a common framework regarding
test classes and so forth.

Change-Id: If675347129c50dcba0bfc5b6c58f5a2ca57ff46c

4 files changed, 132 insertions, 50 deletions

diff --git a/openstackclient/tests/compute/test_compute.py b/openstackclient/tests/compute/test_compute.py
deleted file mode 100644
index 9d2061d2..00000000
--- a/openstackclient/tests/compute/test_compute.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#   Copyright 2013 OpenStack, LLC.
-#
-#   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.common import clientmanager
-from openstackclient.compute import client as compute_client
-from openstackclient.tests import utils
-
-
-AUTH_TOKEN = "foobar"
-AUTH_URL = "http://0.0.0.0"
-
-
-class FakeClient(object):
-    def __init__(self, endpoint=None, **kwargs):
-        self.client = mock.MagicMock()
-        self.client.auth_url = AUTH_URL
-
-
-class TestCompute(utils.TestCase):
-    def setUp(self):
-        super(TestCompute, self).setUp()
-
-        api_version = {"compute": "2"}
-
-        compute_client.API_VERSIONS = {
-            "2": "openstackclient.tests.compute.test_compute.FakeClient"
-        }
-
-        self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,
-                                              url=AUTH_URL,
-                                              auth_url=AUTH_URL,
-                                              api_version=api_version)
-
-    def test_make_client(self):
-        self.assertEqual(self.cm.compute.client.auth_token, AUTH_TOKEN)
-        self.assertEqual(self.cm.compute.client.auth_url, AUTH_URL)
diff --git a/openstackclient/tests/compute/v2/__init__.py b/openstackclient/tests/compute/v2/__init__.py
new file mode 100644
index 00000000..c534c012
--- /dev/null
+++ b/openstackclient/tests/compute/v2/__init__.py
@@ -0,0 +1,14 @@
+#   Copyright 2013 OpenStack Foundation
+#
+#   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.
+#
diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py
new file mode 100644
index 00000000..8154449f
--- /dev/null
+++ b/openstackclient/tests/compute/v2/fakes.py
@@ -0,0 +1,55 @@
+#   Copyright 2013 Nebula Inc.
+#
+#   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.tests import fakes
+from openstackclient.tests import utils
+
+
+image_id = 'im1'
+
+IMAGE = {
+    'id': image_id,
+}
+
+
+server_id = 'serv1'
+server_name = 'waiter'
+
+SERVER = {
+    'id': server_id,
+    'name': server_name,
+}
+
+
+class FakeComputev2Client(object):
+    def __init__(self, **kwargs):
+        self.images = mock.Mock()
+        self.images.resource_class = fakes.FakeResource(None, {})
+        self.servers = mock.Mock()
+        self.servers.resource_class = fakes.FakeResource(None, {})
+        self.auth_token = kwargs['token']
+        self.management_url = kwargs['endpoint']
+
+
+class TestComputev2(utils.TestCommand):
+    def setUp(self):
+        super(TestComputev2, self).setUp()
+
+        self.app.client_manager.compute = FakeComputev2Client(
+            endpoint=fakes.AUTH_URL,
+            token=fakes.AUTH_TOKEN,
+        )
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
new file mode 100644
index 00000000..7e68808e
--- /dev/null
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -0,0 +1,63 @@
+#   Copyright 2013 Nebula Inc.
+#
+#   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 copy
+
+from openstackclient.compute.v2 import server
+from openstackclient.tests.compute.v2 import fakes as compute_fakes
+from openstackclient.tests import fakes
+
+
+class TestServer(compute_fakes.TestComputev2):
+
+    def setUp(self):
+        super(TestServer, self).setUp()
+
+        # Get a shortcut to the ServerManager Mock
+        self.servers_mock = self.app.client_manager.compute.servers
+        self.servers_mock.reset_mock()
+
+
+class TestServerDelete(TestServer):
+
+    def setUp(self):
+        super(TestServerDelete, self).setUp()
+
+        # This is the return value for utils.find_resource()
+        self.servers_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(compute_fakes.SERVER),
+            loaded=True,
+        )
+        self.servers_mock.delete.return_value = None
+
+        # Get the command object to test
+        self.cmd = server.DeleteServer(self.app, None)
+
+    def test_server_delete_no_options(self):
+        arglist = [
+            compute_fakes.server_id,
+        ]
+        verifylist = [
+            ('server', compute_fakes.server_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        self.cmd.take_action(parsed_args)
+
+        self.servers_mock.delete.assert_called_with(
+            compute_fakes.server_id,
+        )