Merge pull request #979 from blackboxsw/merge/trusty-azure-detection

azure-pro: fix detection of DatasourceAzureNet as azure on trusty
canonical · Feb 5, 2020 · 49abe3d · 49abe3d
2 parents 21c00b4 + 6cca259
commit 49abe3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/uaclient/clouds/identity.py b/uaclient/clouds/identity.py
@@ -15,7 +15,7 @@
 
 
 # Mapping of datasource names to cloud-id responses. Trusty compat with Xenial+
-DATASOURCE_TO_CLOUD_ID = {"ec2": "aws"}
+DATASOURCE_TO_CLOUD_ID = {"azurenet": "azure", "ec2": "aws"}
 
 
 def get_cloud_type_from_result_file(

diff --git a/uaclient/clouds/tests/test_identity.py b/uaclient/clouds/tests/test_identity.py
@@ -21,6 +21,7 @@ class TestGetCloudTypeFromResultFile:
             ("DataSourceSomeTHING", "something"),
             ("DaTaSoUrCeMiNe", "mine"),
             ("DataSourceEc2", "aws"),
+            ("DataSourceAzureNet", "azure"),
             ("DataSourceEc2Lookalike", "ec2lookalike"),
         ),
     )