netbox-device-view 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

netbox_device_view/templates/netbox_device_view/deviceview.html

@@ -92,10 +92,6 @@
 				<input onChange="this.form.submit()" type="checkbox" name="cable_colors" class="form-check-input" {% if cable_colors == "on" %}checked{% endif %} />
 				<label for="cable_colors" class="form-check-label">Cable Colors</label>
 			</div>
-			<div class="form-check">
-				<input onChange="this.form.submit()" type="checkbox" name="something_else" class="form-check-input" {% if something_else == "on" %}checked{% endif %} />
-				<label for="something_else" class="form-check-label">something_else</label>
-			</div>
 		</form>
 	</div>
 </div>

netbox_device_view/utils.py

@@ -5,10 +5,12 @@ from django.core.exceptions import ObjectDoesNotExist
 import re
 
 
-def process_interfaces(interfaces, ports_chassis, dev=1):
+def process_interfaces(interfaces, ports_chassis, dev):
     if interfaces is not None:
         for itf in interfaces:
-            regex = r"^(?P<type>([a-z]+))((?P<dev>[0-9]+)\/)?((?P<module>[0-9]+)\/)?((?P<port>[0-9]+))$"
+            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 = (
@@ -17,37 +19,28 @@ def process_interfaces(interfaces, ports_chassis, dev=1):
                     + "-"
                     + matches["port"]
                 )
-                sw = int(matches["dev"] or 999)
-                if (
-                    hasattr(itf, "mgmt_only")
-                    and itf.mgmt_only
-                    and itf.type != "virtual"
-                ) or hasattr(itf, "mgmt_only") == False:
-                    sw = dev
-                if sw not in ports_chassis and sw != 999:
-                    ports_chassis[sw] = []
-                if sw != 999:
-                    ports_chassis[sw].append(itf)
+            else:
+                itf.stylename = re.sub(r"[^.a-zA-Z\d]", "-", itf.name.lower())
+            if itf.stylename.isdigit():
+                itf.stylename = f"p{itf.stylename}"
+            if dev not in ports_chassis:
+                ports_chassis[dev] = []
+            ports_chassis[dev].append(itf)
     return ports_chassis
 
 
-def process_ports(ports, ports_chassis, where):
+def process_ports(ports, ports_chassis, dev):
     if ports is not None:
         for port in ports:
-            regex = r"^(?P<type>([A-Za-z]+))[\s]?((?P<port>[0-9]+))$"
-            matches = re.search(regex, port.name.lower())
-            port.is_port = True
-            if matches:
-                port.stylename = (matches["type"] or "") + "-" + matches["port"]
-            else:
-                port.stylename = re.sub(r"[^.a-zA-Z\d]", "-", port.name.lower())
-            sw = where
             if port.type == "virtual":
-                sw = 999
-            if sw not in ports_chassis and sw != 999:
-                ports_chassis[sw] = []
-            if sw != 999:
-                ports_chassis[sw].append(port)
+                continue
+            port.is_port = True
+            port.stylename = re.sub(r"[^.a-zA-Z\d]", "-", port.name.lower())
+            if port.stylename.isdigit():
+                port.stylename = f"p{port.stylename}"
+            if dev not in ports_chassis:
+                ports_chassis[dev] = []
+            ports_chassis[dev].append(port)
     return ports_chassis
 
 
@@ -62,7 +55,7 @@ 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)
+            ports_chassis = process_interfaces(obj.interfaces.all(), ports_chassis, 1)
             ports_chassis = process_ports(obj.frontports.all(), ports_chassis, "Front")
             ports_chassis = process_ports(obj.rearports.all(), ports_chassis, "Rear")
             ports_chassis = process_ports(

{netbox_device_view-0.1.2.dist-info → netbox_device_view-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-device-view
-Version: 0.1.2
+Version: 0.1.4
 Summary: NetBox Device View plugin
 Home-page: https://github.com/peterbaumert/netbox-device-view
 Author: Peter Baumert
@@ -54,10 +54,12 @@ For each Device Type you need to add a DeviceView.
 
 It is based on a CSS grid view with 32 columns and 2 rows.
 You need to specify the grid-template-areas. 
-- Interface positions will use the following format: {interfacename}{module}-{port}
+- Interface positions will use the following format: {interfacename}{module}-{port} 
+  or fallback to all lower case + [^.a-zA-Z\d] changed to "-"
 - leading "empties" can be specified as x
 - trailing "empties" can be specified as z
 - between "empties" can be named s{0-99}
+- numeric only ports have to be prefixed with "p" e.g. "p1"
 
 Example for Cisco C9300-24T with 8x 10G module ( more in [examples](https://github.com/peterbaumert/netbox-device-view/blob/main/examples/) folder )
 

{netbox_device_view-0.1.2.dist-info → netbox_device_view-0.1.4.dist-info}/RECORD

@@ -6,7 +6,7 @@ netbox_device_view/navigation.py,sha256=FYzQyTOz8xzLs559KeI0nbY2nPlKipsfPeiV5y1n
 netbox_device_view/tables.py,sha256=ejhKjD5fGo_tLUhTExqBhDL_TbYVe9TPnzF-ZWHqujY,351
 netbox_device_view/template_content.py,sha256=gK7KNUcangjNl4janloXjGqs1jBSKllvYLhyf2_LaEA,1072
 netbox_device_view/urls.py,sha256=UhLOmfj0v4ofRnHM-bxisTnIPQ2viS8I47AyHiA20LU,839
-netbox_device_view/utils.py,sha256=gkBv2LpmeHkiI9Gpvf8VeoMNIo1jb-vhkW9EmVUDymQ,3472
+netbox_device_view/utils.py,sha256=uUPJnwYfEpM6H61Z-BkyNeQwmWm3xJY5Z9-Xe9Jp7f8,3191
 netbox_device_view/views.py,sha256=8OQQE-BZPM_ZXXopiRGJStdXq6eAE_tndfRVvHLkA2U,1778
 netbox_device_view/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_device_view/api/serializers.py,sha256=IQEFuIh7X22MWO4jxv4MctZQxln-DgH2eo-0IbdvBl4,456
@@ -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=fMQ7p1qi-v_Rdl39TOIgZz3XGKxNxjNUSVhHJ1YXhbk,3168
+netbox_device_view/templates/netbox_device_view/deviceview.html,sha256=iYfqjTO_tvp0c7_0s7AxKmzHC_6JRxxbRahPxoTi3NQ,2893
 netbox_device_view/templates/netbox_device_view/ports.html,sha256=H-OVDZfpa-s3NB5a3ZJmrNbir001wfYfKJss8bppBgk,1716
-netbox_device_view-0.1.2.dist-info/METADATA,sha256=2bbaFhnN2EE1sd1mY5a6M_MGtmrgtLhBWpl6dvtlTBY,3630
-netbox_device_view-0.1.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-netbox_device_view-0.1.2.dist-info/top_level.txt,sha256=Cj7X6_XpLT0jnyTyX5DMqttqc8_z3uhRYCmvnXLfWOs,19
-netbox_device_view-0.1.2.dist-info/RECORD,,
+netbox_device_view-0.1.4.dist-info/METADATA,sha256=7V-rw6KG23oeodAYd_z02M7Z9VORPlL3-mXI4mk65U8,3753
+netbox_device_view-0.1.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+netbox_device_view-0.1.4.dist-info/top_level.txt,sha256=Cj7X6_XpLT0jnyTyX5DMqttqc8_z3uhRYCmvnXLfWOs,19
+netbox_device_view-0.1.4.dist-info/RECORD,,

{netbox_device_view-0.1.2.dist-info → netbox_device_view-0.1.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any