Review comments

Author: mikewiebe

plugins/httpapi/dcnm.py

@@ -125,13 +125,6 @@ def login(self, username, password):
 
         # Define login configurations in order of preference
         login_configs = [
-            {
-                "controller_type": "DCNM",
-                "version": 11,
-                "path": "/rest/logon",
-                "data": "{'expirationTime': %s}" % (self.connection.get_option("persistent_connect_timeout") * 1000),
-                "force_basic_auth": True,
-            },
             {
                 "controller_type": "NDFC",
                 "version": 12,
@@ -146,6 +139,13 @@ def login(self, username, password):
                 "data": json.dumps({"username": username, "password": password, "domain": login_domain}),
                 "force_basic_auth": False,
             },
+            {
+                "controller_type": "DCNM",
+                "version": 11,
+                "path": "/rest/logon",
+                "data": "{'expirationTime': %s}" % (self.connection.get_option("persistent_connect_timeout") * 1000),
+                "force_basic_auth": True,
+            },
         ]
 
         # Try each login method
@@ -279,9 +279,10 @@ def _response_to_json(self, response_text):
         """Convert response_text to json format"""
         try:
             return json.loads(response_text) if response_text else {}
-        # JSONDecodeError only available on Python 3.5+
-        except ValueError:
+        except json.JSONDecodeError:
             return "Invalid JSON response: {0}".format(response_text)
+        except Exception as e:
+            return "Error decoding JSON response: {0}".format(str(e))
 
     def _response_to_json12(self, response_text):
         """Convert response_text to json format"""

tests/unit/plugins/httpapi/test_dcnm.py

@@ -400,7 +400,7 @@ def test_login_success_first_attempt(self, mock_get_option, mock_connection):
 
             # Should call attempt_login once and return
             mock_attempt.assert_called_once()
-            assert mock_attempt.call_args[0][0]["controller_type"] == "DCNM"
+            assert mock_attempt.call_args[0][0]["controller_type"] == "NDFC"
 
     @patch.object(HttpApi, "get_option")
     def test_login_success_second_attempt(self, mock_get_option, mock_connection):
@@ -790,11 +790,10 @@ def test_login_configs_structure(self, mock_connection):
 
                 # Get the first call (DCNM config)
                 nd_config = mock_attempt.call_args_list[0][0][0]
-                assert nd_config["controller_type"] == "DCNM"
-                assert nd_config["version"] == 11
-                assert nd_config["path"] == "/rest/logon"
-                assert nd_config["force_basic_auth"] is True
-                assert "'expirationTime': 10000" in nd_config["data"]
+                assert nd_config["controller_type"] == "NDFC"
+                assert nd_config["version"] == 12
+                assert nd_config["path"] == "/login"
+                assert nd_config["force_basic_auth"] is False
 
     def test_logout_config_selection(self, mock_connection):
         """Test that logout selects correct configuration based on version."""
@@ -888,8 +887,8 @@ def test_full_login_logout_cycle_nd(self, mock_connection):
 
             # Verify login state
             assert http_api.login_succeeded is True
-            assert http_api.version == 11
-            assert http_api.connection._auth == {"Dcnm-Token": "test-token-123"}
+            assert http_api.version == 12
+            assert http_api.connection._auth == {'Authorization': 'Bearer None', 'Cookie': 'AuthCookie=None'}
 
             # Perform logout
             http_api.logout()