Merge pull request #121 from ArnesSI/nb36

netbox 3.6 compatibility

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        netbox-version: ["v3.5.8"]
+        netbox-version: ["v3.6.0"]
     services:
       redis:
         image: redis

README.md

@@ -64,6 +64,7 @@ support older netbox version as per table below:
 |       3.3      |      1.1.x     |
 |       3.4      |      1.2.x     |
 |       3.5      | 1.3.x & 1.4.x  |
+|       3.6      |      1.5.x     |
 
 ## Installing
 

netbox_inventory/__init__.py

@@ -10,7 +10,7 @@ class NetBoxInventoryConfig(PluginConfig):
     author = 'Matej Vadnjal'
     author_email = 'matej.vadnjal@arnes.si'
     base_url = 'inventory'
-    min_version = '3.5.2'
+    min_version = '3.6.0'
     default_settings = {
         'top_level_menu': True,
         'used_status_name': 'used',

netbox_inventory/forms/assign.py

@@ -32,7 +32,6 @@ class AssetAssignMixin(forms.Form):
         required=False,
         help_text=Asset._meta.get_field('contact').help_text,
     )
-    tags = None
 
     def _clean_hardware_type(self, kind):
         hardware_type = self.cleaned_data[f'{kind}_type']
@@ -61,6 +60,12 @@ def _clean_hardware(self, kind):
         setattr(self.instance, kind, hardware)
         return hardware
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # remove tags field from form
+        self.fields.pop('tags')
+
 
 class AssetDeviceAssignForm(AssetAssignMixin, NetBoxModelForm):
     site = DynamicModelChoiceField(

netbox_inventory/forms/bulk.py

@@ -6,7 +6,7 @@
 from netbox.forms import NetBoxModelBulkEditForm, NetBoxModelImportForm
 from utilities.forms import add_blank_choice
 from utilities.forms.fields import (
-    ChoiceField, CommentField, CSVChoiceField, CSVModelChoiceField,
+    CommentField, CSVChoiceField, CSVModelChoiceField,
     DynamicModelChoiceField
 )
 from tenancy.models import Contact, Tenant
@@ -34,7 +34,7 @@ class AssetBulkEditForm(NetBoxModelBulkEditForm):
     name = forms.CharField(
         required=False,
     )
-    status = ChoiceField(
+    status = forms.ChoiceField(
         choices=add_blank_choice(AssetStatusChoices),
         required=False,
         initial='',

netbox_inventory/forms/filters.py

@@ -3,7 +3,7 @@
 from dcim.models import Device, DeviceType, Manufacturer, ModuleType, Site, Location, Rack
 from netbox.forms import NetBoxModelFilterSetForm
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
-from utilities.forms.fields import DynamicModelMultipleChoiceField, MultipleChoiceField, TagFilterField
+from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.widgets import DatePicker
 from tenancy.forms import ContactModelFilterForm
 from tenancy.models import Contact, Tenant
@@ -43,11 +43,11 @@ class AssetFilterForm(NetBoxModelFilterSetForm):
         )),
     )
 
-    status = MultipleChoiceField(
+    status = forms.MultipleChoiceField(
         choices=AssetStatusChoices,
         required=False,
     )
-    kind = MultipleChoiceField(
+    kind = forms.MultipleChoiceField(
         choices=HardwareKindChoices,
         required=False,
         help_text='Type of hardware',

netbox_inventory/forms/reassign.py

@@ -3,7 +3,7 @@
 
 from dcim.models import Device, InventoryItem, Module, Site, Location, Manufacturer
 from netbox.forms import NetBoxModelForm
-from utilities.forms.fields import DynamicModelChoiceField, ChoiceField
+from utilities.forms.fields import DynamicModelChoiceField
 from ..choices import AssetStatusChoices
 from ..models import Asset, InventoryItemType, InventoryItemGroup
 from ..utils import get_status_for
@@ -28,13 +28,12 @@ class AssetReassignMixin(forms.Form):
         query_params={'site_id': '$storage_site',},
         help_text='Limit New Asset choices only to assets stored at this location',
     )
-    asset_status = ChoiceField(
+    asset_status = forms.ChoiceField(
         choices=AssetStatusChoices,
         initial=get_status_for('stored'),
         label='Old Asset Status',
         help_text='Status to set to existing asset that is being unassigned',
     )
-    tags = None
 
     class Meta:
         fields = ('storage_site', 'storage_location', 'assigned_asset', 'asset_status')
@@ -100,6 +99,10 @@ def _clean_asset(self, asset, instance):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+
+        # remove tags field from form
+        self.fields.pop('tags')
+
         try:
             self.instance.assigned_asset
         except Asset.DoesNotExist:

netbox_inventory/tests/asset/test_api.py

@@ -142,9 +142,9 @@ def setUpTestData(cls):
         module_type1 = ModuleType.objects.create(model='Module Type 1', manufacturer=manufacturer)
         inventoryitem_type1 = InventoryItemType.objects.create(model='II Type 1', manufacturer=manufacturer)
         site1 = Site.objects.create(name='Site 1', slug='site1')
-        device_role1 = DeviceRole.objects.create(name='Device Role 1', slug='devicerole1')
-        cls.device1 = Device.objects.create(name='Device 1', device_role=device_role1, device_type=device_type1, site=site1, status='active')
-        cls.device2 = Device.objects.create(name='Device 2', device_role=device_role1, device_type=device_type2, site=site1, status='active')
+        role1 = DeviceRole.objects.create(name='Device Role 1', slug='devicerole1')
+        cls.device1 = Device.objects.create(name='Device 1', role=role1, device_type=device_type1, site=site1, status='active')
+        cls.device2 = Device.objects.create(name='Device 2', role=role1, device_type=device_type2, site=site1, status='active')
         cls.inventoryitem1 = InventoryItem.objects.create(device=cls.device1, name='II 1')
         supplier1 = Supplier.objects.create(name='Supplier1', slug='supplier1')
         cls.purchase1 = Purchase.objects.create(name='Purchase1', supplier=supplier1)

netbox_inventory/tests/asset/test_models.py

@@ -39,9 +39,9 @@ def setUp(self):
             model='device_type1',
             slug='device_type1'
         )
-        self.device_role1 = DeviceRole.objects.create(
-            name='device_role1',
-            slug='device_role1'
+        self.role1 = DeviceRole.objects.create(
+            name='role1',
+            slug='role1'
         )
         self.asset1 = Asset.objects.create(
             asset_tag='asset1',
@@ -53,14 +53,14 @@ def setUp(self):
             site=self.site1,
             status='active',
             device_type=self.device_type1,
-            device_role=self.device_role1,
+            role=self.role1,
             name='device1',
         )
         self.device2 = Device.objects.create(
             site=self.site1,
             status='active',
             device_type=self.device_type1,
-            device_role=self.device_role1,
+            role=self.role1,
             name='device2',
         )
 

netbox_inventory/tests/asset/test_views.py

@@ -54,9 +54,9 @@ def setUpTestData(cls):
             manufacturer=manufacturer1,
             u_height=1,
         )
-        device_role1 = DeviceRole.objects.create(
-            name='device_role1',
-            slug='device_role1',
+        role1 = DeviceRole.objects.create(
+            name='role1',
+            slug='role1',
             color='9e9e9e',
         )
         asset1 = Asset.objects.create(
@@ -116,7 +116,7 @@ def test_assign_device_from_asset(self):
         )
         device = Device.objects.create(
             name='test-device-assign',
-            device_role = DeviceRole.objects.first(),
+            role = DeviceRole.objects.first(),
             device_type=asset.device_type,
             site = Site.objects.first(),
             status = 'active',

netbox_inventory/tests/asset/test_views_create.py

@@ -34,9 +34,9 @@ def setUp(self):
             manufacturer=self.manufacturer1,
             model='module_type1',
         )
-        self.device_role1 = DeviceRole.objects.create(
-            name='device_role1',
-            slug='device_role1'
+        self.role1 = DeviceRole.objects.create(
+            name='role1',
+            slug='role1'
         )
         self.inventoryitem_type1 = InventoryItemType.objects.create(
             manufacturer=self.manufacturer1,
@@ -47,7 +47,7 @@ def setUp(self):
             site=self.site1,
             status='active',
             device_type=self.device_type1,
-            device_role=self.device_role1,
+            role=self.role1,
             name='device1',
         )
         self.module_bay1 = ModuleBay.objects.create(
@@ -131,7 +131,7 @@ def setUp(self):
         self.form_data = {
             'site': self.site1.pk,
             'device_type': self.device_type1.pk,
-            'device_role': self.device_role1.pk,
+            'role': self.role1.pk,
             'status': 'active',
             'name': 'tested_device',
         }
@@ -181,7 +181,7 @@ def setUp(self):
         self.form_data = {
             'site': self.site1.pk,
             'device_type': self.device_type1.pk,
-            'device_role': self.device_role1.pk,
+            'role': self.role1.pk,
             'status': 'active',
             'name': 'tested_device',
         }

netbox_inventory/tests/asset/test_views_reassign.py

@@ -44,9 +44,9 @@ def setUp(self):
             manufacturer=self.manufacturer1,
             model='module_type1',
         )
-        self.device_role1 = DeviceRole.objects.create(
-            name='device_role1',
-            slug='device_role1'
+        self.role1 = DeviceRole.objects.create(
+            name='role1',
+            slug='role1'
         )
         self.inventoryitem_type1 = InventoryItemType.objects.create(
             manufacturer=self.manufacturer1,
@@ -62,7 +62,7 @@ def setUp(self):
             site=self.site1,
             status='active',
             device_type=self.device_type1,
-            device_role=self.device_role1,
+            role=self.role1,
             name='device1',
         )
         self.module_bay1 = ModuleBay.objects.create(

netbox_inventory/tests/test_load.py

@@ -11,7 +11,7 @@ class NetboxDnsVersionTestCase(SimpleTestCase):
     """
 
     def test_version(self):
-        assert __version__ == "1.4.3"
+        assert __version__ == "1.5.0"
 
 
 class AppTest(APITestCase):

netbox_inventory/version.py

@@ -1 +1 @@
-__version__ = '1.4.3'
+__version__ = '1.5.0'

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-inventory"
-version = "1.4.3"
+version = "1.5.0"
 authors = [
   { name="Matej Vadnjal", email="matej.vadnjal@arnes.si" },
 ]