netbox-device-view 0.1.7__py3-none-any.whl → 0.1.10a0__py3-none-any.whl

netbox_device_view/forms.py

@@ -1,8 +1,23 @@
-from netbox.forms import NetBoxModelForm
+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/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/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/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/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/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.dist-info → netbox_device_view-0.1.10a0.dist-info}/METADATA

@@ -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.dist-info → netbox_device_view-0.1.10a0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 netbox_device_view/__init__.py,sha256=UEs107Oqb9efDbmxnfheCTQFuaukXQgICuwW3qtJi08,532
 netbox_device_view/filtersets.py,sha256=kCPEIzue5bOeyFK_Aqhpi1VQ_YQvqyDBd4dvP2UqVAU,215
-netbox_device_view/forms.py,sha256=rr9gVDDbP_DSQP0oOTVPWjd4Mti87tcOLDf742-y6qQ,211
+netbox_device_view/forms.py,sha256=JABwFhv4zU08vSaO2C8rSdnbfuNGpeHGtGnLlY2X2wU,692
 netbox_device_view/models.py,sha256=MN6eThuBJ1bm-vsQF1zM6He5cgKpMfZeCBqHmAjuHTA,500
-netbox_device_view/navigation.py,sha256=VU3N-Z9xIgxtlkvcdPJym8R4rDtcJBr_Axjlk39V_os,494
+netbox_device_view/navigation.py,sha256=EbmAxA0a8y47jbf8XjRQvz_xAvoTwTHI9ljvC6oaX9U,646
 netbox_device_view/tables.py,sha256=ejhKjD5fGo_tLUhTExqBhDL_TbYVe9TPnzF-ZWHqujY,351
 netbox_device_view/template_content.py,sha256=4B_aiNS6ARoAv97-I6M1-2fCSIc3UcBW0tuRhy0sDZU,1072
-netbox_device_view/urls.py,sha256=UhLOmfj0v4ofRnHM-bxisTnIPQ2viS8I47AyHiA20LU,839
-netbox_device_view/utils.py,sha256=uUPJnwYfEpM6H61Z-BkyNeQwmWm3xJY5Z9-Xe9Jp7f8,3191
-netbox_device_view/views.py,sha256=8OQQE-BZPM_ZXXopiRGJStdXq6eAE_tndfRVvHLkA2U,1778
+netbox_device_view/urls.py,sha256=DtdIPVagp1KHwPDSlBsV_rJ16pGNi8l661RkXTq32HU,971
+netbox_device_view/utils.py,sha256=NPEgzyZwBMyLWf9Km2iMwJt0eOOIzUiLXRCGMw299Mc,3580
+netbox_device_view/views.py,sha256=hyz6xOt0l3l2Kh0cf-TTG84JfF810ts9_SL3SsRpbGM,2020
 netbox_device_view/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_device_view/api/serializers.py,sha256=IQEFuIh7X22MWO4jxv4MctZQxln-DgH2eo-0IbdvBl4,456
 netbox_device_view/api/urls.py,sha256=cHDu5GtasFztt4zt-rj-Qkjkul8_lJ4-pxHmJ8GfDvk,205
@@ -15,9 +15,9 @@ netbox_device_view/api/views.py,sha256=4sID0Rad-OVBnTD4MTpMpMYg-FnOLQlsyIhfcNsg2
 netbox_device_view/migrations/0001_initial.py,sha256=2maF1lEro3LuqdQqKwrBs1ABpw7KsTdTqLxiSlrU_SI,1783
 netbox_device_view/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_device_view/static/netbox_device_view/css/device_view.css,sha256=VnvjTMPrEnUkpb_odDe6-VJKhBXZ6RuII4Ce3EnPDCc,833
-netbox_device_view/templates/netbox_device_view/deviceview.html,sha256=iYfqjTO_tvp0c7_0s7AxKmzHC_6JRxxbRahPxoTi3NQ,2893
+netbox_device_view/templates/netbox_device_view/deviceview.html,sha256=gnHwrEhsIHQ5Mv8KjIgUVa65rmfMy7_hLx-wgjHV6-c,2874
 netbox_device_view/templates/netbox_device_view/ports.html,sha256=H-OVDZfpa-s3NB5a3ZJmrNbir001wfYfKJss8bppBgk,1716
-netbox_device_view-0.1.7.dist-info/METADATA,sha256=LkaZ65ldo2ebstj8kJ2qKIfCk-ELTkZqFl_20fUBf_c,3753
-netbox_device_view-0.1.7.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-netbox_device_view-0.1.7.dist-info/top_level.txt,sha256=Cj7X6_XpLT0jnyTyX5DMqttqc8_z3uhRYCmvnXLfWOs,19
-netbox_device_view-0.1.7.dist-info/RECORD,,
+netbox_device_view-0.1.10a0.dist-info/METADATA,sha256=NCvezhy__GrfdRnDO8l4AurMg_cWPfo7wKVfuw8vnp0,3901
+netbox_device_view-0.1.10a0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+netbox_device_view-0.1.10a0.dist-info/top_level.txt,sha256=Cj7X6_XpLT0jnyTyX5DMqttqc8_z3uhRYCmvnXLfWOs,19
+netbox_device_view-0.1.10a0.dist-info/RECORD,,

{netbox_device_view-0.1.7.dist-info → netbox_device_view-0.1.10a0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any