testing: enable cleanup; establish context

Author: mplsgrant

test/namespace_admin_test.py

@@ -35,9 +35,9 @@ def run_test(self):
         try:
             os.chdir(self.tmpdir)
             self.log.info(f"Running test in: {self.tmpdir}")
+            self.establish_initial_context()
             self.establish_names()
             self.setup_namespaces()
-            self.initial_context = get_kubeconfig_value("{.current-context}")
             self.setup_service_accounts()
             self.deploy_network_in_team_namespaces()
             self.authenticate_and_become_bob()
@@ -46,9 +46,13 @@ def run_test(self):
             try:
                 self.cleanup_kubeconfig()
             except K8sError as e:
-                self.log.info(e)
+                self.log.info(f"KUBECONFIG cleanup error: {e}")
             self.cleanup()
 
+    def establish_initial_context(self):
+        self.initial_context = get_kubeconfig_value("{.current-context}")
+        self.log.info(f"Initial context: {self.initial_context}")
+
     def establish_names(self):
         self.bob_user = "bob-warnettest"
         self.bob_auth_file = "bob-warnettest-wargames-red-team-warnettest-kubeconfig"
@@ -80,6 +84,7 @@ def setup_service_accounts(self):
         self.log.info("Creating service accounts...")
         self.log.info(self.warnet("admin create-kubeconfigs"))
         self.wait_for_predicate(self.service_accounts_are_validated)
+        self.log.info("Service accounts have been set up and validated")
 
     def deploy_network_in_team_namespaces(self):
         self.log.info("Deploy networks to team namespaces")
@@ -91,7 +96,7 @@ def deploy_network_in_team_namespaces(self):
     def authenticate_and_become_bob(self):
         self.log.info("Authenticating and becoming bob...")
         assert get_kubeconfig_value("{.current-context}") == self.initial_context
-        self.log.info(self.warnet(f"auth kubeconfigs/{self.bob_auth_file}"))
+        self.warnet(f"auth kubeconfigs/{self.bob_auth_file}")
         assert get_kubeconfig_value("{.current-context}") == self.bob_context
 
     def service_accounts_are_validated(self) -> bool:
@@ -136,14 +141,11 @@ def two_namespaces_are_validated(self) -> bool:
         maybe_namespaces = self.get_namespaces()
         if maybe_namespaces is None:
             return False
-        if len(maybe_namespaces) != 2:
-            return False
         if self.blue_namespace not in maybe_namespaces:
             return False
         return self.red_namespace in maybe_namespaces
 
     def cleanup_kubeconfig(self):
-        pass
         try:
             kubeconfig_data = open_kubeconfig(KUBECONFIG)
         except K8sError as e: