fix: no attribute 'type' error in CloudInstance combiner (#4432)

Signed-off-by: Xiaoxue Wang <[email protected]>

Author: JoySnow

insights/combiners/cloud_instance.py

@@ -13,6 +13,7 @@
 * :py:class:`insights.parsers.subscription_manager.SubscriptionManagerFacts`
 
 """
+
 from insights.combiners.cloud_provider import CloudProvider
 from insights.core.exceptions import ContentException, SkipComponent
 from insights.core.filters import add_filter
@@ -22,7 +23,7 @@
 from insights.parsers.gcp_instance_type import GCPInstanceType
 from insights.parsers.subscription_manager import SubscriptionManagerFacts
 
-add_filter(SubscriptionManagerFacts, 'instance_id')
+add_filter(SubscriptionManagerFacts, ['instance_id', 'instance_type'])
 
 
 @combiner(
@@ -33,7 +34,7 @@
         AzureInstanceType,
         GCPInstanceType,
         SubscriptionManagerFacts,
-    ]
+    ],
 )
 class CloudInstance(object):
     """
@@ -65,10 +66,11 @@ class CloudInstance(object):
         >>> ci.size == 't2.micro'
         True
     """
-    def __init__(self, cp, aws=None, azure_id=None, azure_type=None,
-                 gcp=None, facts=None):
+
+    def __init__(self, cp, aws=None, azure_id=None, azure_type=None, gcp=None, facts=None):
         self.provider = cp.cloud_provider
         self.id = None
+        self.type = None
         # 1. Get from the Cloud REST API at first
         if aws:
             self.id = aws.get('instanceId')
@@ -84,6 +86,8 @@ def __init__(self, cp, aws=None, azure_id=None, azure_type=None,
             if key not in facts:
                 raise ContentException("Unmatched/unsupported types!")
             self.id = facts[key]
+            if self.type is None:
+                self.type = facts.get("{0}_instance_type".format(self.provider))
         # The instance id is the key attribute of this Combiner
         if self.id is None:
             raise SkipComponent

insights/tests/combiners/test_cloud_instance.py

@@ -7,6 +7,7 @@
 from insights.core.exceptions import ContentException, SkipComponent
 from insights.parsers.aws_instance_id import AWSInstanceIdDoc
 from insights.parsers.azure_instance import AzureInstanceID, AzureInstanceType
+from insights.parsers.dmidecode import DMIDecode
 from insights.parsers.gcp_instance_type import GCPInstanceType
 from insights.parsers.installed_rpms import InstalledRpms
 from insights.parsers.subscription_manager import SubscriptionManagerFacts
@@ -23,6 +24,41 @@
 uname.sysname: Linux
 """.strip()
 
+AWS_RHSM_FACTS = """
+aws_instance_id: i-01234567890abcdef
+aws_instance_type: m5.large
+""".strip()
+
+AWS_RHSM_FACTS_NO_TYPE = """
+aws_instance_id: i-01234567890abcdef
+""".strip()
+
+AWS_DMIDECODE = """
+# dmidecode 3.3
+Getting SMBIOS data from sysfs.
+SMBIOS 2.7 present.
+13 structures occupying 568 bytes.
+Table at 0xBFFF0000.
+
+Handle 0x0000, DMI type 0, 24 bytes
+BIOS Information
+    Vendor: Amazon EC2
+    Version: 1.0
+    Release Date: 10/16/2017
+    Address: 0xF0000
+    Runtime Size: 64 kB
+    ROM Size: 64 kB
+    Characteristics:
+        PCI is supported
+        EDD is supported
+        ACPI is supported
+        System is a virtual machine
+    BIOS Revision: 1.0
+
+Handle 0x000C, DMI type 127, 4 bytes
+End Of Table
+""".strip()
+
 
 def test_cloud_instance_google():
     rpms = InstalledRpms(context_wrap(RPMS_GOOGLE))
@@ -59,6 +95,30 @@ def test_cloud_instance_azure():
     assert ret.size == "Standard_NV48s_v3"
 
 
+def test_cloud_instance_aws_from_submanfacts():
+    rpms = InstalledRpms(context_wrap(RPMS_AWS))
+    bios = DMIDecode(context_wrap(AWS_DMIDECODE))
+    facts = SubscriptionManagerFacts(context_wrap(AWS_RHSM_FACTS))
+    cp = CloudProvider(rpms, bios, None, None)
+    ret = CloudInstance(cp, None, None, None, None, facts)
+    assert ret.provider == CloudProvider.AWS
+    assert ret.id == "i-01234567890abcdef"
+    assert ret.type == "m5.large"
+    assert ret.size == "m5.large"
+
+
+def test_cloud_instance_aws_from_submanfacts_no_type():
+    rpms = InstalledRpms(context_wrap(RPMS_AWS))
+    bios = DMIDecode(context_wrap(AWS_DMIDECODE))
+    facts = SubscriptionManagerFacts(context_wrap(AWS_RHSM_FACTS_NO_TYPE))
+    cp = CloudProvider(rpms, bios, None, None)
+    ret = CloudInstance(cp, None, None, None, None, facts)
+    assert ret.provider == CloudProvider.AWS
+    assert ret.id == "i-01234567890abcdef"
+    assert ret.type is None
+    assert ret.size is None
+
+
 def test_cloud_instance_ex():
     rpms = InstalledRpms(context_wrap(RPMS_GOOGLE))
     _type = GCPInstanceType(context_wrap(GOOGLE_TYPE_1))