Initial NetBox v3.3 support (#22)

Support the new Cable and CableTermination model from NetBox v3.3 with the initializer.

Author: hpreston

README.md

@@ -6,7 +6,7 @@ Load data from YAML files into Netbox
 
 First activate your virtual environment where Netbox is installed, the install the plugin version correspondig to your Netbox version.
 ```bash
-pip install "netbox-initializers==3.2.*"
+pip install "netbox-initializers==3.3.*"
 ```
 Then you need to add the plugin to the `PLUGINS` array in the Netbox configuration.
 ```python
@@ -36,6 +36,6 @@ The initializers where a part of the Docker image and where then extracted into
 To use the new plugin in a the Netbox Docker image, it musst be installad into the image. To this, the following example can be used as a starting point:
 
 ```dockerfile
-FROM netboxcommunity/netbox:v3.2
-RUN /opt/netbox/venv/bin/pip install "netbox-initializers==3.2.*"
+FROM netboxcommunity/netbox:v3.3
+RUN /opt/netbox/venv/bin/pip install "netbox-initializers==3.3.*"
 ```

src/netbox_initializers/__init__.py

@@ -5,10 +5,10 @@ class NetBoxInitializersConfig(PluginConfig):
     name = "netbox_initializers"
     verbose_name = "NetBox Initializers"
     description = "Load initial data into Netbox"
-    version = "3.2.3"
+    version = "3.3.0"
     base_url = "initializers"
-    min_version = "3.2.0"
-    max_version = "3.2.99"
+    min_version = "3.3.0"
+    max_version = "3.3.99"
 
 
 config = NetBoxInitializersConfig

src/netbox_initializers/initializers/cables.py

@@ -3,6 +3,7 @@
 from circuits.models import Circuit, CircuitTermination, ProviderNetwork
 from dcim.models import (
     Cable,
+    CableTermination,
     ConsolePort,
     ConsoleServerPort,
     FrontPort,
@@ -93,21 +94,26 @@ def cable_in_cables(term_a: tuple, term_b: tuple) -> bool:
     Each tuple should consist termination object and termination type
     """
 
-    cable = Cable.objects.filter(
-        Q(
-            termination_a_id=term_a[0].id,
-            termination_a_type=term_a[1],
-            termination_b_id=term_b[0].id,
-            termination_b_type=term_b[1],
+    try:
+        cable_term_a = CableTermination.objects.get(
+            Q(
+                termination_id=term_a[0].id,
+                termination_type=term_a[1],
+            )
         )
-        | Q(
-            termination_a_id=term_b[0].id,
-            termination_a_type=term_b[1],
-            termination_b_id=term_a[0].id,
-            termination_b_type=term_a[1],
+        cable_term_b = CableTermination.objects.get(
+            Q(
+                termination_id=term_b[0].id,
+                termination_type=term_b[1],
+            )
         )
-    )
-    return cable.exists()
+    except CableTermination.DoesNotExist:
+        return False
+
+    cable_a = Cable.objects.get(Q(terminations=cable_term_a))
+    cable_b = Cable.objects.get(Q(terminations=cable_term_b))
+
+    return cable_a.id == cable_b.id
 
 
 def check_termination_types(type_a, type_b) -> Tuple[bool, str]:
@@ -223,13 +229,24 @@ def load_data(self):
 
             check_terminations_are_free(term_a, term_b)
 
-            params["termination_a_id"] = term_a.id
-            params["termination_b_id"] = term_b.id
-            params["termination_a_type"] = term_a_ct
-            params["termination_b_type"] = term_b_ct
-
             cable = Cable.objects.create(**params)
 
+            params_a_term = {
+                "termination_id": term_a.id,
+                "termination_type": term_a_ct,
+                "cable": cable,
+                "cable_end": "A",
+            }
+            CableTermination.objects.create(**params_a_term)
+
+            params_b_term = {
+                "termination_id": term_b.id,
+                "termination_type": term_b_ct,
+                "cable": cable,
+                "cable_end": "B",
+            }
+            CableTermination.objects.create(**params_b_term)
+
             print(f"🧷 Created cable {cable} {cable_name}")
 
 

test/Dockerfile

@@ -1,4 +1,4 @@
-FROM netboxcommunity/netbox:v3.2
+FROM netboxcommunity/netbox:v3.3
 
 COPY ../ /opt/netbox-initializers/
 COPY ./test/config/plugins.py /etc/netbox/config/