Pull request update/250129

1ce46d9 OSN-584. Handle 409 on create arcee token
f773a09 OSN-506. Added missing region + fixed logging
060e20c OSN-172. Improved getting regions from Alibaba expenses

Author: stanfra

diworker/diworker/importers/azure.py

@@ -20,6 +20,7 @@
     "AE North": "UAE North",
     "US East 2": "East US 2",
     "EU North": "North Europe",
+    "IN Central": "Central India",
     "NorthCentralUs": "North Central US",
     "SouthCentralUS": "South Central US",
     "WestUS": "West US",
@@ -413,8 +414,10 @@ def get_resource_info_from_expenses(self, expenses):
             else:
                 region = None
                 if region_set:
-                    LOG.warning('Unable to find regions %s in map', region_set)
                     region = region_set.pop()
+                    if region not in regions_map.values():
+                        LOG.warning('Unable to find regions %s in map',
+                                    region_set)
             tags = self.extract_tags(expenses[-1].get('tags', {}))
             service = expenses[-1].get('consumed_service')
 

rest_api/rest_api_server/handlers/v2/profiling/base.py

@@ -1,4 +1,5 @@
 import hashlib
+from requests.exceptions import HTTPError
 from tools.optscale_exceptions.http_exc import OptHTTPError
 from rest_api.rest_api_server.exceptions import Err
 from rest_api.rest_api_server.utils import run_task
@@ -7,8 +8,13 @@
 
 class ProfilingHandler(BaseHandler):
     async def _get_profiling_token(self, organization_id):
-        res = await run_task(
-            self.controller.get_profiling_token, organization_id)
+        try:
+            res = await run_task(
+                self.controller.get_profiling_token, organization_id)
+        except HTTPError as ex:
+            if ex.response.status_code == 409:
+                raise OptHTTPError(409, Err.OE0526, [organization_id])
+            raise
         return res
 
     async def check_md5_profiling_token(

tools/cloud_adapter/clouds/azure.py

@@ -1159,7 +1159,8 @@ def _get_coordinates_map(self):
                 'name': 'North Europe', 'alias': 'Europe',
                 'longitude': -6.2597, 'latitude': 53.3478},
             'uksouth': {
-                'name': 'UK South', 'longitude': -0.799, 'latitude': 50.941},
+                'name': 'UK South',
+                'longitude': -0.799, 'latitude': 50.941},
             'eastus': {
                 'name': 'East US', 'alias': 'US East',
                 'longitude': -79.8164, 'latitude': 37.3719},

trapper/trapper_worker/processor.py

@@ -233,8 +233,43 @@ class AlibabaTrafficExpenseProcessor(BaseTrafficExpenseProcessor):
     ]
 
     @staticmethod
-    def extract_locations_and_usage(e):
-        _from = e.get('Zone') or e.get('Region') or 'Unknown'
+    def _zone_to_region(zone):
+        """
+        Converts zone name from expenses to region name.
+
+        Examples:
+            ap-southeast-5a -> ap-southeast-5
+            eu-central-a -> eu-central-1
+            cn-beijing-f -> cn-beijing
+
+        :param zone: (str) zone name
+        :return: (str) region name or zone name
+        """
+        parts = zone.split("-")
+        if len(parts) == 3 and parts[0] == "cn":
+            zone = "-".join(parts[:2])
+        elif len(parts) >= 3 and parts[0] != "cn":
+            # region name should ends with integer, ex.: eu-central-1
+            last = parts.pop(-1)
+            try:
+                int(last)
+            except ValueError:
+                # try to get region number from the last part
+                number = ''.join(x for x in last if x.isdigit())
+                if not number:
+                    # fix region name for zones without number, ex.:
+                    # eu-central-a -> eu-central-1
+                    number = "1"
+                parts.append(number)
+                zone = "-".join(parts)
+        return zone
+
+    def extract_locations_and_usage(self, e):
+        zone = e.get('Zone')
+        region = e.get('Region')
+        if not region and zone:
+            zone = self._zone_to_region(zone)
+        _from = region or zone or 'Unknown'
         _to = 'Unknown' if e.get('InternetIP') else 'External'
         _usage = float(e.get('Usage') or 0)
         return _from, _to, _usage