fix: adjust result structure

netbox_diode_plugin/api/common.py

@@ -162,14 +162,16 @@ class ChangeSetResult:
 
     def to_dict(self) -> dict:
         """Convert the result to a dictionary."""
-        if self.change_set:
-            return self.change_set.to_dict()
-
-        return {
+        result = {
             "id": self.id,
             "errors": self.errors,
         }
 
+        if self.change_set:
+            result["change_set"] = self.change_set.to_dict()
+
+        return result
+
     def get_status_code(self) -> int:
         """Get the status code for the result."""
         return status.HTTP_200_OK if not self.errors else status.HTTP_400_BAD_REQUEST

netbox_diode_plugin/tests/test_api_diff_and_apply.py

@@ -175,7 +175,7 @@ def diff_and_apply(self, payload):
             self.diff_url, data=payload, format="json", **self.user_header
         )
         self.assertEqual(response1.status_code, status.HTTP_200_OK)
-        diff = response1.json()
+        diff = response1.json().get("change_set", {})
 
         response2 = self.client.post(
             self.apply_url, data=diff, format="json", **self.user_header

netbox_diode_plugin/tests/test_api_generate_diff.py

@@ -49,7 +49,7 @@ def test_generate_diff_create_site(self):
 
         response = self.send_request(payload)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        cs = response.json()
+        cs = response.json().get("change_set", {})
         self.assertIsNotNone(cs.get("id"))
         changes = cs.get("changes", [])
         self.assertEqual(len(changes), 1)
@@ -80,7 +80,7 @@ def test_generate_diff_update_site(self):
 
         response = self.send_request(payload)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        cs = response.json()
+        cs = response.json().get("change_set", {})
         self.assertIsNotNone(cs.get("id"))
         changes = cs.get("changes", [])
         self.assertEqual(len(changes), 1)