Merge pull request #22 from peterbaumert/enhancements

- added regex provided by @cybarox THANKS
- use device "position" by default or 1 for non virtual chassis members not autodetection
- add fallback name to all lower case + [^.a-zA-Z\d] changed to "-"

Author: peterbaumert

README.md

@@ -43,7 +43,8 @@ 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}

examples/C9500-24Y4C.css

@@ -2,5 +2,5 @@
 .deviceview.area {
 	grid-template-areas:
 		"gigabitethernet-0 x twentyfivegige0-1 twentyfivegige0-3 twentyfivegige0-5 twentyfivegige0-7 twentyfivegige0-9 twentyfivegige0-11 twentyfivegige0-13 twentyfivegige0-15 twentyfivegige0-17 twentyfivegige0-19 twentyfivegige0-21 twentyfivegige0-23 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 hundredgige0-25 hundredgige0-25 hundredgige0-27 hundredgige0-27"
-		"con-0 x twentyfivegige0-2 twentyfivegige0-4 twentyfivegige0-6 twentyfivegige0-8 twentyfivegige0-10 twentyfivegige0-12 twentyfivegige0-14 twentyfivegige0-16 twentyfivegige0-18 twentyfivegige0-20 twentyfivegige0-22 twentyfivegige0-24 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1  hundredgige0-26 hundredgige0-26 hundredgige0-28 hundredgige0-28";
-}
+		"con0 x twentyfivegige0-2 twentyfivegige0-4 twentyfivegige0-6 twentyfivegige0-8 twentyfivegige0-10 twentyfivegige0-12 twentyfivegige0-14 twentyfivegige0-16 twentyfivegige0-18 twentyfivegige0-20 twentyfivegige0-22 twentyfivegige0-24 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 s1  hundredgige0-26 hundredgige0-26 hundredgige0-28 hundredgige0-28";
+}

netbox_device_view/templates/netbox_device_view/deviceview.html

@@ -92,10 +92,6 @@ <h4>Options</h4>
 				<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 @@
 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,24 @@ 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 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 dev not in ports_chassis:
+                ports_chassis[dev] = []
+            ports_chassis[dev].append(port)
     return ports_chassis
 
 
@@ -62,7 +51,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(