fix: fix issue with collecting resource group data

Signed-off-by: ImMin5 <[email protected]>
cloudforet-io · Oct 19, 2023 · c1b2998 · c1b2998
1 parent 302d9dc
commit c1b2998
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/cloudforet/cost_analysis/conf/cost_conf.py b/src/cloudforet/cost_analysis/conf/cost_conf.py
@@ -37,6 +37,7 @@
     'global': 'Global',
     'unknown': 'Unknown',
     'unassigned': 'Unassigned',
+    'all regions': 'All Regions',
     'intercontinental': 'Intercontinental',
     'ap east': 'eastasia',
     'ca central': 'canadacentral',

diff --git a/src/cloudforet/cost_analysis/manager/cost_manager.py b/src/cloudforet/cost_analysis/manager/cost_manager.py
@@ -99,13 +99,15 @@ def _get_additional_info(self, result, options, tenant_id=None):
         tenant_id = result.get('customertenantid') if result.get('customertenantid') else tenant_id
 
         additional_info['Tenant ID'] = tenant_id
-        additional_info['Subscription Id'] = result.get('subscriptionid', 'Shared')
+        additional_info['Subscription ID'] = result.get('subscriptionid', 'Shared')
 
         if meter_category == 'Virtual Machines' and 'Meter' in result:
             additional_info['Instance Type'] = result['meter']
 
         if result.get('resourcegroupname') != '' and result.get('resourcegroupname'):
             additional_info['Resource Group'] = result['resourcegroupname']
+        elif result.get('resourcegroup') != '' and result.get('resourcegroup'):
+            additional_info['Resource Group'] = result['resourcegroup']
 
         if result.get('resourcetype') != '' and result.get('resourcetype'):
             additional_info['Resource Type'] = result['resourcetype']