netbox-contract 2.4.2__tar.gz → 2.4.3__tar.gz

{netbox_contract-2.4.2/netbox_contract.egg-info → netbox_contract-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-contract
-Version: 2.4.2
+Version: 2.4.3
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -48,6 +48,7 @@ Accounting dimensions can be linked with invoice lines.
 |     4.1        |      2.2       |
 |     4.2        |      2.3       |
 |     4.3        |      2.4       |
+|     4.4        |      2.4       |
 
 ## Installing
 

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/README.md

@@ -21,6 +21,7 @@ Accounting dimensions can be linked with invoice lines.
 |     4.1        |      2.2       |
 |     4.2        |      2.3       |
 |     4.3        |      2.4       |
+|     4.4        |      2.4       |
 
 ## Installing
 

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/__init__.py

@@ -5,7 +5,7 @@ class ContractsConfig(PluginConfig):
     name = 'netbox_contract'
     verbose_name = 'Netbox contract'
     description = 'Contract management plugin for Netbox'
-    version = '2.4.2'
+    version = '2.4.3'
     author = 'Marc Lebreuil'
     author_email = 'marc@famillelebreuil.net'
     base_url = 'contracts'

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/constants.py

@@ -5,10 +5,17 @@ SERVICE_PROVIDER_MODELS = Q(
     | Q(app_label='netbox_contract', model__in=('serviceprovider',))
 )
 
+SERVICE_PROVIDER_TYPES = (
+    'provider',
+    'serviceprovider',
+)
+
 ASSIGNEMENT_MODELS = Q(
     Q(app_label='circuits', model__in=('circuit',))
     | Q(app_label='circuits', model__in=('virtualcircuit',))
     | Q(app_label='dcim', model__in=('site',))
     | Q(app_label='dcim', model__in=('device',))
+    | Q(app_label='dcim', model__in=('rack',))
     | Q(app_label='virtualization', model__in=('virtualmachine',))
+    | Q(app_label='virtualization', model__in=('cluster',))
 )

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/filtersets.py

@@ -1,7 +1,9 @@
 import django_filters
 from django.db.models import Q
+from django.contrib.contenttypes.models import ContentType
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet
+from circuits.models import Provider
 
 from .models import (
     AccountingDimension,
@@ -31,16 +33,29 @@ class ContractFilterSet(ContactModelFilterSet, NetBoxModelFilterSet, TenancyFilt
         field_name='contract_type__name', to_field_name='name', queryset=ContractType.objects.all()
     )
 
+    service_provider_id = django_filters.NumberFilter(
+        field_name='external_party_object_id',
+        method='filter_by_service_provider',
+        label='Service provider'
+    )
+
+    provider_id = django_filters.NumberFilter(
+        field_name='external_party_object_id',
+        method='filter_by_circuit_provider',
+        label='Circuit provider'
+    )
+
     class Meta:
         model = Contract
         fields = (
             'id',
             'name',
+            'status',
+            'internal_party',
+            'currency',
             'contract_type',
+            'external_party_object_id',
             'external_reference',
-            'start_date',
-            'end_date',
-            'initial_term',
             'parent',
         )
 
@@ -52,6 +67,22 @@ class ContractFilterSet(ContactModelFilterSet, NetBoxModelFilterSet, TenancyFilt
             Q(status__iexact='Active'),
         )
 
+    def filter_by_service_provider(self, queryset, name, value):
+        if not value:
+            return queryset
+        return queryset.filter(
+            external_party_object_id=value,
+            external_party_object_type=ContentType.objects.get_for_model(ServiceProvider)
+        )
+
+    def filter_by_circuit_provider(self, queryset, name, value):
+        if not value:
+            return queryset
+        return queryset.filter(
+            external_party_object_id=value,
+            external_party_object_type=ContentType.objects.get_for_model(Provider)
+        )
+
 
 class InvoiceFilterSet(NetBoxModelFilterSet):
     status = django_filters.MultipleChoiceFilter(choices=InvoiceStatusChoices, null_value=None)

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/forms.py

@@ -11,7 +11,8 @@ from netbox.forms import (
 )
 from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
 from tenancy.models import Tenant
-from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
+from circuits.models import Provider
+from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, get_field_value
 from utilities.forms.fields import (
     ColorField,
     CommentField,
@@ -26,8 +27,9 @@ from utilities.forms.fields import (
     TagFilterField,
 )
 from utilities.forms.widgets import DatePicker, HTMXSelect
+from utilities.templatetags.builtins.filters import bettertitle
 
-from .constants import ASSIGNEMENT_MODELS, SERVICE_PROVIDER_MODELS
+from .constants import ASSIGNEMENT_MODELS, SERVICE_PROVIDER_MODELS, SERVICE_PROVIDER_TYPES
 from .models import (
     AccountingDimension,
     AccountingDimensionStatusChoices,
@@ -151,16 +153,46 @@ class ContractFilterForm(ContactModelFilterForm, TenancyFilterForm, NetBoxModelF
         selector=True,
         label=_('Contract type'),
     )
+
+    service_provider_id = DynamicModelChoiceField(
+        queryset=ServiceProvider.objects.all(),
+        required=False,
+        selector=True,
+        label=_('Service provider'),
+        help_text=_('Filter by Service Provider'),
+    )
+
+    provider_id = DynamicModelChoiceField(
+        queryset=Provider.objects.all(),
+        required=False,
+        selector=True,
+        label=_('Circuit Provider'),
+        help_text=_('Filter by Circuit Provider'),
+    )
+
     external_reference = forms.CharField(required=False, label=_('External reference'))
-    internal_party = forms.ChoiceField(choices=InternalEntityChoices, required=False, label=_('Internal party'))
+
+    internal_party = forms.ChoiceField(
+        choices=[('', '-----')] + list(InternalEntityChoices),
+        required=False,
+        label=_('Internal party')
+    )
+
     status = forms.ChoiceField(choices=StatusChoices, required=False, label=_('Status'))
-    currency = forms.ChoiceField(choices=CurrencyChoices, required=False, label=_('Currency'))
+
+    currency = forms.ChoiceField(
+        choices=[('', '-----')] + list(CurrencyChoices),
+        required=False,
+        label=_('Currency')
+    )
+
     parent = DynamicModelChoiceField(
         queryset=Contract.objects.all(),
         required=False,
         selector=True,
         label=_('Parent'),
     )
+
     tag = TagFilterField(model)
 
 
@@ -237,6 +269,21 @@ class ContractBulkEditForm(NetBoxModelBulkEditForm):
         selector=True,
         label=_('Contract Type')
     )
+
+    external_party_object_type = ContentTypeChoiceField(
+        queryset=ContentType.objects.filter(model__in=SERVICE_PROVIDER_TYPES),
+        widget=HTMXSelect(method='post', attrs={'hx-select': '#form_fields'}),
+        required=False,
+        label=_('External party type')
+    )
+    external_party_object = DynamicModelChoiceField(
+        label=_('External party'),
+        queryset=ServiceProvider.objects.none(),  # Initial queryset
+        required=False,
+        disabled=True,
+        selector=True
+    )
+
     external_reference = forms.CharField(max_length=100, required=False, label=_('External reference'))
     internal_party = forms.ChoiceField(choices=InternalEntityChoices, required=False, label=_('Internal party'))
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False, selector=True, label=_('Tenant'))
@@ -251,6 +298,19 @@ class ContractBulkEditForm(NetBoxModelBulkEditForm):
     nullable_fields = ('comments',)
     model = Contract
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if external_party_object_type_id := get_field_value(self, 'external_party_object_type'):
+            try:
+                external_party_object_type = ContentType.objects.get(pk=external_party_object_type_id)
+                model = external_party_object_type.model_class()
+                self.fields['external_party_object'].queryset = model.objects.all()
+                self.fields['external_party_object'].widget.attrs['selector'] = model._meta.label_lower
+                self.fields['external_party_object'].disabled = False
+                self.fields['external_party_object'].label = _(bettertitle(model._meta.verbose_name))
+            except ObjectDoesNotExist:
+                pass
 
 # ContractType
 

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/tables.py

@@ -193,6 +193,36 @@ class ContractListBottomTable(NetBoxTable):
         )
 
 
+class ContractProviderBottomTable(NetBoxTable):
+    name = tables.Column(linkify=True)
+    external_party_object = tables.Column(linkify=True)
+    status = columns.ChoiceFieldColumn(
+        verbose_name=('Status'),
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = Contract
+        fields = (
+            'pk',
+            'id',
+            'name',
+            'start_date',
+            'end_date',
+            'external_reference',
+            'status',
+            'mrc',
+            'comments',
+            'actions',
+        )
+        default_columns = (
+            'name',
+            'status',
+            'external_reference',
+            'start_date',
+            'end_date',
+        )
+
+
 class InvoiceListTable(NetBoxTable):
     contracts = tables.ManyToManyColumn(linkify=True)
     number = tables.Column(linkify=True)

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/template_content.py

@@ -1,11 +1,11 @@
-from circuits.models import Circuit, VirtualCircuit
-from dcim.models import Device, Site
+from circuits.models import Circuit, VirtualCircuit, Provider
+from dcim.models import Device, Site, Rack
 from django.contrib.contenttypes.models import ContentType
 from netbox.plugins import PluginTemplateExtension
-from virtualization.models import VirtualMachine
+from virtualization.models import VirtualMachine, Cluster
 
 from . import tables
-from .models import ContractAssignment
+from .models import ContractAssignment, Contract
 
 
 class CircuitContractAssignments(PluginTemplateExtension):
@@ -28,15 +28,16 @@ class CircuitContractAssignments(PluginTemplateExtension):
         )
 
 
-class DeviceContractAssignments(PluginTemplateExtension):
-    models = ['dcim.device']
+class VirtualCircuitContractAssignments(PluginTemplateExtension):
+    models = ['circuits.virtualcircuit']
 
     def full_width_page(self):
-        device = self.context['object']
-        device_type = ContentType.objects.get_for_model(Device)
+        virtualcircuit = self.context['object']
+        virtualcircuit_type = ContentType.objects.get_for_model(VirtualCircuit)
         contract_assignments = ContractAssignment.objects.filter(
-            content_type__pk=device_type.id, object_id=device.id
+            content_type__pk=virtualcircuit_type.id, object_id=virtualcircuit.id
         )
+
         assignments_table = tables.ContractAssignmentObjectTable(contract_assignments)
         assignments_table.configure(self.context['request'])
 
@@ -48,14 +49,36 @@ class DeviceContractAssignments(PluginTemplateExtension):
         )
 
 
-class VMContractAssignments(PluginTemplateExtension):
-    models = ['virtualization.virtualmachine']
+class ProviderContracts(PluginTemplateExtension):
+    models = ['circuits.provider']
 
     def full_width_page(self):
-        vm = self.context['object']
-        vm_type = ContentType.objects.get_for_model(VirtualMachine)
+        provider = self.context['object']
+        provider_type = ContentType.objects.get_for_model(Provider)
+        contracts = Contract.objects.filter(
+            external_party_object_type__pk=provider_type.id,
+            external_party_object_id=provider.id
+        )
+
+        contracts_table = tables.ContractProviderBottomTable(contracts)
+        contracts_table.configure(self.context['request'])
+
+        return self.render(
+            'contract_list_bottom.html',
+            extra_context={
+                'contracts_table': contracts_table,
+            },
+        )
+
+
+class DeviceContractAssignments(PluginTemplateExtension):
+    models = ['dcim.device']
+
+    def full_width_page(self):
+        device = self.context['object']
+        device_type = ContentType.objects.get_for_model(Device)
         contract_assignments = ContractAssignment.objects.filter(
-            content_type__pk=vm_type.id, object_id=vm.id
+            content_type__pk=device_type.id, object_id=device.id
         )
         assignments_table = tables.ContractAssignmentObjectTable(contract_assignments)
         assignments_table.configure(self.context['request'])
@@ -88,14 +111,55 @@ class SiteContractAssignments(PluginTemplateExtension):
         )
 
 
-class VirtualCircuitContractAssignments(PluginTemplateExtension):
-    models = ['circuits.virtualcircuit']
+class RackContractAssignments(PluginTemplateExtension):
+    models = ['dcim.rack']
 
     def full_width_page(self):
-        virtualcircuit = self.context['object']
-        virtualcircuit_type = ContentType.objects.get_for_model(VirtualCircuit)
+        rack = self.context['object']
+        rack_type = ContentType.objects.get_for_model(Rack)
         contract_assignments = ContractAssignment.objects.filter(
-            content_type__pk=virtualcircuit_type.id, object_id=virtualcircuit.id
+            content_type__pk=rack_type.id, object_id=rack.id
+        )
+
+        assignments_table = tables.ContractAssignmentObjectTable(contract_assignments)
+        assignments_table.configure(self.context['request'])
+
+        return self.render(
+            'contract_assignments_bottom.html',
+            extra_context={
+                'assignments_table': assignments_table,
+            },
+        )
+
+
+class VMContractAssignments(PluginTemplateExtension):
+    models = ['virtualization.virtualmachine']
+
+    def full_width_page(self):
+        vm = self.context['object']
+        vm_type = ContentType.objects.get_for_model(VirtualMachine)
+        contract_assignments = ContractAssignment.objects.filter(
+            content_type__pk=vm_type.id, object_id=vm.id
+        )
+        assignments_table = tables.ContractAssignmentObjectTable(contract_assignments)
+        assignments_table.configure(self.context['request'])
+
+        return self.render(
+            'contract_assignments_bottom.html',
+            extra_context={
+                'assignments_table': assignments_table,
+            },
+        )
+
+
+class ClusterContractAssignments(PluginTemplateExtension):
+    models = ['virtualization.cluster']
+
+    def full_width_page(self):
+        cluster = self.context['object']
+        cluster_type = ContentType.objects.get_for_model(Cluster)
+        contract_assignments = ContractAssignment.objects.filter(
+            content_type__pk=cluster_type.id, object_id=cluster.id
         )
 
         assignments_table = tables.ContractAssignmentObjectTable(contract_assignments)
@@ -111,8 +175,11 @@ class VirtualCircuitContractAssignments(PluginTemplateExtension):
 
 template_extensions = [
     CircuitContractAssignments,
+    VirtualCircuitContractAssignments,
+    ProviderContracts,
     DeviceContractAssignments,
-    VMContractAssignments,
     SiteContractAssignments,
-    VirtualCircuitContractAssignments,
+    RackContractAssignments,
+    VMContractAssignments,
+    ClusterContractAssignments,
 ]

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/templates/netbox_contract/serviceprovider.html

@@ -1,4 +1,6 @@
 {% extends 'generic/object.html' %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
 {% load static %}
 {% load helpers %}
 {% load i18n %}
@@ -31,6 +33,14 @@
       {% include 'inc/panels/custom_fields.html' %}
       {% include 'inc/panels/comments.html' %}
       {% include 'inc/panels/tags.html' %}
+      <div class="row">
+        <div class="col col-md-12">
+          <div class="card">
+            <h5 class="card-header">{% trans "Contracts" %}</h5>
+              {% render_table contracts_table %}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 {% endblock content %}

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/netbox_contract/views.py

@@ -75,6 +75,19 @@ class ContractTypeBulkDeleteView(generic.BulkDeleteView):
 class ServiceProviderView(generic.ObjectView):
     queryset = ServiceProvider.objects.all()
 
+    def get_extra_context(self, request, instance):
+        provider_type = ContentType.objects.get_for_model(ServiceProvider)
+        contracts = Contract.objects.filter(
+            external_party_object_type__pk=provider_type.id,
+            external_party_object_id=instance.id
+        )
+
+        contracts_table = tables.ContractProviderBottomTable(contracts)
+        contracts_table.configure(request)
+        return {
+            'contracts_table': contracts_table,
+        }
+
 
 class ServiceProviderListView(generic.ObjectListView):
     queryset = ServiceProvider.objects.all()

{netbox_contract-2.4.2 → netbox_contract-2.4.3/netbox_contract.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-contract
-Version: 2.4.2
+Version: 2.4.3
 Summary: Contract management plugin for Netbox
 Author-email: Marc Lebreuil <marc@famillelebreuil.net>
 Project-URL: Homepage, https://github.com/mlebreuil/netbox-contract
@@ -48,6 +48,7 @@ Accounting dimensions can be linked with invoice lines.
 |     4.1        |      2.2       |
 |     4.2        |      2.3       |
 |     4.3        |      2.4       |
+|     4.4        |      2.4       |
 
 ## Installing
 

{netbox_contract-2.4.2 → netbox_contract-2.4.3}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-contract"
-version = "2.4.2"
+version = "2.4.3"
 authors = [
   { name="Marc Lebreuil", email="marc@famillelebreuil.net" },
 ]