Replace type() comparisons with isinstance() (#272)

- Replace type(x) == SomeType with isinstance(x, SomeType)
- More Pythonic and follows PEP 8 style guide
- Works correctly with inheritance and subclasses

Signed-off-by: Andriy Kokhan <[email protected]>

Author: andriy-kokhan

common/sai.py

@@ -176,10 +176,10 @@ def process_command(self, command):
 
         if obj_key is None:
             obj_id = obj_type
-        elif type(obj_key) == dict:
+        elif isinstance(obj_key, dict):
             obj_key = json.dumps(obj_key)
             obj_id = obj_type + ":" + obj_key
-        elif type(obj_key) == str and obj_key.startswith("oid:0x"):
+        elif isinstance(obj_key, str) and obj_key.startswith("oid:0x"):
             obj_id = obj_key
         else:
             assert False, f"Failed to process: {obj_type}, {obj_key}, {operation}"
@@ -351,10 +351,10 @@ def get_meta(obj_type=None):
         if obj_type is None:
             return Sai.metadata
 
-        if type(obj_type) == SaiObjType:
+        if isinstance(obj_type, SaiObjType):
             obj_type = "SAI_OBJECT_TYPE_" + SaiObjType(obj_type).name
         else:
-            assert type(obj_type) == str
+            assert isinstance(obj_type, str)
             assert obj_type.startswith("SAI_OBJECT_TYPE_")
 
         for item in Sai.metadata:

common/sai_client/sai_redis_client/sai_redis_client.py

@@ -129,10 +129,10 @@ def operate(self, obj, attrs, op):
 
     def create(self, obj, attrs, do_assert=True):
         vid = None
-        if type(obj) == SaiObjType:
+        if isinstance(obj, SaiObjType):
             vid = self.alloc_vid(obj)
             obj = "SAI_OBJECT_TYPE_" + obj.name + ":" + vid
-        elif type(obj) == str and obj.startswith("SAI_OBJECT_TYPE_") and ":" not in obj:
+        elif isinstance(obj, str) and obj.startswith("SAI_OBJECT_TYPE_") and ":" not in obj:
             vid = self.alloc_vid(obj)
             obj = obj + ":" + vid
         else:
@@ -240,11 +240,11 @@ def bulk_create(self, obj_type, keys, attrs, obj_count=0, do_assert=True):
             The third element contains the list of statuses of each individual object
             creation result.
         '''
-        assert (type(obj_type) == SaiObjType) or (type(obj_type) == str and obj_type.startswith("SAI_OBJECT_TYPE_"))
+        assert isinstance(obj_type, SaiObjType) or (isinstance(obj_type, str) and obj_type.startswith("SAI_OBJECT_TYPE_"))
         assert keys is None or len(keys) == len(attrs) or len(attrs) == 1
 
         entries_num = len(keys) if keys else obj_count
-        key = "SAI_OBJECT_TYPE_" + obj_type.name if type(obj_type) == SaiObjType else obj_type
+        key = "SAI_OBJECT_TYPE_" + obj_type.name if isinstance(obj_type, SaiObjType) else obj_type
         key = key + ":" + str(entries_num)
 
         str_attr = ""
@@ -312,9 +312,9 @@ def bulk_remove(self, obj_type, keys, do_assert = True):
             The second element contains the list of statuses of each individual object
             removal result.
         '''
-        assert (type(obj_type) == SaiObjType) or (type(obj_type) == str and obj_type.startswith("SAI_OBJECT_TYPE_"))
+        assert isinstance(obj_type, SaiObjType) or (isinstance(obj_type, str) and obj_type.startswith("SAI_OBJECT_TYPE_"))
 
-        key = "SAI_OBJECT_TYPE_" + obj_type.name if type(obj_type) == SaiObjType else obj_type
+        key = "SAI_OBJECT_TYPE_" + obj_type.name if isinstance(obj_type, SaiObjType) else obj_type
         key = key + ":" + str(len(keys))
 
         values = []
@@ -524,9 +524,9 @@ def get_object_key(self, obj_type=None):
         return oids_by_type
 
     def alloc_vid(self, obj_type):
-        if type(obj_type) == str and obj_type.startswith("SAI_OBJECT_TYPE_"):
+        if isinstance(obj_type, str) and obj_type.startswith("SAI_OBJECT_TYPE_"):
             obj_type = SaiObjType[obj_type.replace("SAI_OBJECT_TYPE_", "")]
-        assert type(obj_type) == SaiObjType
+        assert isinstance(obj_type, SaiObjType)
 
         vid = None
         if obj_type == SaiObjType.SWITCH:

common/sai_client/sai_thrift_client/sai_thrift_client.py

@@ -42,9 +42,9 @@ def obj_to_items(obj):
         obj_type = None
         oid = None
         key = None
-        if type(obj) == str and obj.startswith("oid:0x"):
+        if isinstance(obj, str) and obj.startswith("oid:0x"):
             oid = obj
-        elif type(obj) == str:
+        elif isinstance(obj, str):
             obj = obj.split(":", 1)
             obj_type = obj[0]
             if len(obj) > 1:
@@ -57,7 +57,7 @@ def obj_to_items(obj):
                             obj[1] = obj[1].replace("bvid", "bv_id")
                             obj[1] = obj[1].replace("mac", "mac_address")
                     key = json.loads(obj[1])
-        elif type(obj) == SaiObjType:
+        elif isinstance(obj, SaiObjType):
             obj_type = obj
         else:
             assert False, "Unsupported OID format type {}".format(type(obj))
@@ -67,8 +67,8 @@ def obj_to_items(obj):
     def create(self, obj, attrs, do_assert=True):
         obj_type, _, key = self.obj_to_items(obj)
         status, result = self._operate('create', attrs=attrs, obj_type=obj_type, key=key)
-        if key is None and type(result) == int:
-            if type(obj_type) == str:
+        if key is None and isinstance(result, int):
+            if isinstance(obj_type, str):
                 obj_type = SaiObjType[obj_type.replace("SAI_OBJECT_TYPE_", "")]
             self.sai_type_map[result] = obj_type
 
@@ -268,7 +268,7 @@ def bulk_create(self, obj_type, keys, attrs, obj_count=0, do_assert=True):
         entries_num = len(keys) if keys else obj_count
         statuses = [None] * entries_num
 
-        if type(obj_type) == SaiObjType:
+        if isinstance(obj_type, SaiObjType):
             obj_type = "SAI_OBJECT_TYPE_" + obj_type.name
 
         for i in range(entries_num):
@@ -289,7 +289,7 @@ def bulk_remove(self, obj_type, keys, do_assert=True):
         # TODO: Provide proper implementation once Thrift bulk API is available
         statuses = [None] * len(keys)
 
-        if type(obj_type) == SaiObjType:
+        if isinstance(obj_type, SaiObjType):
             obj_type = "SAI_OBJECT_TYPE_" + obj_type.name
 
         for key in keys:
@@ -306,7 +306,7 @@ def bulk_set(self, obj_type, keys, attrs, do_assert=True):
         # TODO: Provide proper implementation once Thrift bulk API is available
         statuses = [None] * len(keys)
 
-        if type(obj_type) == SaiObjType:
+        if isinstance(obj_type, SaiObjType):
             obj_type = "SAI_OBJECT_TYPE_" + obj_type.name
 
         for i in range(len(keys)):

common/sai_client/sai_thrift_client/sai_thrift_utils.py

@@ -243,7 +243,7 @@ def sai_qos_map_list(value):
 
         {"count":1,"list":[{"key":0,"value":0}]} =>  sai_thrift_qos_map_list_t(count=1, maplist=[{"key":0,"value":0}])
         """
-        val = json.loads(value) if type(value) == str else value
+        val = json.loads(value) if isinstance(value, str) else value
         maplist = []
         for entry in val["list"]:
             key = ThriftConverter.sai_qos_map_params(entry["key"])
@@ -624,10 +624,10 @@ def get_sai_meta(obj_type, attr_name):
         except IOError:
             return None
 
-        if type(obj_type) == SaiObjType:
+        if isinstance(obj_type, SaiObjType):
             obj_type = "SAI_OBJECT_TYPE_" + SaiObjType(obj_type).name
         else:
-            assert type(obj_type) == str
+            assert isinstance(obj_type, str)
             assert obj_type.startswith("SAI_OBJECT_TYPE_")
 
         for item in sai_json:

common/sai_data.py

@@ -43,7 +43,7 @@ def generate_from_thrift():
             if variable_name == "SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START":
                 continue
 
-            value = variable_value if type(variable_value) == int else variable_value.value
+            value = variable_value if isinstance(variable_value, int) else variable_value.value
             extend_enum(SaiObjType, variable_name[16:], value)
 
     @staticmethod

common/sai_testbed.py

@@ -84,7 +84,7 @@ def get_asic_dir(base_dir, asic, asic_type="npu"):
     def get_sku_config(self, alias, asic_type="npu"):
         cfg = self.get_asic_config(alias, asic_type)
         sku = cfg.get("sku", None)
-        if type(sku) == str:
+        if isinstance(sku, str):
             asic_dir = self.get_asic_dir(self.base_dir, cfg["asic"], asic_type)
             try:
                 target = cfg.get("target")