Revert "[gearbox] Add gearbox unit test (sonic-net#1920)"

This reverts commit d23924f.

Author: vaibhavhd

tests/conftest.py

@@ -244,7 +244,7 @@ def __init__(
         name: str = None,
         imgname: str = None,
         keeptb: bool = False,
-        env: list = [],
+        fakeplatform: str = None,
         log_path: str = None,
         max_cpu: int = 2,
         forcedvs: bool = None,
@@ -356,6 +356,8 @@ def __init__(
             self.mount = f"/var/run/redis-vs/{self.ctn_sw.name}"
             ensure_system(f"mkdir -p {self.mount}")
 
+            self.environment = [f"fake_platform={fakeplatform}"] if fakeplatform else []
+
             kwargs = {}
             if newctnname:
                 kwargs["name"] = newctnname
@@ -370,7 +372,7 @@ def __init__(
             self.ctn = self.client.containers.run(imgname,
                                                   privileged=True,
                                                   detach=True,
-                                                  environment=env,
+                                                  environment=self.environment,
                                                   network_mode=f"container:{self.ctn_sw.name}",
                                                   cpu_count=max_cpu,
                                                   **kwargs)
@@ -1233,7 +1235,7 @@ def __init__(
         namespace=None,
         imgname=None,
         keeptb=False,
-        env=[],
+        fakeplatform=None,
         log_path=None,
         max_cpu=2,
         forcedvs=None,
@@ -1242,7 +1244,7 @@ def __init__(
         self.ns = namespace
         self.chassbr = "br4chs"
         self.keeptb = keeptb
-        self.env = env
+        self.fakeplatform = fakeplatform
         self.topoFile = topoFile
         self.imgname = imgname
         self.ctninfo = {}
@@ -1301,7 +1303,7 @@ def find_all_ctns(self):
         for ctn in docker.from_env().containers.list():
             if ctn.name.endswith(suffix):
                 self.dvss[ctn.name] = DockerVirtualSwitch(ctn.name, self.imgname, self.keeptb,
-                                                          self.env, log_path=ctn.name,
+                                                          self.fakeplatform, log_path=ctn.name,
                                                           max_cpu=self.max_cpu, forcedvs=self.forcedvs,
                                                           vct=self)
         if self.chassbr is None and len(self.dvss) > 0:
@@ -1419,7 +1421,7 @@ def create_vct_ctn(self, ctndir):
             if ctnname not in self.dvss:
                 self.dvss[ctnname] = DockerVirtualSwitch(name=None, imgname=self.imgname,
                                                          keeptb=self.keeptb,
-                                                         env=self.env,
+                                                         fakeplatform=self.fakeplatform,
                                                          log_path=self.log_path,
                                                          max_cpu=self.max_cpu,
                                                          forcedvs=self.forcedvs,
@@ -1596,18 +1598,18 @@ def manage_dvs(request) -> str:
     buffer_model = request.config.getoption("--buffer_model")
     force_recreate = request.config.getoption("--force-recreate-dvs")
     dvs = None
-    curr_dvs_env = [] # lgtm[py/unused-local-variable]
+    curr_fake_platform = None   # lgtm[py/unused-local-variable]
 
     if using_persistent_dvs and force_recreate:
         pytest.fail("Options --dvsname and --force-recreate-dvs are mutually exclusive")
 
-    def update_dvs(log_path, new_dvs_env=[]):
+    def update_dvs(log_path, new_fake_platform=None):
         """
         Decides whether or not to create a new DVS
 
         Create a new the DVS in the following cases:
         1. CLI option `--force-recreate-dvs` was specified (recreate for every module)
-        2. The dvs_env has changed (this can only be set at container creation,
+        2. The fake_platform has changed (this can only be set at container creation,
            so it is necessary to spin up a new DVS)
         3. No DVS currently exists (i.e. first time startup)
 
@@ -1616,18 +1618,18 @@ def update_dvs(log_path, new_dvs_env=[]):
         Returns:
             (DockerVirtualSwitch) a DVS object
         """
-        nonlocal curr_dvs_env, dvs
+        nonlocal curr_fake_platform, dvs
         if force_recreate or \
-           new_dvs_env != curr_dvs_env or \
+           new_fake_platform != curr_fake_platform or \
            dvs is None:
 
             if dvs is not None:
                 dvs.get_logs()
                 dvs.destroy()
 
-            dvs = DockerVirtualSwitch(name, imgname, keeptb, new_dvs_env, log_path, max_cpu, forcedvs, buffer_model = buffer_model)
+            dvs = DockerVirtualSwitch(name, imgname, keeptb, new_fake_platform, log_path, max_cpu, forcedvs, buffer_model = buffer_model)
 
-            curr_dvs_env = new_dvs_env
+            curr_fake_platform = new_fake_platform
 
         else:
             # First generate GCDA files for GCov
@@ -1652,11 +1654,11 @@ def update_dvs(log_path, new_dvs_env=[]):
 
 @pytest.yield_fixture(scope="module")
 def dvs(request, manage_dvs) -> DockerVirtualSwitch:
-    dvs_env = getattr(request.module, "DVS_ENV", [])
+    fakeplatform = getattr(request.module, "DVS_FAKE_PLATFORM", None)
     name = request.config.getoption("--dvsname")
     log_path = name if name else request.module.__name__
 
-    return manage_dvs(log_path, dvs_env)
+    return manage_dvs(log_path, fakeplatform)
 
 @pytest.yield_fixture(scope="module")
 def vct(request):
@@ -1667,11 +1669,11 @@ def vct(request):
     imgname = request.config.getoption("--imgname")
     max_cpu = request.config.getoption("--max_cpu")
     log_path = vctns if vctns else request.module.__name__
-    dvs_env = getattr(request.module, "DVS_ENV", [])
+    fakeplatform = getattr(request.module, "DVS_FAKE_PLATFORM", None)
     if not topo:
         # use ecmp topology as default
         topo = "virtual_chassis/chassis_with_ecmp_neighbors.json"
-    vct = DockerVirtualChassisTopology(vctns, imgname, keeptb, dvs_env, log_path, max_cpu,
+    vct = DockerVirtualChassisTopology(vctns, imgname, keeptb, fakeplatform, log_path, max_cpu,
                                        forcedvs, topo)
     yield vct
     vct.get_logs(request.module.__name__)

tests/test_gearbox.py

@@ -3,7 +3,7 @@
 
 from swsscommon import swsscommon
 
-DVS_ENV = ["fake_platform=broadcom"]
+DVS_FAKE_PLATFORM = "broadcom"
 
 
 class TestMirror(object):

tests/test_mirror_ipv6_combined.py

@@ -3,7 +3,7 @@
 
 from swsscommon import swsscommon
 
-DVS_ENV = ["fake_platform=mellanox"]
+DVS_FAKE_PLATFORM = "mellanox"
 
 
 class TestMirror(object):