netbox-memory-input 0.2__tar.gz → 0.3__tar.gz

netbox_memory_input-0.3/PKG-INFO

@@ -0,0 +1,11 @@
+Metadata-Version: 2.4
+Name: netbox_memory_input
+Version: 0.3
+Summary: Input VM memory in GB instead of MB in NetBox.
+Home-page: https://eww.at
+Author: jannis
+License: AGPLv3
+Dynamic: author
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary

netbox_memory_input-0.3/netbox_memory_input/forms.py

@@ -0,0 +1,84 @@
+from django import forms
+from virtualization.forms import VirtualMachineForm
+import logging
+
+logger = logging.getLogger('netbox.netbox_memory_input')
+logger.setLevel(logging.DEBUG)
+
+# Add debug handler if not present
+if not logger.handlers:
+    handler = logging.FileHandler('/var/log/netbox/memory_input_debug.log')
+    handler.setLevel(logging.DEBUG)
+    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
+logger.debug("MemoryGBVirtualMachineForm module loaded")
+
+class MemoryGBVirtualMachineForm(VirtualMachineForm):
+    # Override both memory and disk fields
+    memory = forms.FloatField(
+        required=False,
+        label='Memory (GB)',
+        min_value=0.1,  # Allow sub-GB values
+        widget=forms.NumberInput(attrs={'placeholder': 'Enter memory in GB'})
+    )
+    
+    disk = forms.FloatField(
+        required=False,
+        label='Disk (GB)',
+        min_value=0.1,  # Allow sub-GB values
+        widget=forms.NumberInput(attrs={'placeholder': 'Enter disk size in GB'})
+    )
+
+    def __init__(self, *args, **kwargs):
+        logger.debug("MemoryGBVirtualMachineForm initialization started")
+        super().__init__(*args, **kwargs)
+            
+        # Handle memory conversion. The value may come from a saved instance
+        # (edit) or from initial data supplied via the URL query string (clone),
+        # in which case self.instance is a new, unsaved object.
+        memory_mb = self._get_initial_mb('memory')
+        if memory_mb:
+            gb_value = round(memory_mb / 1000, 2)  # Round to 2 decimal places
+            logger.debug(f"Setting initial memory value: {memory_mb}MB -> {gb_value}GB")
+            self.initial['memory'] = gb_value
+
+        # Handle disk conversion
+        disk_mb = self._get_initial_mb('disk')
+        if disk_mb:
+            gb_value = round(disk_mb / 1000, 2)  # Round to 2 decimal places
+            logger.debug(f"Setting initial disk value: {disk_mb}MB -> {gb_value}GB")
+            self.initial['disk'] = gb_value
+
+    def _get_initial_mb(self, field):
+        """Return the source value in MB from the instance (edit) or the initial
+        clone data, or None if there is nothing to convert."""
+        instance_value = getattr(self.instance, field, None)
+        if instance_value:
+            return instance_value
+        # Clone: value arrives as a string in initial data from the query string.
+        initial_value = self.initial.get(field)
+        if initial_value in (None, ''):
+            return None
+        try:
+            return float(initial_value)
+        except (TypeError, ValueError):
+            logger.debug(f"Could not parse initial {field} value: {initial_value!r}")
+            return None
+
+    def clean_memory(self):
+        memory = self.cleaned_data.get('memory')
+        if memory is not None:
+            memory_mb = int(memory * 1000)
+            logger.debug(f"Converting memory {memory}GB to {memory_mb}MB")
+            return memory_mb
+        return None
+
+    def clean_disk(self):
+        disk = self.cleaned_data.get('disk')
+        if disk is not None:
+            disk_mb = int(disk * 1000)
+            logger.debug(f"Converting disk {disk}GB to {disk_mb}MB")
+            return disk_mb
+        return None

netbox_memory_input-0.3/netbox_memory_input.egg-info/PKG-INFO

@@ -0,0 +1,11 @@
+Metadata-Version: 2.4
+Name: netbox_memory_input
+Version: 0.3
+Summary: Input VM memory in GB instead of MB in NetBox.
+Home-page: https://eww.at
+Author: jannis
+License: AGPLv3
+Dynamic: author
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary

{netbox_memory_input-0.2 → netbox_memory_input-0.3}/setup.py

@@ -2,9 +2,9 @@ from setuptools import find_packages, setup
 
 setup(
     name='netbox_memory_input',
-    version='0.2',
+    version='0.3',
     description='Input VM memory in GB instead of MB in NetBox.',
-    url='https://itandtel.at',
+    url='https://eww.at',
     author='jannis',
     license='AGPLv3',
     install_requires=[],

netbox_memory_input-0.2/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: netbox_memory_input
-Version: 0.2
-Summary: Input VM memory in GB instead of MB in NetBox.
-Home-page: https://itandtel.at
-Author: jannis
-License: AGPLv3

netbox_memory_input-0.2/netbox_memory_input/forms.py

@@ -1,57 +0,0 @@
-from django import forms
-from virtualization.forms import VirtualMachineForm
-import logging
-
-logger = logging.getLogger('netbox.netbox_memory_input')
-logger.setLevel(logging.DEBUG)
-
-
-logger.debug("MemoryGBVirtualMachineForm module loaded")
-
-class MemoryGBVirtualMachineForm(VirtualMachineForm):
-    # Override both memory and disk fields
-    memory = forms.FloatField(
-        required=False,
-        label='Memory (GB)',
-        min_value=0.1,  # Allow sub-GB values
-        widget=forms.NumberInput(attrs={'placeholder': 'Enter memory in GB'})
-    )
-    
-    disk = forms.FloatField(
-        required=False,
-        label='Disk (GB)',
-        min_value=0.1,  # Allow sub-GB values
-        widget=forms.NumberInput(attrs={'placeholder': 'Enter disk size in GB'})
-    )
-
-    def __init__(self, *args, **kwargs):
-        logger.debug("MemoryGBVirtualMachineForm initialization started")
-        super().__init__(*args, **kwargs)
-            
-        # Handle memory conversion
-        if self.instance and self.instance.memory:
-            gb_value = round(self.instance.memory / 1000, 2)  # Round to 2 decimal places
-            logger.debug(f"Setting initial memory value: {self.instance.memory}MB -> {gb_value}GB")
-            self.initial['memory'] = gb_value
-            
-        # Handle disk conversion
-        if self.instance and self.instance.disk:
-            gb_value = round(self.instance.disk / 1000, 2)  # Round to 2 decimal places
-            logger.debug(f"Setting initial disk value: {self.instance.disk}MB -> {gb_value}GB")
-            self.initial['disk'] = gb_value
-
-    def clean_memory(self):
-        memory = self.cleaned_data.get('memory')
-        if memory is not None:
-            memory_mb = int(memory * 1000)
-            logger.debug(f"Converting memory {memory}GB to {memory_mb}MB")
-            return memory_mb
-        return None
-
-    def clean_disk(self):
-        disk = self.cleaned_data.get('disk')
-        if disk is not None:
-            disk_mb = int(disk * 1000)
-            logger.debug(f"Converting disk {disk}GB to {disk_mb}MB")
-            return disk_mb
-        return None

netbox_memory_input-0.2/netbox_memory_input.egg-info/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: netbox_memory_input
-Version: 0.2
-Summary: Input VM memory in GB instead of MB in NetBox.
-Home-page: https://itandtel.at
-Author: jannis
-License: AGPLv3