netbox-vcenter-server 0.3.0__tar.gz → 0.4.0__tar.gz

{netbox_vcenter_server-0.3.0/netbox_vcenter_server.egg-info → netbox_vcenter_server-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-vcenter-server
-Version: 0.3.0
+Version: 0.4.0
 Summary: NetBox plugin for viewing and importing VMs from VMware vCenter servers
 Author-email: sieteunoseis <jeremy.worden@gmail.com>
 License: Apache-2.0

{netbox_vcenter_server-0.3.0 → netbox_vcenter_server-0.4.0}/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.3.0"
+__version__ = "0.4.0"
 
 
 class VcenterConfig(PluginConfig):

{netbox_vcenter_server-0.3.0 → netbox_vcenter_server-0.4.0}/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.3.0 → netbox_vcenter_server-0.4.0}/netbox_vcenter/templates/netbox_vcenter/dashboard.html

@@ -52,7 +52,13 @@
                 </div>
                 {% endif %}
 
-                <form method="post">
+                <!-- Error/status messages from htmx -->
+                <div id="sync-status"></div>
+
+                <form hx-post="{% url 'plugins:netbox_vcenter:sync' %}"
+                      hx-target="#sync-status"
+                      hx-indicator="#sync-loading"
+                      hx-disabled-elt="#sync-btn">
                     {% csrf_token %}
 
                     <div class="mb-3">
@@ -78,8 +84,14 @@
                         <br><small class="text-muted">{{ form.verify_ssl.help_text }}</small>
                     </div>
 
-                    <button type="submit" class="btn btn-primary">
-                        <i class="mdi mdi-sync"></i> Connect & Sync
+                    <button type="submit" class="btn btn-primary" id="sync-btn">
+                        <span id="sync-loading" class="htmx-indicator">
+                            <span class="spinner-border spinner-border-sm me-1" role="status"></span>
+                            Connecting...
+                        </span>
+                        <span class="sync-ready">
+                            <i class="mdi mdi-sync"></i> Connect & Sync
+                        </span>
                     </button>
                 </form>
             </div>
@@ -253,6 +265,15 @@
 </div>
 {% endif %}
 
+<style>
+/* Hide loading indicator by default, show when htmx is processing */
+.htmx-indicator { display: none; }
+.htmx-request .htmx-indicator { display: inline; }
+.htmx-request .sync-ready { display: none; }
+/* Disable form inputs while syncing */
+.htmx-request input, .htmx-request select { pointer-events: none; opacity: 0.6; }
+</style>
+
 <script>
 document.addEventListener('DOMContentLoaded', function() {
     const selectAll = document.getElementById('select-all');

{netbox_vcenter_server-0.3.0 → netbox_vcenter_server-0.4.0}/netbox_vcenter/urls.py

@@ -6,6 +6,7 @@ from . import views
 
 urlpatterns = [
     path("", views.VCenterDashboardView.as_view(), name="dashboard"),
+    path("sync/", views.VCenterSyncView.as_view(), name="sync"),
     path("refresh/<str:server>/", views.VCenterRefreshView.as_view(), name="refresh"),
     path("import/", views.VMImportView.as_view(), name="import"),
     path("compare/", views.VMComparisonView.as_view(), name="compare"),

{netbox_vcenter_server-0.3.0 → netbox_vcenter_server-0.4.0}/netbox_vcenter/views.py

@@ -310,6 +310,55 @@ class VCenterRefreshView(View):
         return redirect(f"/plugins/vcenter/?server={server}")
 
 
+class VCenterSyncView(View):
+    """Async sync endpoint for htmx - connects to vCenter and caches VMs."""
+
+    def post(self, request):
+        """Connect to vCenter and fetch VMs, return htmx response."""
+        from django.http import HttpResponse
+
+        form = VCenterConnectForm(request.POST)
+
+        if not form.is_valid():
+            return HttpResponse(
+                '<div class="alert alert-danger"><i class="mdi mdi-alert-circle"></i> '
+                "Invalid form data. Please check your inputs.</div>",
+                status=400,
+            )
+
+        server = form.cleaned_data["server"]
+        username = form.cleaned_data["username"]
+        password = form.cleaned_data["password"]
+        verify_ssl = form.cleaned_data.get("verify_ssl", False)
+
+        # Connect and fetch VMs (this is the slow part with Duo MFA)
+        vms, error = connect_and_fetch(server, username, password, verify_ssl)
+
+        if error:
+            return HttpResponse(
+                f'<div class="alert alert-danger"><i class="mdi mdi-alert-circle"></i> '
+                f"<strong>Connection Failed:</strong> {error}</div>",
+                status=400,
+            )
+
+        # Cache the data (no timeout - persists until manual refresh)
+        cache_data = {
+            "vms": vms,
+            "timestamp": timezone.now().isoformat(),
+            "server": server,
+            "count": len(vms),
+        }
+        cache.set(get_cache_key(server), cache_data, None)
+
+        # Add success message for the redirected page
+        messages.success(request, f"Successfully synced {len(vms)} VMs from {server}")
+
+        # Return HX-Redirect header to trigger page reload with new data
+        response = HttpResponse(status=200)
+        response["HX-Redirect"] = f"/plugins/vcenter/?server={server}"
+        return response
+
+
 class VMImportView(View):
     """Import selected VMs from vCenter to NetBox."""
 

{netbox_vcenter_server-0.3.0 → netbox_vcenter_server-0.4.0/netbox_vcenter_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-vcenter-server
-Version: 0.3.0
+Version: 0.4.0
 Summary: NetBox plugin for viewing and importing VMs from VMware vCenter servers
 Author-email: sieteunoseis <jeremy.worden@gmail.com>
 License: Apache-2.0

{netbox_vcenter_server-0.3.0 → netbox_vcenter_server-0.4.0}/pyproject.toml

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