Skip to content

Commit

Permalink
feat: 1.28 Added Azure location to facts
Browse files Browse the repository at this point in the history
* Backport commit to 1.28 branch
* Original PR: #3389
  * Original commit: c9acace
* Card ID: CCT-384
* Add azure_location to facts, when available
* TODO: update required version of metadata and get extended
  locatition fact
  • Loading branch information
jirihnidek authored and m-horky committed May 14, 2024
1 parent 7aaa4b8 commit b6837a4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/rhsmlib/facts/cloud_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,13 @@ def get_aws_facts(self):

def get_azure_facts(self):
"""
Try to get facts of VM running on Azure public cloud. Returned dictionary has following format:
Try to get facts of VM running on Azure public cloud. Returned dictionary has the following format:
{
"azure_instance_id": some_instance_ID,
"azure_offer": some_offer,
"azure_sku": some_sku,
"azure_subscription_id": some_subscription_ID
"azure_location: azure region the VM is running in
}
:return: dictionary containing Azure facts, when the machine is able to gather metadata
from Azure cloud provider; otherwise returns empty dictionary {}
Expand All @@ -131,6 +132,8 @@ def get_azure_facts(self):
facts['azure_offer'] = values['compute']['offer']
if "subscriptionId" in values["compute"]:
facts["azure_subscription_id"] = values["compute"]["subscriptionId"]
if "location" in values["compute"]:
facts["azure_location"] = values["compute"]["location"]
return facts

def get_gcp_facts(self):
Expand Down
3 changes: 3 additions & 0 deletions test/rhsmlib_test/test_cloud_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
AZURE_SKU = "8.1-ci"
AZURE_OFFER = "RHEL"
AZURE_SUBSCRIPTION_ID = "01234567-0123-0123-0123-012345679abc"
AZURE_LOCATION = "westeurope"


def mock_prepare_request(request):
Expand Down Expand Up @@ -303,6 +304,8 @@ def test_get_azure_facts(self):
self.assertEqual(facts["azure_offer"], AZURE_OFFER)
self.assertIn("azure_subscription_id", facts)
self.assertEqual(facts["azure_subscription_id"], AZURE_SUBSCRIPTION_ID)
self.assertIn("azure_location", facts)
self.assertEqual(facts["azure_location"], AZURE_LOCATION)

@patch('cloud_what.providers.gcp.GCPCloudProvider._write_token_to_cache_file')
@patch('cloud_what.providers.gcp.GCPCloudProvider._get_metadata_from_cache')
Expand Down

0 comments on commit b6837a4

Please sign in to comment.