Revert "Add keepenv"

This reverts commit d7c79dd.

Author: Pterosaur

tests/conftest.py

@@ -100,21 +100,15 @@ def pytest_addoption(parser):
                      type=int,
                      help="number of ports")
 
-    parser.addoption("--keepenv",
-                     action="store_true",
-                     default=False,
-                     help="Keep the current environment to skip validations and restart")
-
 
 def random_string(size=4, chars=string.ascii_uppercase + string.digits):
     return "".join(random.choice(chars) for x in range(size))
 
 
 class AsicDbValidator(DVSDatabase):
-    def __init__(self, db_id: int, connector: str, wait_for_init = True):
+    def __init__(self, db_id: int, connector: str):
         DVSDatabase.__init__(self, db_id, connector)
-        if wait_for_init:
-            self._wait_for_asic_db_to_initialize()
+        self._wait_for_asic_db_to_initialize()
         self._populate_default_asic_db_values()
         self._generate_oid_to_interface_mapping()
 
@@ -282,7 +276,6 @@ def __init__(
         newctnname: str = None,
         ctnmounts: Dict[str, str] = None,
         buffer_model: str = None,
-        keepenv: bool = False
     ):
         self.basicd = ["redis-server", "rsyslogd"]
         self.swssd = [
@@ -311,7 +304,6 @@ def __init__(
         ctn_sw_name = None
 
         self.persistent = False
-        self.keepenv = keepenv
 
         self.client = docker.from_env()
 
@@ -363,9 +355,8 @@ def __init__(
             # As part of https://github.com/Azure/sonic-buildimage/pull/4499
             # VS support dynamically create Front-panel ports so save the orginal
             # config db for persistent DVS
-            if not self.keepenv:
-                self.runcmd("mv /etc/sonic/config_db.json /etc/sonic/config_db.json.orig")
-                self.ctn_restart()
+            self.runcmd("mv /etc/sonic/config_db.json /etc/sonic/config_db.json.orig")
+            self.ctn_restart()
 
         # Dynamically create a DVS container and servers
         else:
@@ -478,9 +469,8 @@ def check_ready_status_and_init_db(self) -> None:
             self.init_appl_db_validator()
             self.reset_dbs()
 
-            if not self.keepenv:
-                # Verify that SWSS has finished initializing.
-                self.check_swss_ready()
+            # Verify that SWSS has finished initializing.
+            self.check_swss_ready()
 
         except Exception:
             self.get_logs()
@@ -513,7 +503,7 @@ def _polling_function():
         wait_for_result(_polling_function, service_polling_config)
 
     def init_asic_db_validator(self) -> None:
-        self.asicdb = AsicDbValidator(self.ASIC_DB_ID, self.redis_sock, wait_for_init = not self.keepenv)
+        self.asicdb = AsicDbValidator(self.ASIC_DB_ID, self.redis_sock)
 
     def init_appl_db_validator(self) -> None:
         self.appldb = ApplDbValidator(self.APPL_DB_ID, self.redis_sock)
@@ -1752,7 +1742,6 @@ def manage_dvs(request) -> str:
     buffer_model = request.config.getoption("--buffer_model")
     force_recreate = request.config.getoption("--force-recreate-dvs")
     graceful_stop = request.config.getoption("--graceful-stop")
-    keepenv = request.config.getoption("--keepenv")
     global NUM_PORTS
     NUM_PORTS = request.config.getoption("--num-ports")
 
@@ -1786,7 +1775,7 @@ def update_dvs(log_path, new_dvs_env=[]):
                 dvs.get_logs()
                 dvs.destroy()
 
-            dvs = DockerVirtualSwitch(name, imgname, keeptb, new_dvs_env, log_path, max_cpu, forcedvs, buffer_model = buffer_model, keepenv = keepenv)
+            dvs = DockerVirtualSwitch(name, imgname, keeptb, new_dvs_env, log_path, max_cpu, forcedvs, buffer_model = buffer_model)
 
             curr_dvs_env = new_dvs_env
 
@@ -1809,7 +1798,7 @@ def update_dvs(log_path, new_dvs_env=[]):
     dvs.get_logs()
     dvs.destroy()
 
-    if dvs.persistent and not keepenv:
+    if dvs.persistent:
         dvs.runcmd("mv /etc/sonic/config_db.json.orig /etc/sonic/config_db.json")
         dvs.ctn_restart()