netbox-device-view 0.1.7__tar.gz → 0.1.10a0__tar.gz

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: netbox-device-view
-Version: 0.1.7
+Version: 0.1.10a0
 Summary: NetBox Device View plugin
 Home-page: https://github.com/peterbaumert/netbox-device-view
 Author: Peter Baumert
@@ -8,6 +8,13 @@ Keywords: netbox,netbox-plugin
 Classifier: Framework :: Django
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: summary
 
 # Netbox Device View Plugin
 ![Version](https://img.shields.io/pypi/v/netbox-device-view) ![Downloads](https://img.shields.io/pypi/dm/netbox-device-view)

netbox_device_view-0.1.10a0/netbox_device_view/forms.py

@@ -0,0 +1,23 @@
+from netbox.forms import NetBoxModelForm, NetBoxModelImportForm
+from django.utils.translation import gettext_lazy as _
+from .models import DeviceView
+from dcim.models import DeviceType
+from utilities.forms.fields import CSVModelChoiceField
+
+
+class DeviceViewForm(NetBoxModelForm):
+    class Meta:
+        model = DeviceView
+        fields = ("device_type", "grid_template_area")
+
+
+class DeviceViewImportForm(NetBoxModelImportForm):
+    device_type = CSVModelChoiceField(
+        queryset=DeviceType.objects.all(),
+        to_field_name="model",
+        help_text=_("Device Model Name"),
+    )
+
+    class Meta:
+        model = DeviceView
+        fields = ("device_type", "grid_template_area")

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/netbox_device_view/navigation.py

@@ -7,7 +7,12 @@ deviceview_buttons = [
         title="Add",
         icon_class="mdi mdi-plus-thick",
         color=ButtonColorChoices.GREEN,
-    )
+    ),
+    PluginMenuButton(
+        link="plugins:netbox_device_view:deviceview_import",
+        title="Import",
+        icon_class="mdi mdi-upload",
+    ),
 ]
 
 menu_items = (

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/netbox_device_view/templates/netbox_device_view/deviceview.html

@@ -60,11 +60,7 @@
 					{% endfor %}
 				{% endif %}
 				"
-				style="grid-area: {{ int.stylename }};
-				{% if cable_colors == "on" and int.cable.color != "" %}
-				background-color: #{{ int.cable.color }}
-				{% endif %}
-				"
+				style="grid-area: {{ int.stylename }}{% if cable_colors == 'on' and int.cable.color != '' %}; background-color: #{{ int.cable.color }}{% endif %}"
 				data-bs-toggle="tooltip"
 				data-bs-html="true"
 				data-bs-custom-class="device-view-tooltip"

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/netbox_device_view/urls.py

@@ -5,6 +5,11 @@ from netbox.views.generic import ObjectChangeLogView
 urlpatterns = (
     path("device-view/", views.DeviceViewListView.as_view(), name="deviceview_list"),
     path("device-view/add/", views.DeviceViewEditView.as_view(), name="deviceview_add"),
+    path(
+        "device-view/import/",
+        views.DeviceViewBulkImportView.as_view(),
+        name="deviceview_import",
+    ),
     path("device-view/<int:pk>/", views.DeviceViewView.as_view(), name="deviceview"),
     path(
         "device-view/<int:pk>/edit/",

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/netbox_device_view/utils.py

@@ -10,19 +10,27 @@ def process_interfaces(interfaces, ports_chassis, dev):
         for itf in interfaces:
             if itf.type == "virtual" or itf.type == "lag":
                 continue
-            regex = r"^(?P<type>([a-zA-Z\-_]*))(\/|(?P<dev>[0-9]+).|\s)?((?P<module>[0-9]+).|\s)?((?P<port>[0-9]+))$"
-            matches = re.search(regex, itf.name.lower())
-            if matches:
-                itf.stylename = (
-                    (matches["type"] or "")
-                    + (matches["module"] or "")
-                    + "-"
-                    + matches["port"]
-                )
-            else:
-                itf.stylename = re.sub(r"[^.a-zA-Z\d]", "-", itf.name.lower())
-            if itf.stylename.isdigit():
+            # Convert to lowercase and replace common separators with hyphens
+            # This replaces the original regex matching and if/else block
+            stylename = re.sub(r"[/\.\s]+", "-", itf.name.lower())
+
+            # Clean up multiple hyphens and leading/trailing hyphens
+            stylename = re.sub(r"-+", "-", stylename).strip("-")
+
+            # If the name becomes empty after cleaning, use a fallback
+            if not stylename:
+                stylename = f"iface-{itf.pk}"  # Use a unique fallback
+
+            # Assign the generated stylename back to the object property
+            itf.stylename = stylename
+
+            # Check if the stylename exists and starts with a digit or a hyphen
+            # This replaces the original 'if itf.stylename.isdigit():' line
+            if itf.stylename and (
+                itf.stylename[0].isdigit() or itf.stylename[0] == "-"
+            ):
                 itf.stylename = f"p{itf.stylename}"
+
             if dev not in ports_chassis:
                 ports_chassis[dev] = []
             ports_chassis[dev].append(itf)
@@ -55,13 +63,15 @@ def prepare(obj):
                 device_type=obj.device_type
             ).grid_template_area
             modules[1] = obj.modules.all()
-            ports_chassis = process_interfaces(obj.interfaces.all(), ports_chassis, 1)
+            ports_chassis = process_interfaces(
+                obj.interfaces.all(), ports_chassis, obj.name
+            )
             ports_chassis = process_ports(obj.frontports.all(), ports_chassis, "Front")
             ports_chassis = process_ports(obj.rearports.all(), ports_chassis, "Rear")
             ports_chassis = process_ports(
                 ConsolePort.objects.filter(device_id=obj.id),
                 ports_chassis,
-                list(ports_chassis.keys())[0],
+                obj.name,
             )
         else:
             for member in obj.virtual_chassis.members.all():

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/netbox_device_view/views.py

@@ -6,6 +6,9 @@ from .utils import prepare
 from django.http import HttpResponse
 import pprint
 
+from netbox.views.generic import BulkImportView
+from netbox_device_view.forms import DeviceViewImportForm
+
 
 class DeviceViewView(generic.ObjectView):
     queryset = models.DeviceView.objects
@@ -21,6 +24,11 @@ class DeviceViewEditView(generic.ObjectEditView):
     form = forms.DeviceViewForm
 
 
+class DeviceViewBulkImportView(BulkImportView):
+    queryset = models.DeviceView.objects.all()
+    model_form = DeviceViewImportForm
+
+
 class DeviceViewDeleteView(generic.ObjectDeleteView):
     queryset = models.DeviceView.objects
 

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/netbox_device_view.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: netbox-device-view
-Version: 0.1.7
+Version: 0.1.10a0
 Summary: NetBox Device View plugin
 Home-page: https://github.com/peterbaumert/netbox-device-view
 Author: Peter Baumert
@@ -8,6 +8,13 @@ Keywords: netbox,netbox-plugin
 Classifier: Framework :: Django
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: summary
 
 # Netbox Device View Plugin
 ![Version](https://img.shields.io/pypi/v/netbox-device-view) ![Downloads](https://img.shields.io/pypi/dm/netbox-device-view)

{netbox_device_view-0.1.7 → netbox_device_view-0.1.10a0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="netbox-device-view",
-    version="0.1.7",
+    version="0.1.10-alpha",
     description="NetBox Device View plugin",
     packages=find_packages(),
     author="Peter Baumert",

netbox_device_view-0.1.7/netbox_device_view/forms.py

@@ -1,8 +0,0 @@
-from netbox.forms import NetBoxModelForm
-from .models import DeviceView
-
-
-class DeviceViewForm(NetBoxModelForm):
-    class Meta:
-        model = DeviceView
-        fields = ("device_type", "grid_template_area")