upstream update: _get_microversion, _update, reporting (#576)

tischrei · web-flow · commit c9be78de894a · 2025-05-06T13:46:29.000Z
upstream update: _get_microversion, _update, reporting

…removed in OpenStack

Reviewed-by: Anton Sidelnikov
diff --git a/.stestr.blacklist.functional b/.stestr.blacklist.functional
@@ -40,3 +40,4 @@ otcextensions.tests.functional.sdk.function_graph.v2*
 otcextensions.tests.functional.sdk.apig.v2*
 otcextensions.tests.functional.sdk.network.v2.test_cleanup
 otcextensions.tests.functional.sdk.rts*
+otcextensions.tests.functional.sdk.dcs.v1*
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -35,7 +35,7 @@
     check:
       jobs:
         - otc-tox-pep8
-        - otc-tox-py39
+        - otc-tox-py310
         - tox-functional-eu-de
         - tox-functional-eu-nl:
             voting: false
@@ -44,7 +44,7 @@
         - otce-upload-image
     gate:
       jobs:
-        - otc-tox-py39
+        - otc-tox-py310
         - otc-tox-pep8
         - tox-functional-eu-de
         - otce-upload-image
diff --git a/AUTHORS b/AUTHORS
@@ -18,7 +18,6 @@ Polina Gubina <33940358+Polina-Gubina@users.noreply.github.com>
 Reik Keutterling <spielkind@gmail.com>
 Rodion Gyrbu <rodion.gyrbu@t-systems.com>
 RusselSand <48719909+RusselSand@users.noreply.github.com>
-Sebastian Gode <sebastian.gode@telekom.de>
 SebastianGode <70581801+SebastianGode@users.noreply.github.com>
 T. Schreiber <tino.schreiber@t-systems.com>
 Tino Schr <tino.schreiber@t-systems.com>
@@ -32,6 +31,7 @@ YustinaKvr <62885041+YustinaKvr@users.noreply.github.com>
 Zsolt Nagy <zsoltn@gmail.com>
 ameszi <morpheus89@gmail.com>
 ghodi <hodigy@gmail.com>
+harald-tsys <47421691+harald-tsys@users.noreply.github.com>
 hlange4 <52819910+hlange4@users.noreply.github.com>
 hodigy <hodigy@gmail.com>
 kucerakk <kucerakk@gmail.com>
diff --git a/otcextensions/sdk/apig/v2/signature_binding.py b/otcextensions/sdk/apig/v2/signature_binding.py
@@ -112,7 +112,7 @@ def create(
 
         session = self._get_session(session)
         if microversion is None:
-            microversion = self._get_microversion(session, action='create')
+            microversion = self._get_microversion(session)
         requires_id = (
             self.create_requires_id
             if self.create_requires_id is not None
diff --git a/otcextensions/sdk/apig/v2/throttling_policy_binding.py b/otcextensions/sdk/apig/v2/throttling_policy_binding.py
@@ -160,7 +160,7 @@ def create(
 
         session = self._get_session(session)
         if microversion is None:
-            microversion = self._get_microversion(session, action='create')
+            microversion = self._get_microversion(session)
         requires_id = (
             self.create_requires_id
             if self.create_requires_id is not None
diff --git a/otcextensions/sdk/auto_scaling/v1/group.py b/otcextensions/sdk/auto_scaling/v1/group.py
@@ -129,7 +129,7 @@ def delete(self, session, error_message=None, force_delete=False):
         request = self._prepare_request(params=params)
 
         session = self._get_session(session)
-        microversion = self._get_microversion(session, action='delete')
+        microversion = self._get_microversion(session)
 
         response = session.delete(request.url, headers=request.headers,
                                   microversion=microversion)
diff --git a/otcextensions/sdk/cce/v3/_base.py b/otcextensions/sdk/cce/v3/_base.py
@@ -201,7 +201,7 @@ def list(cls, session, paginated=True, base_path=None, **params):
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, "list")
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/css/v1/flavor.py b/otcextensions/sdk/css/v1/flavor.py
@@ -72,7 +72,7 @@ def list(cls, session, paginated=True, base_path=None, **params):
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, "list")
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/ctsv3/v3/_proxy.py b/otcextensions/sdk/ctsv3/v3/_proxy.py
@@ -38,7 +38,7 @@ def update_key_event(self, **attrs):
         :returns: The updated key event
         :rtype: :class:`~otcextensions.sdk.ctsv3.v3.key_event.KeyEvent`
          """
-        return self._update(_key_event.KeyEvent, **attrs)
+        return self._update(_key_event.KeyEvent, "", **attrs)
 
     def delete_key_event(self, notification):
         """Delete an event
diff --git a/otcextensions/sdk/dds/v3/datastore.py b/otcextensions/sdk/dds/v3/datastore.py
@@ -37,7 +37,7 @@ def list(cls, session, paginated=True, base_path=None,
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, "list")
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/dds/v3/recycle_instance.py b/otcextensions/sdk/dds/v3/recycle_instance.py
@@ -41,7 +41,7 @@ class RecycleInstance(resource.Resource):
     @classmethod
     def list(cls, session, paginated=True, base_path=None, **params):
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
         response = session.get(
             base_path,
             headers={"Content-Type": "application/json"},
diff --git a/otcextensions/sdk/dds/v3/recycle_policy.py b/otcextensions/sdk/dds/v3/recycle_policy.py
@@ -36,7 +36,7 @@ def fetch(self, session, requires_id=False, base_path=None,
         )
         session = self._get_session(session)
         if microversion is None:
-            microversion = self._get_microversion(session, action='fetch')
+            microversion = self._get_microversion(session)
         response = session.get(
             request.url,
             headers={"Content-Type": "application/json"},
@@ -55,7 +55,7 @@ def create(self, session, prepend_key=True, base_path=None, *,
             raise exceptions.MethodNotSupported(self, 'create')
         session = self._get_session(session)
         if microversion is None:
-            microversion = self._get_microversion(session, action='create')
+            microversion = self._get_microversion(session)
         request_kwargs = {
             "requires_id": self.requires_id,
             "prepend_key": prepend_key,
diff --git a/otcextensions/sdk/dis/v2/app.py b/otcextensions/sdk/dis/v2/app.py
@@ -80,7 +80,7 @@ def list(cls, session, paginated=True, base_path=None,
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, "list")
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/dis/v2/stream.py b/otcextensions/sdk/dis/v2/stream.py
@@ -107,7 +107,7 @@ def list(cls, session, paginated=True, base_path=None,
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, "list")
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/dms/v1/message.py b/otcextensions/sdk/dms/v1/message.py
@@ -47,7 +47,7 @@ class Message(resource.Resource):
     def list(cls, session, paginated=True, base_path=None,
              allow_unknown_params=False, **params):
 
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/dws/v1/flavor.py b/otcextensions/sdk/dws/v1/flavor.py
@@ -76,7 +76,7 @@ def list(cls, session, paginated=True, base_path=None, **params):
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, 'list')
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/function_graph/v2/metric.py b/otcextensions/sdk/function_graph/v2/metric.py
@@ -115,7 +115,7 @@ def list(
             elif params['filter'] == 'monthly_report':
                 cls.resources_key = 'monthly_report'
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/function_graph/v2/reserved_instance.py b/otcextensions/sdk/function_graph/v2/reserved_instance.py
@@ -105,7 +105,7 @@ def list(
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, "list")
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action='list')
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/job.py b/otcextensions/sdk/job.py
@@ -70,7 +70,7 @@ def fetch(self, session, requires_id=True,
             request.url = self.base_path + '?id=' + self.id
             self.resource_key = 'job'
         session = self._get_session(session)
-        microversion = self._get_microversion(session, action='fetch')
+        microversion = self._get_microversion(session)
         response = session.get(request.url, microversion=microversion,
                                params=params)
         kwargs = {}
diff --git a/otcextensions/sdk/lts/v2/group.py b/otcextensions/sdk/lts/v2/group.py
@@ -93,7 +93,7 @@ def commit(
             **kwargs,
         )
         if microversion is None:
-            microversion = self._get_microversion(session, action='commit')
+            microversion = self._get_microversion(session)
 
         return self._commit(
             session,
diff --git a/otcextensions/sdk/lts/v2/stream.py b/otcextensions/sdk/lts/v2/stream.py
@@ -58,7 +58,7 @@ def list(
         session = cls._get_session(session)
 
         if microversion is None:
-            microversion = cls._get_microversion(session, action='list')
+            microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/modelartsv1/v1/_base.py b/otcextensions/sdk/modelartsv1/v1/_base.py
@@ -33,7 +33,7 @@ def list(
         if not cls.allow_list:
             raise exceptions.MethodNotSupported(cls, "list")
         session = cls._get_session(session)
-        microversion = cls._get_microversion(session, action="list")
+        microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/modelartsv2/v2/_base.py b/otcextensions/sdk/modelartsv2/v2/_base.py
@@ -69,7 +69,7 @@ def list(
         session = cls._get_session(session)
 
         if microversion is None:
-            microversion = cls._get_microversion(session, action="list")
+            microversion = cls._get_microversion(session)
 
         if base_path is None:
             base_path = cls.base_path
diff --git a/otcextensions/sdk/proxy.py b/otcextensions/sdk/proxy.py
@@ -11,6 +11,7 @@
 # under the License.
 
 from openstack import proxy
+import requests
 
 
 def normalize_metric_name(name):
@@ -21,38 +22,72 @@ def normalize_metric_name(name):
 
 class Proxy(proxy.Proxy):
 
-    def _report_stats_statsd(self, response, url=None, method=None, exc=None):
+    def _report_stats_statsd(
+            self,
+            response: requests.Response | None,
+            url: str | None = None,
+            method: str | None = None,
+            exc: BaseException | None = None,
+    ) -> None:
+        if not self._statsd_prefix:
+            return None
+
+        if not self._statsd_client:
+            return None
+
         try:
             if response is not None and not url:
                 url = response.request.url
             if response is not None and not method:
                 method = response.request.method
+
+            # narrow types
+            assert url is not None
+            assert method is not None
+            assert self.service_type is not None
+
             name_parts = [
-                normalize_metric_name(f) for f in
-                self._extract_name(
-                    url, self.service_type, self.session.get_project_id())
+                normalize_metric_name(f)
+                for f in self._extract_name(
+                    url, self.service_type, self.session.get_project_id()
+                )
             ]
-
             key = '.'.join(
-                [self._statsd_prefix,
-                 normalize_metric_name(self.service_type), method,
-                 '_'.join(name_parts)
-                 ])
-            if response is not None:
-                duration = int(response.elapsed.total_seconds() * 1000)
-                metric_name = '%s.%s' % (key, str(response.status_code)),
-                self._statsd_client.timing(metric_name, duration)
-                self._statsd_client.incr(metric_name)
-                if duration > 1000:
-                    self._statsd_client.incr('%s.over_1000' % key)
-            elif exc is not None:
-                self._statsd_client.incr('%s.failed' % key)
-            self._statsd_client.incr('%s.attempted' % key)
+                [
+                    self._statsd_prefix,
+                    normalize_metric_name(self.service_type),
+                    method,
+                    '_'.join(name_parts),
+                ]
+            )
+            with self._statsd_client.pipeline() as pipe:
+                if response is not None:
+                    duration = int(response.elapsed.total_seconds() * 1000)
+                    metric_name = f'{key}.{str(response.status_code)}'
+                    pipe.timing(metric_name, duration)
+                    pipe.incr(metric_name)
+                    if duration > 1000:
+                        pipe.incr(f'{key}.over_1000')
+                elif exc is not None:
+                    pipe.incr(f'{key}.failed')
+                pipe.incr(f'{key}.attempted')
         except Exception:
+            # We do not want errors in metric reporting ever break client
             self.log.exception("Exception reporting metrics")
 
-    def _report_stats_influxdb(self, response, url=None, method=None,
-                               exc=None):
+    def _report_stats_influxdb(
+            self,
+            response: requests.Response | None,
+            url: str | None = None,
+            method: str | None = None,
+            exc: BaseException | None = None,
+    ) -> None:
+        if not self._influxdb_client:
+            return None
+
+        if not self._influxdb_config:
+            return None
+
         # NOTE(gtema): status_code is saved both as tag and field to give
         # ability showing it as a value and not only as a legend.
         # However Influx is not ok with having same name in tags and fields,
@@ -61,24 +96,25 @@ def _report_stats_influxdb(self, response, url=None, method=None,
             url = response.request.url
         if response is not None and not method:
             method = response.request.method
-        tags = dict(
-            method=method,
-            name='_'.join([
-                normalize_metric_name(f) for f in
-                self._extract_name(
-                    url, self.service_type,
-                    self.session.get_project_id())
-            ])
-        )
-        fields = dict(
-            attempted=1
-        )
+        tags = {
+            'method': method,
+            'name': '_'.join(
+                [
+                    normalize_metric_name(f)
+                    for f in self._extract_name(
+                        url, self.service_type,
+                        self.session.get_project_id()
+                    )
+                ]
+            ),
+        }
+        fields = {'attempted': 1}
         if response is not None:
             fields['duration'] = int(response.elapsed.total_seconds() * 1000)
             tags['status_code'] = str(response.status_code)
             # Note(gtema): emit also status_code as a value (counter)
             fields[str(response.status_code)] = 1
-            fields['%s.%s' % (method, response.status_code)] = 1
+            fields[f'{method}.{response.status_code}'] = 1
             # Note(gtema): status_code field itself is also very helpful on the
             # graphs to show what was the code, instead of counting its
             # occurences
@@ -87,16 +123,14 @@ def _report_stats_influxdb(self, response, url=None, method=None,
             fields['failed'] = 1
         if 'additional_metric_tags' in self._influxdb_config:
             tags.update(self._influxdb_config['additional_metric_tags'])
-        measurement = self._influxdb_config.get(
-            'measurement', 'openstack_api') \
-            if self._influxdb_config else 'openstack_api'
+        measurement = (
+            self._influxdb_config.get('measurement', 'openstack_api')
+            if self._influxdb_config
+            else 'openstack_api'
+        )
         # Note(gtema) append service name into the measurement name
-        measurement = '%s.%s' % (measurement, self.service_type)
-        data = [dict(
-            measurement=measurement,
-            tags=tags,
-            fields=fields
-        )]
+        measurement = f'{measurement}.{self.service_type}'
+        data = [{'measurement': measurement, 'tags': tags, 'fields': fields}]
         try:
             self._influxdb_client.write_points(data)
         except Exception:
diff --git a/otcextensions/sdk/rds/v3/_base.py b/otcextensions/sdk/rds/v3/_base.py
diff --git a/otcextensions/sdk/rds/v3/backup.py b/otcextensions/sdk/rds/v3/backup.py
diff --git a/otcextensions/sdk/sfsturbo/v1/share.py b/otcextensions/sdk/sfsturbo/v1/share.py
diff --git a/otcextensions/sdk/swr/v2/_proxy.py b/otcextensions/sdk/swr/v2/_proxy.py
diff --git a/otcextensions/sdk/vlb/v3/availability_zone.py b/otcextensions/sdk/vlb/v3/availability_zone.py
diff --git a/otcextensions/sdk/vlb/v3/ip_address_group.py b/otcextensions/sdk/vlb/v3/ip_address_group.py
diff --git a/otcextensions/sdk/vpc/v1/bandwidth.py b/otcextensions/sdk/vpc/v1/bandwidth.py
diff --git a/otcextensions/sdk/vpcep/v1/quota.py b/otcextensions/sdk/vpcep/v1/quota.py
diff --git a/otcextensions/tests/functional/sdk/ctsv3/v3/test_key_event.py b/otcextensions/tests/functional/sdk/ctsv3/v3/test_key_event.py
diff --git a/otcextensions/tests/unit/sdk/ctsv3/v3/test_proxy.py b/otcextensions/tests/unit/sdk/ctsv3/v3/test_proxy.py

-Original file line number
+Diff line change
 Reik Keutterling <[email protected]>
 Rodion Gyrbu <[email protected]>
 RusselSand <[email protected]>
 -Sebastian Gode <[email protected]>
 SebastianGode <[email protected]>
 T. Schreiber <[email protected]>
 Tino Schr <[email protected]>
 Zsolt Nagy <[email protected]>
 ameszi <[email protected]>
 ghodi <[email protected]>
 +harald-tsys <[email protected]>
 hlange4 <[email protected]>
 hodigy <[email protected]>
 kucerakk <[email protected]>