Enhance UX for Device Discovery (#31)

* (feature): Autodiscovery now parses interface inventory from SNMP or SSH grabs into InventoryInterface model to be properly displayed on Inventory/Device CRUD modal.

* (feature): Correct some issues with Inventory Discovery results page not installing properly and enhanced UX.

Author: blake-russell

src/network_ops_dashboard/inventory/discovery/scripts/services.py

@@ -167,6 +167,66 @@ def parse_interfaces(raw_list):
             interfaces.append(entry.strip())
     return interfaces
 
+def parse_interface_name(name):
+    """
+    Parse interface names into (prefix, rack, slot, subslot, port).
+    Supports Cisco (IOS, NX-OS, IOS-XR) and Juniper (ge-, xe-, et-, ae-)
+    Examples:
+        Cisco:
+            Ethernet2/43               -> slot=2, port=43
+            GigabitEthernet1/2/3       -> slot=1, subslot=2, port=3
+            TenGigEthernet0/1/2/3      -> rack=0, slot=1, subslot=2, port=3
+            HundredGigE0/0/0/1         -> rack=0, slot=0, subslot=0, port=1
+            Port-Channel1.2405         -> single logical interface
+        Juniper:
+            ge-0/0/1                   -> rack=0, slot=0, subslot=0, port=1
+            xe-1/2/0                   -> rack=1, slot=2, subslot=0, port=0
+            et-0/0/2                   -> rack=0, slot=0, subslot=2, port=2
+            ae1                        -> prefix=ae, port=1
+    """
+    # Normalize whitespace and strip subinterfaces
+    name = name.strip()
+    base_name = name.split(".")[0]
+
+    # Juniper-style (starts with ge-, xe-, et-, ae-, etc.)
+    juniper_pattern = r"^([a-z]{2,3})-(\d+)(?:/(\d+))?(?:/(\d+))?(?:/(\d+))?$"
+    junos = re.match(juniper_pattern, base_name, re.IGNORECASE)
+    if junos:
+        prefix = junos.group(1)
+        nums = [int(n) for n in junos.groups()[1:] if n is not None]
+        # Pad right side with None so we can unpack 4 positions
+        while len(nums) < 4:
+            nums.append(None)
+        rack, slot, subslot, port = nums[:4]
+        return prefix, rack, slot, subslot, port
+
+    # Cisco-style (letters followed by numeric segments)
+    cisco_pattern = r"^([A-Za-z\-]+)([\d/\.]*)$"
+    m = re.match(cisco_pattern, base_name)
+    if not m:
+        # Non-matching — treat entire thing as logical name
+        return name, None, None, None, None
+
+    prefix, rest = m.groups()
+    # Get all numeric parts (ignore trailing dot segments)
+    nums = [int(n) for n in rest.split("/") if n.isdigit()]
+
+    rack = slot = subslot = port = None
+    if len(nums) == 1:
+        # e.g. Mgmt0, Vlan100
+        port = nums[0]
+    elif len(nums) == 2:
+        # e.g. Ethernet2/43
+        slot, port = nums
+    elif len(nums) == 3:
+        # e.g. GigabitEthernet1/2/3
+        slot, subslot, port = nums
+    elif len(nums) >= 4:
+        # e.g. TenGigEthernet0/1/2/3, HundredGigE0/0/0/1
+        rack, slot, subslot, port = nums[:4]
+
+    return prefix, rack, slot, subslot, port
+
 def reverse_dns(ip):
     try:
         return socket.gethostbyaddr(ip)[0].split('.')[0]

src/network_ops_dashboard/inventory/discovery/views.py

@@ -1,12 +1,15 @@
 from django.contrib.auth.decorators import login_required
 from django.views.decorators.http import require_POST
 from django.shortcuts import render, redirect, get_object_or_404
+from django.template.loader import render_to_string
 from django.utils import timezone
+from django.http import HttpResponse
 from network_ops_dashboard.inventory.discovery.scripts.services import run_discovery
 from network_ops_dashboard.inventory.discovery.forms import DiscoveryForm
 from network_ops_dashboard.inventory.models import Inventory, InventoryInterface, Platform, Site
 from network_ops_dashboard.inventory.discovery.models import DiscoveryJob, DiscoveredDevice
 from network_ops_dashboard.inventory.discovery.tasks import start_discovery_in_thread
+from network_ops_dashboard.inventory.discovery.scripts.services import parse_interface_name
 
 @require_POST
 @login_required(login_url='/accounts/login/')
@@ -42,7 +45,6 @@ def inventory_discovery_results(request, job_id):
 def inventory_discovery_install(request, device_id):
     d = get_object_or_404(DiscoveredDevice, pk=device_id)
 
-    # Get overrides from form
     hostname = request.POST.get("hostname") or d.hostname or d.ip
     vendor = d.raw.get("vendor", "")
     model = request.POST.get("model") or d.raw.get("model", "")
@@ -51,15 +53,16 @@ def inventory_discovery_install(request, device_id):
     serial = d.raw.get("serial", "")
     site_id = request.POST.get("site")
     site_obj = get_object_or_404(Site, pk=site_id)
+    if not site_id or not site_id.isdigit():
+        return HttpResponse("Please select a site before installing.", status=400)
+    site_obj = get_object_or_404(Site, pk=int(site_id))
 
-    # Find or create Platform entry
     platform_obj, _ = Platform.objects.get_or_create(
         manufacturer=vendor,
         PID=pid,
         name=model,
     )
 
-    # Create Inventory device
     new_dev = Inventory.objects.create(
         name=hostname,
         name_lookup=hostname,
@@ -73,11 +76,34 @@ def inventory_discovery_install(request, device_id):
     )
 
     for iface in d.raw.get("interfaces", []):
-        InventoryInterface.objects.create(device=new_dev, name=iface)
+        prefix, rack, slot, subslot, port = parse_interface_name(iface)
+        InventoryInterface.objects.create(
+            device=new_dev,
+            name=iface,
+            prefix=prefix,
+            rack=rack,
+            slot=slot,
+            subslot=subslot,
+            port=port,
+        )
 
+    # Mark this discovered device as installed
     d.added_to_inventory = True
     d.save()
 
+    # HTMX request > re-render the _status partial
+    if request.headers.get("HX-Request"):
+        # Grab the job again so we get updated devices
+        job = d.job
+        devices = job.devices.all().order_by("ip")
+        sites = Site.objects.all()
+        html = render_to_string(
+            "network_ops_dashboard/inventory/discovery/_status.html",
+            {"job": job, "devices": devices, "sites": sites},
+            request=request,
+        )
+        return HttpResponse(html)
+
     return redirect("inventory_home")
 
 @login_required(login_url='/accounts/login/')

src/network_ops_dashboard/inventory/forms.py

@@ -8,25 +8,41 @@
 class InventoryForm(forms.ModelForm):
     class Meta:
         model = Inventory
-        fields = ('name', 'name_lookup', 'site', 'platform', 'serial_number', \
-            'ipaddress_mgmt', 'ipaddress_rest', 'ipaddress_gmni', 'port_rest', 'port_netc', \
+        fields = ('status', 'name', 'name_lookup', 'site', 'platform', 'serial_number', \
+            'ipaddress_mgmt', 'ipaddress_rest', 'ipaddress_gnmi', 'port_rest', 'port_netc', \
             'port_gnmi', 'device_tag', 'creds_ssh', 'creds_rest')
-    name = forms.CharField(label="Device Name:", help_text="<br>Enter name that is resolved from mgmt IP excluding<br>the domain/subdomain.", required=True)
-    name_lookup = forms.CharField(label="Name Lookup:", help_text="<br>ie: devicename.companyname.com", required=False)
+    DEVICE_STATUS_CHOICES = (
+    ("ACTIVE", "Active"),
+    ("STAGING", "Staging"),
+    ("MAINT", "Maintenance"),
+    ("RETIRED", "Retired"),
+    )
+    status = forms.ChoiceField(label="Status:", choices=DEVICE_STATUS_CHOICES, required=True)
+    name = forms.CharField(label="Hostname:", help_text="<br>Hostname of device", required=True)
+    name_lookup = forms.CharField(label="FQDN:", help_text="<br>ie: devicename.companyname.com", required=False)
     site = forms.ModelChoiceField(label="Site:", queryset=Site.objects.all(), required=False)
     platform = forms.ModelChoiceField(label="Platform:", queryset=Platform.objects.all(), required=False)
     serial_number = forms.CharField(label="Serial Number:", required=False)
     ipaddress_mgmt = forms.GenericIPAddressField(label="IP Address (MGMT):", initial='0.0.0.0')
     ipaddress_rest = forms.GenericIPAddressField(label="IP Address (REST):", initial='0.0.0.0')
-    ipaddress_gmni = forms.GenericIPAddressField(label="IP Address (gNMI):", initial='0.0.0.0')
+    ipaddress_gnmi = forms.GenericIPAddressField(label="IP Address (gNMI):", initial='0.0.0.0')
     port_rest = forms.CharField(label="Port (REST):", initial='443')
     port_netc = forms.CharField(label="Port (NETCONF):", initial='830')
     port_gnmi = forms.CharField(label="Port (gNMI):", initial='9339')
     device_tag = forms.ModelMultipleChoiceField(label="Device Tags:", queryset=DeviceTag.objects.all(), widget=forms.SelectMultiple(attrs={'class': 'form-select'}), required=False)
-    # priority_interfaces = forms.CharField(label="Priority Interfaces:", help_text="<br>ie: GigabitEthernet2/1/1, TenGigabitEthernet1/1/1, etc", required=False)
     creds_ssh = forms.ModelChoiceField(label="SSH Credential:", queryset=NetworkCredential.objects.all(), required=False)
     creds_rest = forms.ModelChoiceField(label="REST Credential:", queryset=NetworkCredential.objects.all(), required=False)
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Handle instances with missing or blank IP fields
+        instance = kwargs.get("instance")
+        if instance:
+            for field_name in ("ipaddress_rest", "ipaddress_gnmi"):
+                value = getattr(instance, field_name, None)
+                if not value:
+                    self.initial[field_name] = "0.0.0.0"
+
 class PlatformForm(forms.ModelForm):
     class Meta:
         model = Platform

src/network_ops_dashboard/inventory/models.py

@@ -152,8 +152,8 @@ class Status(models.TextChoices):
     serial_number = models.CharField(max_length=50, blank=True, default="")
     # Management
     ipaddress_mgmt = models.GenericIPAddressField(protocol='IPv4', null=True, blank=True)
-    ipaddress_rest = models.GenericIPAddressField(protocol='IPv4', null=True, blank=True)
-    ipaddress_gnmi = models.GenericIPAddressField(protocol='IPv4', null=True, blank=True)
+    ipaddress_rest = models.GenericIPAddressField(protocol='IPv4', null=True, blank=True, default='0.0.0.0')
+    ipaddress_gnmi = models.GenericIPAddressField(protocol='IPv4', null=True, blank=True, default='0.0.0.0')
     port_rest = models.IntegerField(default=443, validators=[MinValueValidator(1), MaxValueValidator(65535)])
     port_netc = models.IntegerField(default=830, validators=[MinValueValidator(1), MaxValueValidator(65535)])
     port_gnmi = models.IntegerField(default=9339, validators=[MinValueValidator(1), MaxValueValidator(65535)])