netbox-vcenter-server 0.2.0__tar.gz → 0.3.1__tar.gz

{netbox_vcenter_server-0.2.0/netbox_vcenter_server.egg-info → netbox_vcenter_server-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-vcenter-server
-Version: 0.2.0
+Version: 0.3.1
 Summary: NetBox plugin for viewing and importing VMs from VMware vCenter servers
 Author-email: sieteunoseis <jeremy.worden@gmail.com>
 License: Apache-2.0
@@ -29,7 +29,7 @@ Dynamic: license-file
 
 # NetBox vCenter Server Plugin
 
-<img src="docs/icon.png" alt="NetBox vCenter Server Plugin" width="100" align="right">
+<img src="https://raw.githubusercontent.com/sieteunoseis/netbox-vcenter-server/master/docs/icon.png" alt="NetBox vCenter Server Plugin" width="100" align="right">
 
 A NetBox plugin for viewing and importing VMs from VMware vCenter servers.
 
@@ -46,7 +46,7 @@ A NetBox plugin for viewing and importing VMs from VMware vCenter servers.
 - **VM Import** - Import VMs from vCenter into NetBox with one click
 - **Comparison View** - Compare vCenter VMs with NetBox to find differences
 - **Manual Cache Control** - Data persists until you click Refresh
-- **Duo MFA Support** - Works with environments requiring Duo authentication
+- **MFA/2FA Support** - Works with environments requiring multi-factor authentication
 
 ## Requirements
 
@@ -102,7 +102,7 @@ PLUGINS_CONFIG = {
         'verify_ssl': False, # SSL verification (False for self-signed certs)
         # MFA/2FA settings (optional)
         'mfa_enabled': True,  # Show MFA warning in UI
-        'mfa_label': 'Duo',   # Label shown: "Duo", "2FA", "MFA"
+        'mfa_label': 'MFA',   # Label shown in UI (e.g., "Duo", "2FA", "MFA")
         'mfa_message': 'Check your authenticator after clicking Connect & Sync.',
         # Name matching for duplicate detection
         # Options: "exact" (full name), "hostname" (strip domain), "regex"
@@ -125,7 +125,7 @@ PLUGINS_CONFIG = {
 2. Select a vCenter server from the dropdown
 3. Enter your username and password
 4. Click **Connect & Sync**
-5. If Duo MFA is enabled, approve the push notification on your phone
+5. If MFA is enabled, approve the authentication prompt
 6. VMs will be fetched and cached (data persists until you click Refresh)
 
 ### Importing VMs to NetBox
@@ -156,7 +156,7 @@ PLUGINS_CONFIG = {
 - Verify vCenter hostname is reachable from the NetBox server
 - Check that credentials are correct (use `domain\username` format)
 - For self-signed certificates, set `verify_ssl: False`
-- If using Duo MFA, ensure you approve the push notification promptly
+- If using MFA/2FA, ensure you approve the authentication prompt promptly
 
 ### Authentication issues
 

{netbox_vcenter_server-0.2.0 → netbox_vcenter_server-0.3.1}/README.md

@@ -1,6 +1,6 @@
 # NetBox vCenter Server Plugin
 
-<img src="docs/icon.png" alt="NetBox vCenter Server Plugin" width="100" align="right">
+<img src="https://raw.githubusercontent.com/sieteunoseis/netbox-vcenter-server/master/docs/icon.png" alt="NetBox vCenter Server Plugin" width="100" align="right">
 
 A NetBox plugin for viewing and importing VMs from VMware vCenter servers.
 
@@ -17,7 +17,7 @@ A NetBox plugin for viewing and importing VMs from VMware vCenter servers.
 - **VM Import** - Import VMs from vCenter into NetBox with one click
 - **Comparison View** - Compare vCenter VMs with NetBox to find differences
 - **Manual Cache Control** - Data persists until you click Refresh
-- **Duo MFA Support** - Works with environments requiring Duo authentication
+- **MFA/2FA Support** - Works with environments requiring multi-factor authentication
 
 ## Requirements
 
@@ -73,7 +73,7 @@ PLUGINS_CONFIG = {
         'verify_ssl': False, # SSL verification (False for self-signed certs)
         # MFA/2FA settings (optional)
         'mfa_enabled': True,  # Show MFA warning in UI
-        'mfa_label': 'Duo',   # Label shown: "Duo", "2FA", "MFA"
+        'mfa_label': 'MFA',   # Label shown in UI (e.g., "Duo", "2FA", "MFA")
         'mfa_message': 'Check your authenticator after clicking Connect & Sync.',
         # Name matching for duplicate detection
         # Options: "exact" (full name), "hostname" (strip domain), "regex"
@@ -96,7 +96,7 @@ PLUGINS_CONFIG = {
 2. Select a vCenter server from the dropdown
 3. Enter your username and password
 4. Click **Connect & Sync**
-5. If Duo MFA is enabled, approve the push notification on your phone
+5. If MFA is enabled, approve the authentication prompt
 6. VMs will be fetched and cached (data persists until you click Refresh)
 
 ### Importing VMs to NetBox
@@ -127,7 +127,7 @@ PLUGINS_CONFIG = {
 - Verify vCenter hostname is reachable from the NetBox server
 - Check that credentials are correct (use `domain\username` format)
 - For self-signed certificates, set `verify_ssl: False`
-- If using Duo MFA, ensure you approve the push notification promptly
+- If using MFA/2FA, ensure you approve the authentication prompt promptly
 
 ### Authentication issues
 

{netbox_vcenter_server-0.2.0 → netbox_vcenter_server-0.3.1}/netbox_vcenter/__init__.py

@@ -7,7 +7,7 @@ Supports multiple vCenter servers with per-server caching and VM import to NetBo
 
 from netbox.plugins import PluginConfig
 
-__version__ = "0.2.0"
+__version__ = "0.3.1"
 
 
 class VcenterConfig(PluginConfig):
@@ -53,6 +53,22 @@ class VcenterConfig(PluginConfig):
         "default_role": "",
         # Optional default platform slug for imported VMs (must exist in NetBox, or leave empty)
         "default_platform": "",
+        # Platform mappings - auto-map vCenter guest OS to NetBox platform
+        # Each mapping has a "pattern" (regex to match against guest OS) and "platform" (NetBox platform slug)
+        # Mappings are evaluated in order; first match wins
+        # Example:
+        # "platform_mappings": [
+        #     {"pattern": r"Microsoft Windows Server 2022", "platform": "windows-server-2022"},
+        #     {"pattern": r"Microsoft Windows Server 2019", "platform": "windows-server-2019"},
+        #     {"pattern": r"Microsoft Windows Server", "platform": "windows-server"},
+        #     {"pattern": r"Microsoft Windows 1[01]", "platform": "windows-desktop"},
+        #     {"pattern": r"Ubuntu", "platform": "ubuntu"},
+        #     {"pattern": r"CentOS", "platform": "centos"},
+        #     {"pattern": r"Red Hat", "platform": "rhel"},
+        #     {"pattern": r"Debian", "platform": "debian"},
+        #     {"pattern": r"VMware Photon", "platform": "photon"},
+        # ]
+        "platform_mappings": [],
     }
 
 

{netbox_vcenter_server-0.2.0 → netbox_vcenter_server-0.3.1}/netbox_vcenter/client.py

@@ -70,9 +70,7 @@ class VCenterClient:
 
     def _get_objects_of_type(self, obj_type):
         """Get all objects of a specific type from vCenter."""
-        view_mgr = self.content.viewManager.CreateContainerView(
-            self.content.rootFolder, [obj_type], True
-        )
+        view_mgr = self.content.viewManager.CreateContainerView(self.content.rootFolder, [obj_type], True)
         try:
             return list(view_mgr.view)
         finally:
@@ -127,9 +125,7 @@ class VCenterClient:
 
                     # Calculate total disk capacity
                     disk_devices = [
-                        device
-                        for device in vm.config.hardware.device
-                        if isinstance(device, vim.vm.device.VirtualDisk)
+                        device for device in vm.config.hardware.device if isinstance(device, vim.vm.device.VirtualDisk)
                     ]
                     if disk_devices:
                         total_kb = sum(d.capacityInKB for d in disk_devices)

{netbox_vcenter_server-0.2.0 → netbox_vcenter_server-0.3.1}/netbox_vcenter/forms.py

@@ -5,6 +5,16 @@ from django.conf import settings
 from virtualization.models import Cluster
 
 
+class ClusterChoiceField(forms.ModelChoiceField):
+    """Custom ModelChoiceField that displays Cluster Group > Cluster Name."""
+
+    def label_from_instance(self, obj):
+        """Return label in 'Group > Name' format."""
+        if obj.group:
+            return f"{obj.group.name} > {obj.name}"
+        return obj.name
+
+
 class VCenterConnectForm(forms.Form):
     """Form for connecting to a vCenter server."""
 
@@ -41,8 +51,8 @@ class VCenterConnectForm(forms.Form):
 class VMImportForm(forms.Form):
     """Form for importing VMs from vCenter to NetBox."""
 
-    cluster = forms.ModelChoiceField(
-        queryset=Cluster.objects.all(),
+    cluster = ClusterChoiceField(
+        queryset=Cluster.objects.select_related("group").order_by("group__name", "name"),
         label="Target Cluster",
         help_text="NetBox cluster to assign the imported VMs to",
         widget=forms.Select(attrs={"class": "form-select"}),

{netbox_vcenter_server-0.2.0 → netbox_vcenter_server-0.3.1}/netbox_vcenter/views.py

@@ -4,16 +4,16 @@ import json
 import logging
 import re
 
+from dcim.models import Platform
 from django.conf import settings
 from django.contrib import messages
 from django.core.cache import cache
 from django.shortcuts import redirect, render
 from django.utils import timezone
 from django.views.generic import View
-from dcim.models import Platform
 from extras.models import Tag
 from ipam.models import IPAddress
-from virtualization.models import Cluster, VMInterface, VirtualMachine
+from virtualization.models import Cluster, VirtualMachine, VMInterface
 
 from .client import connect_and_fetch
 from .forms import VCenterConnectForm, VMImportForm
@@ -68,9 +68,45 @@ def get_import_config() -> dict:
         "default_tag": config.get("default_tag", ""),
         "default_role": config.get("default_role", ""),
         "default_platform": config.get("default_platform", ""),
+        "platform_mappings": config.get("platform_mappings", []),
     }
 
 
+def get_platform_for_guest_os(guest_os: str, mappings: list) -> Platform | None:
+    """
+    Match vCenter guest OS to a NetBox platform using configured mappings.
+
+    Args:
+        guest_os: The guest OS string from vCenter (e.g., "Microsoft Windows Server 2019 (64-bit)")
+        mappings: List of dicts with "pattern" (regex) and "platform" (slug) keys
+
+    Returns:
+        Platform object if a match is found and platform exists, None otherwise
+    """
+    if not guest_os or not mappings:
+        return None
+
+    for mapping in mappings:
+        pattern = mapping.get("pattern", "")
+        platform_slug = mapping.get("platform", "")
+
+        if not pattern or not platform_slug:
+            continue
+
+        try:
+            if re.search(pattern, guest_os, re.IGNORECASE):
+                try:
+                    return Platform.objects.get(slug=platform_slug)
+                except Platform.DoesNotExist:
+                    logger.warning(f"Platform '{platform_slug}' not found for guest OS '{guest_os}'")
+                    return None
+        except re.error:
+            logger.warning(f"Invalid regex pattern in platform_mappings: {pattern}")
+            continue
+
+    return None
+
+
 def get_name_for_import(vm_name: str, normalize: bool, mode: str, pattern: str) -> str:
     """
     Get the name to use when importing a VM.
@@ -364,6 +400,7 @@ class VMImportView(View):
         default_tag_slug = import_config["default_tag"]
         default_role_slug = import_config["default_role"]
         default_platform_slug = import_config["default_platform"]
+        platform_mappings = import_config["platform_mappings"]
 
         # Look up default tag, role, platform if configured
         default_tag = None
@@ -379,6 +416,7 @@ class VMImportView(View):
         if default_role_slug:
             try:
                 from dcim.models import DeviceRole
+
                 default_role = DeviceRole.objects.get(slug=default_role_slug)
             except Exception:
                 logger.warning(f"Default role '{default_role_slug}' not found in NetBox")
@@ -423,8 +461,15 @@ class VMImportView(View):
                         # Update role and platform if configured and not already set
                         if default_role and not existing_vm.role:
                             existing_vm.role = default_role
-                        if default_platform and not existing_vm.platform:
-                            existing_vm.platform = default_platform
+                        if not existing_vm.platform:
+                            if default_platform:
+                                existing_vm.platform = default_platform
+                            elif platform_mappings:
+                                # Try to map guest OS to platform
+                                guest_os = vm_data.get("guest_os")
+                                mapped_platform = get_platform_for_guest_os(guest_os, platform_mappings)
+                                if mapped_platform:
+                                    existing_vm.platform = mapped_platform
 
                         # Update primary IP if available
                         primary_ip = vm_data.get("primary_ip")
@@ -450,6 +495,12 @@ class VMImportView(View):
                 # Determine status based on power state
                 status = "active" if vm_data.get("power_state") == "on" else "offline"
 
+                # Determine platform - use default if set, otherwise try guest OS mapping
+                vm_platform = default_platform
+                if not vm_platform and platform_mappings:
+                    guest_os = vm_data.get("guest_os")
+                    vm_platform = get_platform_for_guest_os(guest_os, platform_mappings)
+
                 # Create the VM with normalized or original name
                 vm = VirtualMachine(
                     name=import_name,
@@ -459,7 +510,7 @@ class VMImportView(View):
                     disk=vm_data.get("disk_gb"),
                     status=status,
                     role=default_role,
-                    platform=default_platform,
+                    platform=vm_platform,
                     comments=f"Imported from vCenter {server} on {timezone.now().strftime('%Y-%m-%d %H:%M')}",
                 )
                 vm.full_clean()

{netbox_vcenter_server-0.2.0 → netbox_vcenter_server-0.3.1/netbox_vcenter_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-vcenter-server
-Version: 0.2.0
+Version: 0.3.1
 Summary: NetBox plugin for viewing and importing VMs from VMware vCenter servers
 Author-email: sieteunoseis <jeremy.worden@gmail.com>
 License: Apache-2.0
@@ -29,7 +29,7 @@ Dynamic: license-file
 
 # NetBox vCenter Server Plugin
 
-<img src="docs/icon.png" alt="NetBox vCenter Server Plugin" width="100" align="right">
+<img src="https://raw.githubusercontent.com/sieteunoseis/netbox-vcenter-server/master/docs/icon.png" alt="NetBox vCenter Server Plugin" width="100" align="right">
 
 A NetBox plugin for viewing and importing VMs from VMware vCenter servers.
 
@@ -46,7 +46,7 @@ A NetBox plugin for viewing and importing VMs from VMware vCenter servers.
 - **VM Import** - Import VMs from vCenter into NetBox with one click
 - **Comparison View** - Compare vCenter VMs with NetBox to find differences
 - **Manual Cache Control** - Data persists until you click Refresh
-- **Duo MFA Support** - Works with environments requiring Duo authentication
+- **MFA/2FA Support** - Works with environments requiring multi-factor authentication
 
 ## Requirements
 
@@ -102,7 +102,7 @@ PLUGINS_CONFIG = {
         'verify_ssl': False, # SSL verification (False for self-signed certs)
         # MFA/2FA settings (optional)
         'mfa_enabled': True,  # Show MFA warning in UI
-        'mfa_label': 'Duo',   # Label shown: "Duo", "2FA", "MFA"
+        'mfa_label': 'MFA',   # Label shown in UI (e.g., "Duo", "2FA", "MFA")
         'mfa_message': 'Check your authenticator after clicking Connect & Sync.',
         # Name matching for duplicate detection
         # Options: "exact" (full name), "hostname" (strip domain), "regex"
@@ -125,7 +125,7 @@ PLUGINS_CONFIG = {
 2. Select a vCenter server from the dropdown
 3. Enter your username and password
 4. Click **Connect & Sync**
-5. If Duo MFA is enabled, approve the push notification on your phone
+5. If MFA is enabled, approve the authentication prompt
 6. VMs will be fetched and cached (data persists until you click Refresh)
 
 ### Importing VMs to NetBox
@@ -156,7 +156,7 @@ PLUGINS_CONFIG = {
 - Verify vCenter hostname is reachable from the NetBox server
 - Check that credentials are correct (use `domain\username` format)
 - For self-signed certificates, set `verify_ssl: False`
-- If using Duo MFA, ensure you approve the push notification promptly
+- If using MFA/2FA, ensure you approve the authentication prompt promptly
 
 ### Authentication issues
 

{netbox_vcenter_server-0.2.0 → netbox_vcenter_server-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-vcenter-server"
-version = "0.2.0"
+version = "0.3.1"
 description = "NetBox plugin for viewing and importing VMs from VMware vCenter servers"
 readme = "README.md"
 license = {text = "Apache-2.0"}