Some code refactoring (#274)

* Remove debug print statement in SaiDpu.__init__
* Use context manager for file operations in SaiPhy.init
* Use context managers for file operations in SaiNpu and SaiTestbedMeta
* Sort import statements alphabetically in sai_testbed.py
* Fix grammar in README.md
---------
Signed-off-by: Andriy Kokhan <[email protected]>

Author: andriy-kokhan

README.md

@@ -49,7 +49,7 @@ See [Use-Cases README](usecases/README.md) for more details.
 
 ## Porting SAI Challenger to new platform
 
-For more information on how port SAI Challenger to new platform, please refer to [Porting Guide](docs/porting_guide.md) document.
+For more information on how to port SAI Challenger to new platform, please refer to [Porting Guide](docs/porting_guide.md) document.
 
 ## SAI Challenger internals
 

common/sai_dpu.py

@@ -14,7 +14,6 @@ class SaiDpu(Sai):
     def __init__(self, cfg):
         cfg["client"]["config"]["asic_type"] = "dpu"
         super().__init__(cfg)
-        print("__INIT__")
         self.switch_oid = "oid:0x0"
         self.dot1q_br_oid = "oid:0x0"
         self.default_vlan_oid = "oid:0x0"

common/sai_npu.py

@@ -37,9 +37,8 @@ def init(self, attr):
         # Load SKU configuration if any
         if self.sku is not None:
             try:
-                f = open(f"{self.asic_dir}/{self.target}/sku/{self.sku}.json")
-                self.sku_config = json.load(f)
-                f.close()
+                with open(f"{self.asic_dir}/{self.target}/sku/{self.sku}.json") as f:
+                    self.sku_config = json.load(f)
             except Exception as e:
                 assert False, f"{e}"
 

common/sai_phy.py

@@ -23,9 +23,8 @@ def init(self, attr):
         # Load SKU configuration if any
         if self.sku is not None:
             try:
-                f = open(f"{self.asic_dir}/{self.target}/sku/{self.sku}.json")
-                self.sku_config = json.load(f)
-                f.close()
+                with open(f"{self.asic_dir}/{self.target}/sku/{self.sku}.json") as f:
+                    self.sku_config = json.load(f)
             except Exception as e:
                 assert False, f"{e}"
 

common/sai_testbed.py

@@ -1,8 +1,8 @@
+import glob
 import importlib
-import os
 import json
-import glob
 import logging
+import os
 import sys
 
 from saichallenger.common.sai_dut import SaiDut
@@ -24,9 +24,8 @@ def __init__(self, base_dir, name):
         self.base_dir = base_dir
         try:
             testbed_file = name if name.endswith(".json") else f"{base_dir}/testbeds/{name}.json"
-            f = open(testbed_file)
-            self.config = json.load(f)
-            f.close()
+            with open(testbed_file) as f:
+                self.config = json.load(f)
         except Exception as e:
             assert False, f"{e}"
 
@@ -94,9 +93,8 @@ def get_sku_config(self, alias, asic_type="npu"):
             asic_dir = self.get_asic_dir(self.base_dir, cfg["asic"], asic_type)
             try:
                 target = cfg.get("target")
-                f = open(f"{asic_dir}/{target}/sku/{sku}.json")
-                sku = json.load(f)
-                f.close()
+                with open(f"{asic_dir}/{target}/sku/{sku}.json") as f:
+                    sku = json.load(f)
             except Exception as e:
                 assert False, f"{e}"
         return sku