Remove retired Qinling support

Qinling project is retiring in Wallaby cycle[1].
This commit removes the usages of Qinling project
before its code is removed.

Needed-By: https://review.opendev.org/c/openstack/qinling/+/764521

[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018638.html

Change-Id: Ic35b8fb37fb1916a6e51c147372a92cdc04281cf

lower-constraints.txt

@@ -36,5 +36,4 @@ python-ironicclient==2.7.0
 python-ironic-inspector-client==1.5.0
 python-vitrageclient==2.0.0
 python-zunclient==3.4.0
-python-qinlingclient==1.0.0
 yaql==1.1.3

mistral_extra/actions/generator_factory.py

@@ -21,7 +21,7 @@ SUPPORTED_MODULES = [
     'Nova', 'Glance', 'Keystone', 'Heat', 'Neutron', 'Cinder',
     'Trove', 'Ironic', 'Baremetal Introspection', 'Swift', 'SwiftService',
     'Zaqar', 'Barbican', 'Mistral', 'Designate', 'Magnum', 'Murano', 'Tacker',
-    'Aodh', 'Gnocchi', 'Glare', 'Vitrage', 'Senlin', 'Zun', 'Qinling', 'Manila'
+    'Aodh', 'Gnocchi', 'Glare', 'Vitrage', 'Senlin', 'Zun', 'Manila'
 ]
 
 

mistral_extra/actions/openstack/actions.py

@@ -70,7 +70,6 @@ neutronclient = _try_import('neutronclient.v2_0.client')
 nova = _try_import('novaclient')
 novaclient = _try_import('novaclient.client')
 nova_api_versions = _try_import('novaclient.api_versions')
-qinlingclient = _try_import('qinlingclient.v1.client')
 senlinclient = _try_import('senlinclient.v1.client')
 swift_client = _try_import('swiftclient.client')
 swiftservice = _try_import('swiftclient.service')
@@ -1015,28 +1014,6 @@ class ZunAction(base.OpenStackAction):
         )
 
 
-class QinlingAction(base.OpenStackAction):
-    _service_type = 'function-engine'
-
-    @classmethod
-    def _get_client_class(cls):
-        return qinlingclient.Client
-
-    def _create_client(self, context):
-        qinling_endpoint = self.get_service_endpoint()
-        session_and_auth = self.get_session_and_auth(context)
-
-        return self._get_client_class()(endpoint_override=qinling_endpoint.url,
-                                        session=session_and_auth['session'])
-
-    @classmethod
-    def _get_fake_client(cls):
-        return cls._get_client_class()(
-            endpoint_override="http://127.0.0.1:7070/",
-            session=ks_session.Session()
-        )
-
-
 class ManilaAction(base.OpenStackAction):
     _service_type = 'sharev2'
 

mistral_extra/actions/openstack/mapping.json

@@ -1307,33 +1307,6 @@
         "services_enable": "services.enable",
         "services_list": "services.list"
     },
-    "qinling": {
-        "_comment": "Qinling v1 actions",
-        "runtimes_create": "runtimes.create",
-        "runtimes_list": "runtimes.list",
-        "runtimes_get": "runtimes.get",
-        "runtimes_delete": "runtimes.delete",
-        "functions_create": "functions.create",
-        "functions_list": "functions.list",
-        "functions_get": "functions.get",
-        "functions_update": "functions.update",
-        "functions_delete": "functions.delete",
-        "function_executions_create": "function_executions.create",
-        "function_executions_list": "function_executions.list",
-        "function_executions_get": "function_executions.get",
-        "function_executions_delete": "function_executions.delete",
-        "function_executions_get_log": "function_executions.get_log",
-        "jobs_create": "jobs.create",
-        "jobs_list": "jobs.list",
-        "jobs_get": "jobs.get",
-        "jobs_update": "jobs.update",
-        "jobs_delete": "jobs.delete",
-        "webhooks_create": "webhooks.create",
-        "webhooks_list": "webhooks.list",
-        "webhooks_get": "webhooks.get",
-        "webhooks_update": "webhooks.update",
-        "webhooks_delete": "webhooks.delete"
-    },
     "manila": {
         "_comment": "It uses manilaclient.v2.",
         "availability_zones_list": "availability_zones.list",

mistral_extra/tests/unit/actions/openstack/test_generator.py

@@ -57,8 +57,7 @@ MODULE_MAPPING = {
     'gnocchi': ['gnocchi.metric_list', actions.GnocchiAction],
     'glare': ['glare.artifacts_list', actions.GlareAction],
     'vitrage': ['vitrage.alarm_get', actions.VitrageAction],
-    'zun': ['zun.containers_list', actions.ZunAction],
+    'zun': ['zun.containers_list', actions.ZunAction]
-    'qinling': ['qinling.runtimes_list', actions.QinlingAction]
 }
 
 EXTRA_MODULES = ['neutron', 'swift', 'zaqar', 'tacker', 'senlin']
@@ -89,11 +88,6 @@ class GeneratorTest(base.BaseTest):
             actions.ZunAction, "get_fake_client_method",
             return_value=lambda x: None))
 
-        # Same for Qinling client
-        self.useFixture(fixtures.MockPatchObject(
-            actions.QinlingAction, "get_fake_client_method",
-            return_value=lambda x: None))
-
     def test_generator(self):
         for generator_cls in generator_factory.all_generators():
             action_classes = generator_cls.create_actions()

mistral_extra/tests/unit/actions/openstack/test_openstack_actions.py

@@ -379,19 +379,6 @@ class OpenStackActionTest(base.BaseTestCase):
             container_id="1234-abcd"
         )
 
-    @mock.patch.object(actions.QinlingAction, '_get_client')
-    def test_qinling_action(self, mocked):
-        mock_ctx = mock.Mock()
-        method_name = "runtimes.get"
-        action_class = actions.QinlingAction
-        action_class.client_method_name = method_name
-        params = {'id': '1234-abcd'}
-        action = action_class(**params)
-        action.run(mock_ctx)
-
-        self.assertTrue(mocked().runtimes.get.called)
-        mocked().runtimes.get.assert_called_once_with(id="1234-abcd")
-
     @mock.patch.object(actions.ManilaAction, '_get_client')
     def test_manila_action(self, mocked):
         mock_ctx = mock.Mock()

releasenotes/notes/remove-qinling-suport-523fc534d7008f3f.yaml

@@ -0,0 +1,7 @@
+upgrade:
+  - |
+    The ``Qinling`` project is no longer maintained and
+    `retired since Wallaby cycle`__ . Its support is also removed
+    since Wallaby cycle.
+
+    __ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018638.html

requirements.txt

@@ -30,7 +30,6 @@ python-ironicclient!=2.7.1,!=3.0.0,>=2.7.0 # Apache-2.0
 python-ironic-inspector-client>=1.5.0 # Apache-2.0
 python-vitrageclient>=2.0.0 # Apache-2.0
 python-zunclient>=3.4.0 # Apache-2.0
-python-qinlingclient>=1.0.0 # Apache-2.0
 oauthlib>=0.6.2 # BSD
 yaql>=1.1.3 # Apache-2.0
 keystoneauth1>=3.18.0 # Apache-2.0