From d6cd3428f688836acd6cec62b4f9928007649db5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 19 May 2016 11:34:38 -0400 Subject: [PATCH] Removed Device.ro_snmp --- docs/schema.sql | 1 - netbox/dcim/api/serializers.py | 2 +- netbox/dcim/fixtures/dcim.yaml | 22 +++++++++---------- netbox/dcim/forms.py | 4 +--- .../migrations/0006_remove_device_ro_snmp.py | 19 ++++++++++++++++ netbox/dcim/models.py | 1 - netbox/dcim/tests/test_apis.py | 2 -- netbox/dcim/views.py | 2 +- netbox/templates/dcim/device.html | 10 --------- netbox/templates/dcim/device_bulk_edit.html | 1 - netbox/templates/dcim/device_edit.html | 1 - 11 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 netbox/dcim/migrations/0006_remove_device_ro_snmp.py diff --git a/docs/schema.sql b/docs/schema.sql index e2593ffd4..27351870d 100644 --- a/docs/schema.sql +++ b/docs/schema.sql @@ -544,7 +544,6 @@ CREATE TABLE dcim_device ( face smallint, device_type_id integer NOT NULL, rack_id integer NOT NULL, - ro_snmp character varying(50) NOT NULL, device_role_id integer NOT NULL, primary_ip_id integer, status boolean NOT NULL, diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 0a7470e71..5a7835c1e 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -222,7 +222,7 @@ class DeviceSerializer(serializers.ModelSerializer): class Meta: model = Device fields = ['id', 'name', 'display_name', 'device_type', 'device_role', 'platform', 'serial', 'rack', 'position', - 'face', 'status', 'primary_ip', 'ro_snmp', 'comments'] + 'face', 'status', 'primary_ip', 'comments'] class DeviceNestedSerializer(DeviceSerializer): diff --git a/netbox/dcim/fixtures/dcim.yaml b/netbox/dcim/fixtures/dcim.yaml index 76c2f90ec..275f70895 100644 --- a/netbox/dcim/fixtures/dcim.yaml +++ b/netbox/dcim/fixtures/dcim.yaml @@ -629,47 +629,47 @@ - model: dcim.device pk: 1 fields: {device_type: 1, device_role: 1, platform: 1, name: test1-edge1, serial: '5555555555', - rack: 1, position: 1, face: 0, status: true, primary_ip: 1, ro_snmp: TEST} + rack: 1, position: 1, face: 0, status: true, primary_ip: 1} - model: dcim.device pk: 2 fields: {device_type: 2, device_role: 3, platform: 1, name: test1-core1, serial: '', - rack: 1, position: 17, face: 0, status: true, primary_ip: 5, ro_snmp: ''} + rack: 1, position: 17, face: 0, status: true, primary_ip: 5} - model: dcim.device pk: 3 fields: {device_type: 3, device_role: 2, platform: 1, name: test1-spine1, serial: '', - rack: 1, position: 33, face: 0, status: true, primary_ip: null, ro_snmp: ''} + rack: 1, position: 33, face: 0, status: true, primary_ip: null} - model: dcim.device pk: 4 fields: {device_type: 4, device_role: 4, platform: 1, name: test1-leaf1, serial: '', - rack: 1, position: 34, face: 0, status: true, primary_ip: null, ro_snmp: ''} + rack: 1, position: 34, face: 0, status: true, primary_ip: null} - model: dcim.device pk: 5 fields: {device_type: 4, device_role: 4, platform: 1, name: test1-leaf2, serial: '9823478293748', - rack: 2, position: 34, face: 0, status: true, primary_ip: null, ro_snmp: ''} + rack: 2, position: 34, face: 0, status: true, primary_ip: null} - model: dcim.device pk: 6 fields: {device_type: 3, device_role: 2, platform: 1, name: test1-spine2, serial: '45649818158', - rack: 2, position: 33, face: 0, status: true, primary_ip: null, ro_snmp: ''} + rack: 2, position: 33, face: 0, status: true, primary_ip: null} - model: dcim.device pk: 7 fields: {device_type: 1, device_role: 1, platform: 1, name: test1-edge2, serial: '7567356345', - rack: 2, position: 1, face: 0, status: true, primary_ip: 3, ro_snmp: ''} + rack: 2, position: 1, face: 0, status: true, primary_ip: 3} - model: dcim.device pk: 8 fields: {device_type: 2, device_role: 3, platform: 1, name: test1-core2, serial: '67856734534', - rack: 2, position: 17, face: 0, status: true, primary_ip: 19, ro_snmp: ''} + rack: 2, position: 17, face: 0, status: true, primary_ip: 19} - model: dcim.device pk: 9 fields: {device_type: 5, device_role: 5, platform: 2, name: test1-oob1, serial: '98273942938', - rack: 1, position: 42, face: 0, status: true, primary_ip: null, ro_snmp: ''} + rack: 1, position: 42, face: 0, status: true, primary_ip: null} - model: dcim.device pk: 11 fields: {device_type: 6, device_role: 6, platform: null, name: test1-pdu1, serial: '', - rack: 1, position: null, face: null, status: true, primary_ip: null, ro_snmp: ''} + rack: 1, position: null, face: null, status: true, primary_ip: null} - model: dcim.device pk: 12 fields: {device_type: 6, device_role: 6, platform: null, name: test1-pdu2, serial: '', - rack: 2, position: null, face: null, status: true, primary_ip: null, ro_snmp: ''} + rack: 2, position: null, face: null, status: true, primary_ip: null} - model: dcim.consoleport pk: 1 fields: {device: 1, name: Console (RE0), cs_port: 27, connection_status: true} diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index e35048305..231e3c012 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -337,11 +337,10 @@ class DeviceForm(forms.ModelForm, BootstrapMixin): class Meta: model = Device fields = ['name', 'device_role', 'device_type', 'serial', 'site', 'rack', 'position', 'face', 'status', - 'platform', 'primary_ip', 'ro_snmp', 'comments'] + 'platform', 'primary_ip', 'comments'] help_texts = { 'device_role': "The function this device serves", 'serial': "Chassis serial number", - 'ro_snmp': "Read-only SNMP string", } widgets = { 'face': forms.Select(attrs={'filter-for': 'position'}), @@ -470,7 +469,6 @@ class DeviceBulkEditForm(forms.Form, BootstrapMixin): platform_delete = forms.BooleanField(required=False, label='Set platform to "none"') status = forms.ChoiceField(choices=FORM_STATUS_CHOICES, required=False, initial='', label='Status') serial = forms.CharField(max_length=50, required=False, label='Serial Number') - ro_snmp = forms.CharField(max_length=50, required=False, label='SNMP (RO)') class DeviceBulkDeleteForm(ConfirmationForm): diff --git a/netbox/dcim/migrations/0006_remove_device_ro_snmp.py b/netbox/dcim/migrations/0006_remove_device_ro_snmp.py new file mode 100644 index 000000000..519bc4e49 --- /dev/null +++ b/netbox/dcim/migrations/0006_remove_device_ro_snmp.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-19 15:19 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0005_auto_20160328_2135'), + ] + + operations = [ + migrations.RemoveField( + model_name='device', + name='ro_snmp', + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 297041b33..fc8a1014b 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -434,7 +434,6 @@ class Device(models.Model): status = models.BooleanField(choices=STATUS_CHOICES, default=STATUS_ACTIVE, verbose_name='Status') primary_ip = models.OneToOneField('ipam.IPAddress', related_name='primary_for', on_delete=models.SET_NULL, blank=True, null=True, verbose_name='Primary IP') - ro_snmp = models.CharField(max_length=50, blank=True, verbose_name='SNMP (RO)') comments = models.TextField(blank=True) class Meta: diff --git a/netbox/dcim/tests/test_apis.py b/netbox/dcim/tests/test_apis.py index 81165225a..08ab5521a 100644 --- a/netbox/dcim/tests/test_apis.py +++ b/netbox/dcim/tests/test_apis.py @@ -321,7 +321,6 @@ class DeviceTest(APITestCase): 'face', 'status', 'primary_ip', - 'ro_snmp', 'comments', ] @@ -382,7 +381,6 @@ class DeviceTest(APITestCase): 'rack_facility_id', 'rack_id', 'rack_name', - 'ro_snmp', 'serial', 'status', ] diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 20e84ab3d..2e5cbc6ec 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -586,7 +586,7 @@ class DeviceBulkEditView(PermissionRequiredMixin, BulkEditView): if form.cleaned_data['status']: status = form.cleaned_data['status'] fields_to_update['status'] = True if status == 'True' else False - for field in ['device_type', 'device_role', 'serial', 'ro_snmp']: + for field in ['device_type', 'device_role', 'serial']: if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index ecf9a0b56..a05deb6d9 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -101,16 +101,6 @@ {% endif %} - - SNMP String (RO) - - {% if device.ro_snmp %} - {{ device.ro_snmp }} - {% else %} - Not defined - {% endif %} - - {% if request.user.is_authenticated %} diff --git a/netbox/templates/dcim/device_bulk_edit.html b/netbox/templates/dcim/device_bulk_edit.html index 591a64585..bd617eab9 100644 --- a/netbox/templates/dcim/device_bulk_edit.html +++ b/netbox/templates/dcim/device_bulk_edit.html @@ -10,7 +10,6 @@ {{ device.device_type }} {{ device.device_role }} {{ device.serial }} - {{ device.ro_snmp }} {% endfor %} {% endblock %} diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index 65edc27b7..e2f2d95a2 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -32,7 +32,6 @@ {% render_field form.platform %} {% render_field form.status %} {% if obj %}{% render_field form.primary_ip %}{% endif %} - {% render_field form.ro_snmp %}