Преглед на файлове

Merge pull request #2115 from DanSheps/develop

Added VirtualChassis Searching
Jeremy Stretch преди 7 години
родител
ревизия
ed84c4b210
променени са 2 файла, в които са добавени 10 реда и са изтрити 3 реда
  1. 1 0
      netbox/netbox/forms.py
  2. 9 3
      netbox/netbox/views.py

+ 1 - 0
netbox/netbox/forms.py

@@ -15,6 +15,7 @@ OBJ_TYPE_CHOICES = (
         ('rack', 'Racks'),
         ('rack', 'Racks'),
         ('devicetype', 'Device types'),
         ('devicetype', 'Device types'),
         ('device', 'Devices'),
         ('device', 'Devices'),
+        ('virtualchassis', 'Virtual Chassis'),
     )),
     )),
     ('IPAM', (
     ('IPAM', (
         ('vrf', 'VRFs'),
         ('vrf', 'VRFs'),

+ 9 - 3
netbox/netbox/views.py

@@ -12,9 +12,9 @@ from rest_framework.views import APIView
 from circuits.filters import CircuitFilter, ProviderFilter
 from circuits.filters import CircuitFilter, ProviderFilter
 from circuits.models import Circuit, Provider
 from circuits.models import Circuit, Provider
 from circuits.tables import CircuitTable, ProviderTable
 from circuits.tables import CircuitTable, ProviderTable
-from dcim.filters import DeviceFilter, DeviceTypeFilter, RackFilter, SiteFilter
-from dcim.models import ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, Site
-from dcim.tables import DeviceDetailTable, DeviceTypeTable, RackTable, SiteTable
+from dcim.filters import DeviceFilter, DeviceTypeFilter, RackFilter, SiteFilter, VirtualChassisFilter
+from dcim.models import ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, Site, VirtualChassis
+from dcim.tables import DeviceDetailTable, DeviceTypeTable, RackTable, SiteTable, VirtualChassisTable
 from extras.models import ReportResult, TopologyMap, UserAction
 from extras.models import ReportResult, TopologyMap, UserAction
 from ipam.filters import AggregateFilter, IPAddressFilter, PrefixFilter, VLANFilter, VRFFilter
 from ipam.filters import AggregateFilter, IPAddressFilter, PrefixFilter, VLANFilter, VRFFilter
 from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF
 from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF
@@ -72,6 +72,12 @@ SEARCH_TYPES = OrderedDict((
         'table': DeviceDetailTable,
         'table': DeviceDetailTable,
         'url': 'dcim:device_list',
         'url': 'dcim:device_list',
     }),
     }),
+    ('virtualchassis', {
+        'queryset': VirtualChassis.objects.select_related('master'),
+        'filter': VirtualChassisFilter,
+        'table': VirtualChassisTable,
+        'url': 'dcim:virtualchassis_list',
+    }),
     # IPAM
     # IPAM
     ('vrf', {
     ('vrf', {
         'queryset': VRF.objects.select_related('tenant'),
         'queryset': VRF.objects.select_related('tenant'),