Merge "Add bindings for overcloud entrypoints"

tuskarclient/tests/v1/test_client.py

@@ -14,6 +14,38 @@ from tuskarclient.tests import utils as tutils
 from tuskarclient.v1 import client
 
 
+class HasManager(object):
+
+    def __init__(self, cls_name, attr_name):
+        self.cls_name = cls_name
+        self.attr_name = attr_name
+
+    def match(self, client):
+        if not hasattr(client, self.attr_name):
+            return ManagerClassMismatch(client, self.cls_name, self.attr_name)
+
+        obj = getattr(client, self.attr_name)
+        if (client != obj.api or self.cls_name != obj.__class__.__name__):
+            return ManagerClassMismatch(client, self.cls_name, self.attr_name)
+        else:
+            return None
+
+
+class ManagerClassMismatch(object):
+
+    def __init__(self, client, cls_name, attr_name):
+        self.client = client
+        self.cls_name = cls_name
+        self.attr_name = attr_name
+
+    def describe(self):
+        return "Class %r mismatch for attribute %r on %r" % (
+            self.cls_name, self.attr_name, self.client)
+
+    def get_details(self):
+        return {}
+
+
 class ClientTest(tutils.TestCase):
 
     def setUp(self):
@@ -22,22 +54,12 @@ class ClientTest(tutils.TestCase):
         self.client = client.Client(self.endpoint)
 
     def test_managers_present(self):
-        self.assertEqual("RackManager",
+        self.assertThat(self.client, HasManager('RackManager', 'racks'))
-                         self.client.racks.__class__.__name__)
+        self.assertThat(self.client, HasManager('ResourceClassManager',
-        self.assertEqual(self.client, self.client.racks.api)
+                                                'resource_classes'))
-
+        self.assertThat(self.client, HasManager('NodeManager', 'nodes'))
-        self.assertEqual("ResourceClassManager",
+        self.assertThat(self.client, HasManager('FlavorManager', 'flavors'))
-                         self.client.resource_classes.__class__.__name__)
+        self.assertThat(self.client, HasManager('DataCenterManager',
-        self.assertEqual(self.client, self.client.resource_classes.api)
+                                                'data_centers'))
-
+        self.assertThat(self.client, HasManager('OvercloudManager',
-        self.assertEqual("NodeManager",
+                                                'overclouds'))
-                         self.client.nodes.__class__.__name__)
-        self.assertEqual(self.client, self.client.nodes.api)
-
-        self.assertEqual("FlavorManager",
-                         self.client.flavors.__class__.__name__)
-        self.assertEqual(self.client, self.client.flavors.api)
-
-        self.assertEqual("DataCenterManager",
-                         self.client.data_centers.__class__.__name__)
-        self.assertEqual(self.client, self.client.data_centers.api)

tuskarclient/tests/v1/test_overclouds.py

@@ -0,0 +1,30 @@
+#    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
+
+import tuskarclient.tests.utils as tutils
+from tuskarclient.v1 import overclouds
+
+
+class OvercloudManagerTest(tutils.TestCase):
+
+    def setUp(self):
+        super(OvercloudManagerTest, self).setUp()
+        self.api = mock.Mock()
+        self.om = overclouds.OvercloudManager(self.api)
+
+    def test_get(self):
+        self.om._get = mock.Mock(return_value='fake_overcloud')
+
+        self.assertEqual(self.om.get('stack_name'), 'fake_overcloud')
+        self.om._get.assert_called_with('/v1/overclouds/stack_name')

tuskarclient/v1/client.py

@@ -14,6 +14,7 @@ from tuskarclient.common import http
 from tuskarclient.v1 import data_centers
 from tuskarclient.v1 import flavors
 from tuskarclient.v1 import nodes
+from tuskarclient.v1 import overclouds
 from tuskarclient.v1 import racks
 from tuskarclient.v1 import resource_classes
 
@@ -33,3 +34,4 @@ class Client(http.HTTPClient):
         self.flavors = flavors.FlavorManager(self)
         self.nodes = nodes.NodeManager(self)
         self.data_centers = data_centers.DataCenterManager(self)
+        self.overclouds = overclouds.OvercloudManager(self)

tuskarclient/v1/overclouds.py

@@ -0,0 +1,31 @@
+#    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.
+
+from tuskarclient.common import base
+
+
+class Overcloud(base.Resource):
+
+    def __repr__(self):
+        return "<Overcloud {0}>".format(self._info)
+
+
+class OvercloudManager(base.Manager):
+
+    resource_class = Overcloud
+
+    @staticmethod
+    def _path(stack_name):
+        return '/v1/overclouds/%s' % stack_name
+
+    def get(self, stack_name):
+        return self._get(self._single_path(stack_name))