style(servicecatalog): change servicecatalog to svcat

Author: duanhongyi

rootfs/api/models/resource.py

@@ -42,7 +42,7 @@ def save(self, *args, **kwargs):
 
     def attach(self, *args, **kwargs):
         try:
-            self._scheduler.servicecatalog.get_instance(self.app.id, self.name)
+            self._scheduler.svcat.get_instance(self.app.id, self.name)
             err = "Resource {} already exists in this namespace".format(self.name)  # noqa
             self.log(err, logging.INFO)
             raise AlreadyExists(err)
@@ -55,7 +55,7 @@ def attach(self, *args, **kwargs):
                     "instance_plan": ":".join(instance[1:]),
                     "parameters": self.options,
                 }
-                self._scheduler.servicecatalog.create_instance(
+                self._scheduler.svcat.create_instance(
                     self.app.id, self.name, **kwargs
                 )
                 data = {
@@ -80,8 +80,8 @@ def delete(self, *args, **kwargs):
     def detach(self, *args, **kwargs):
         try:
             # We raise an exception when a resource doesn't exist
-            self._scheduler.servicecatalog.get_instance(self.app.id, self.name)
-            self._scheduler.servicecatalog.delete_instance(self.app.id, self.name)
+            self._scheduler.svcat.get_instance(self.app.id, self.name)
+            self._scheduler.svcat.delete_instance(self.app.id, self.name)
         except KubeException as e:
             raise ServiceUnavailable("Could not delete resource {} for application {}".format(self.name, self.app_id)) from e  # noqa
 
@@ -102,14 +102,14 @@ def bind(self, *args, **kwargs):
         if self.binding == "Ready":
             raise DryccException("the resource is binding")
         try:
-            self._scheduler.servicecatalog.get_binding(self.app.id, self.name)
+            self._scheduler.svcat.get_binding(self.app.id, self.name)
             err = "Resource {} is binding".format(self.name)
             self.log(err, logging.INFO)
             raise AlreadyExists(err)
         except KubeException as e:
             logger.info(e)
             try:
-                self._scheduler.servicecatalog.create_binding(
+                self._scheduler.svcat.create_binding(
                     self.app.id, self.name, **kwargs)
                 data = {
                     "task_id": uuid.uuid4().hex,
@@ -126,8 +126,8 @@ def unbind(self, *args, **kwargs):
             raise DryccException("the resource is not binding")
         try:
             # We raise an exception when a resource doesn't exist
-            self._scheduler.servicecatalog.get_binding(self.app.id, self.name)
-            self._scheduler.servicecatalog.delete_binding(self.app.id, self.name)
+            self._scheduler.svcat.get_binding(self.app.id, self.name)
+            self._scheduler.svcat.delete_binding(self.app.id, self.name)
             self.binding = None
             self.data = {}
             self.save()
@@ -136,7 +136,7 @@ def unbind(self, *args, **kwargs):
 
     def attach_update(self, *args, **kwargs):
         try:
-            data = self._scheduler.servicecatalog.get_instance(
+            data = self._scheduler.svcat.get_instance(
                 self.app.id, self.name).json()
         except KubeException as e:
             self.DryccException("resource {} does not exist".format(self.name))
@@ -149,7 +149,7 @@ def attach_update(self, *args, **kwargs):
                 "parameters": self.options,
                 "external_id": data["spec"]["externalID"]
             }
-            self._scheduler.servicecatalog.put_instance(
+            self._scheduler.svcat.put_instance(
                 self.app.id, self.name, version, **kwargs
             )
             data = {
@@ -166,7 +166,7 @@ def retrieve(self, *args, **kwargs):
         update_flag = False
         if self.status != "Ready":
             try:
-                resp_i = self._scheduler.servicecatalog.get_instance(
+                resp_i = self._scheduler.svcat.get_instance(
                     self.app.id, self.name).json()
                 self.status = resp_i.get('status', {}).\
                     get('lastConditionState')
@@ -177,7 +177,7 @@ def retrieve(self, *args, **kwargs):
         if self.binding != "Ready":
             try:
                 # We raise an exception when a resource doesn't exist
-                resp_b = self._scheduler.servicecatalog.get_binding(
+                resp_b = self._scheduler.svcat.get_binding(
                     self.app.id, self.name).json()
                 self.binding = resp_b.get('status', {}).\
                     get('lastConditionState')
@@ -200,12 +200,12 @@ def retrieve(self, *args, **kwargs):
     def detach_resource(self, *args, **kwargs):
         if self.binding != "Ready":
             try:
-                resp_b = self._scheduler.servicecatalog.get_binding(
+                resp_b = self._scheduler.svcat.get_binding(
                     self.app.id, self.name).json()
                 secret_name = resp_b.get('spec', {}).get('secretName')
                 if secret_name:
                     self._scheduler.secret.delete(self.app.id, secret_name)
-                self._scheduler.servicecatalog.delete_binding(
+                self._scheduler.svcat.delete_binding(
                     self.app.id, self.name)
             except KubeException as e:
                 logger.info("delete binding info error: {}".format(e))

…fs/scheduler/resources/servicecatalog.py rootfs/scheduler/resources/svcat.pyrootfs/scheduler/resources/servicecatalog.py renamed to rootfs/scheduler/resources/svcat.py rootfs/scheduler/resources/servicecatalog.py renamed to rootfs/scheduler/resources/svcat.py

@@ -5,6 +5,7 @@
 class ServiceCatalog(Resource):
     api_version = 'servicecatalog.k8s.io/v1beta1'
     api_prefix = 'apis'
+    short_name = 'svcat'
 
     @staticmethod
     def service_instance_manifest(namespace, name, version=None, **kwargs):

…s/scheduler/tests/test_servicecatalog.py rootfs/scheduler/tests/test_svcat.pyrootfs/scheduler/tests/test_servicecatalog.py renamed to rootfs/scheduler/tests/test_svcat.py rootfs/scheduler/tests/test_servicecatalog.py renamed to rootfs/scheduler/tests/test_svcat.py

@@ -25,8 +25,8 @@ def create_instince(self, namespace=None, name=generate_random_name(),
                 "param-2": "value-2"
             }
         }
-        instance = self.scheduler.servicecatalog.create_instance(namespace,
-                                                                 name, **kwargs)
+        instance = self.scheduler.svcat.create_instance(
+            namespace, name, **kwargs)
         self.assertEqual(instance.status_code, 201, instance.json())
         return name
 
@@ -49,20 +49,19 @@ def test_delete_instance_failure(self):
             KubeHTTPException,
             msg='failed to delete serviceinstance foo in Namespace {}: 404 Not Found'.format(self.namespace)  # noqa
         ):
-            self.scheduler.servicecatalog.delete_instance(self.namespace, 'foo')
+            self.scheduler.svcat.delete_instance(self.namespace, 'foo')
 
     def test_instince_delete(self):
         # test success
         name = self.create_instince()
-        response = self.scheduler.servicecatalog.delete_instance(self.namespace,
-                                                                 name)
+        response = self.scheduler.svcat.delete_instance(self.namespace, name)
         data = response.json()
         self.assertEqual(response.status_code, 200, data)
 
     def test_get_serviceinstances(self):
         # test success
         name = self.create_instince()
-        response = self.scheduler.servicecatalog.get_instance(self.namespace)
+        response = self.scheduler.svcat.get_instance(self.namespace)
         data = response.json()
         self.assertEqual(response.status_code, 200, data)
         self.assertIn('items', data)
@@ -73,7 +72,7 @@ def test_get_serviceinstances(self):
     def test_get_serviceinstance(self):
         # test success
         name = self.create_instince()
-        response = self.scheduler.servicecatalog.get_instance(self.namespace, name)
+        response = self.scheduler.svcat.get_instance(self.namespace, name)
         data = response.json()
         self.assertEqual(response.status_code, 200, data)
         # simple verify of data
@@ -85,15 +84,14 @@ def test_get_serviceinstances_failure(self):
             KubeHTTPException,
             msg='failed to get Pod doesnotexist in Namespace {}: 404 Not Found'.format(self.namespace)  # noqa
         ):
-            self.scheduler.servicecatalog.get_instance(self.namespace,
-                                                       'doesnotexist')
+            self.scheduler.svcat.get_instance(self.namespace, 'doesnotexist')
 
     def create_binding(self, namespace=None, name=generate_random_name(),
                        **kwargs):
         name = self.create_instince()
         # these are all required even if it is kwargs...
-        instance = self.scheduler.servicecatalog.create_binding(self.namespace,
-                                                                name)
+        instance = self.scheduler.svcat.create_binding(
+            self.namespace, name)
         self.assertEqual(instance.status_code, 201, instance.json())
         return name
 
@@ -104,15 +102,15 @@ def test_create_binding(self):
     def test_binding_delete(self):
         # test success
         name = self.create_binding(namespace="test-serviceinstance")
-        response = self.scheduler.servicecatalog.delete_binding(self.namespace,
-                                                                name)
+        response = self.scheduler.svcat.delete_binding(
+            self.namespace, name)
         data = response.json()
         self.assertEqual(response.status_code, 200, data)
 
     def test_get_servicebindings(self):
         # test success
         name = self.create_binding()
-        response = self.scheduler.servicecatalog.get_binding(self.namespace)
+        response = self.scheduler.svcat.get_binding(self.namespace)
         data = response.json()
         self.assertEqual(response.status_code, 200, data)
         self.assertIn('items', data)
@@ -126,5 +124,4 @@ def test_get_servicebindings_failure(self):
             KubeHTTPException,
             msg='failed to get Pod doesnotexist in Namespace {}: 404 Not Found'.format(self.namespace)  # noqa
         ):
-            self.scheduler.servicecatalog.get_binding(self.namespace,
-                                                      'doesnotexist')
+            self.scheduler.svcat.get_binding(self.namespace, 'doesnotexist')