mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-14 09:51:22 -06:00
Removed Device.ro_snmp
This commit is contained in:
parent
b9e4f30177
commit
d6cd3428f6
@ -544,7 +544,6 @@ CREATE TABLE dcim_device (
|
|||||||
face smallint,
|
face smallint,
|
||||||
device_type_id integer NOT NULL,
|
device_type_id integer NOT NULL,
|
||||||
rack_id integer NOT NULL,
|
rack_id integer NOT NULL,
|
||||||
ro_snmp character varying(50) NOT NULL,
|
|
||||||
device_role_id integer NOT NULL,
|
device_role_id integer NOT NULL,
|
||||||
primary_ip_id integer,
|
primary_ip_id integer,
|
||||||
status boolean NOT NULL,
|
status boolean NOT NULL,
|
||||||
|
@ -222,7 +222,7 @@ class DeviceSerializer(serializers.ModelSerializer):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = Device
|
model = Device
|
||||||
fields = ['id', 'name', 'display_name', 'device_type', 'device_role', 'platform', 'serial', 'rack', 'position',
|
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):
|
class DeviceNestedSerializer(DeviceSerializer):
|
||||||
|
@ -629,47 +629,47 @@
|
|||||||
- model: dcim.device
|
- model: dcim.device
|
||||||
pk: 1
|
pk: 1
|
||||||
fields: {device_type: 1, device_role: 1, platform: 1, name: test1-edge1, serial: '5555555555',
|
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
|
- model: dcim.device
|
||||||
pk: 2
|
pk: 2
|
||||||
fields: {device_type: 2, device_role: 3, platform: 1, name: test1-core1, serial: '',
|
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
|
- model: dcim.device
|
||||||
pk: 3
|
pk: 3
|
||||||
fields: {device_type: 3, device_role: 2, platform: 1, name: test1-spine1, serial: '',
|
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
|
- model: dcim.device
|
||||||
pk: 4
|
pk: 4
|
||||||
fields: {device_type: 4, device_role: 4, platform: 1, name: test1-leaf1, serial: '',
|
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
|
- model: dcim.device
|
||||||
pk: 5
|
pk: 5
|
||||||
fields: {device_type: 4, device_role: 4, platform: 1, name: test1-leaf2, serial: '9823478293748',
|
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
|
- model: dcim.device
|
||||||
pk: 6
|
pk: 6
|
||||||
fields: {device_type: 3, device_role: 2, platform: 1, name: test1-spine2, serial: '45649818158',
|
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
|
- model: dcim.device
|
||||||
pk: 7
|
pk: 7
|
||||||
fields: {device_type: 1, device_role: 1, platform: 1, name: test1-edge2, serial: '7567356345',
|
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
|
- model: dcim.device
|
||||||
pk: 8
|
pk: 8
|
||||||
fields: {device_type: 2, device_role: 3, platform: 1, name: test1-core2, serial: '67856734534',
|
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
|
- model: dcim.device
|
||||||
pk: 9
|
pk: 9
|
||||||
fields: {device_type: 5, device_role: 5, platform: 2, name: test1-oob1, serial: '98273942938',
|
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
|
- model: dcim.device
|
||||||
pk: 11
|
pk: 11
|
||||||
fields: {device_type: 6, device_role: 6, platform: null, name: test1-pdu1, serial: '',
|
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
|
- model: dcim.device
|
||||||
pk: 12
|
pk: 12
|
||||||
fields: {device_type: 6, device_role: 6, platform: null, name: test1-pdu2, serial: '',
|
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
|
- model: dcim.consoleport
|
||||||
pk: 1
|
pk: 1
|
||||||
fields: {device: 1, name: Console (RE0), cs_port: 27, connection_status: true}
|
fields: {device: 1, name: Console (RE0), cs_port: 27, connection_status: true}
|
||||||
|
@ -337,11 +337,10 @@ class DeviceForm(forms.ModelForm, BootstrapMixin):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = Device
|
model = Device
|
||||||
fields = ['name', 'device_role', 'device_type', 'serial', 'site', 'rack', 'position', 'face', 'status',
|
fields = ['name', 'device_role', 'device_type', 'serial', 'site', 'rack', 'position', 'face', 'status',
|
||||||
'platform', 'primary_ip', 'ro_snmp', 'comments']
|
'platform', 'primary_ip', 'comments']
|
||||||
help_texts = {
|
help_texts = {
|
||||||
'device_role': "The function this device serves",
|
'device_role': "The function this device serves",
|
||||||
'serial': "Chassis serial number",
|
'serial': "Chassis serial number",
|
||||||
'ro_snmp': "Read-only SNMP string",
|
|
||||||
}
|
}
|
||||||
widgets = {
|
widgets = {
|
||||||
'face': forms.Select(attrs={'filter-for': 'position'}),
|
'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"')
|
platform_delete = forms.BooleanField(required=False, label='Set platform to "none"')
|
||||||
status = forms.ChoiceField(choices=FORM_STATUS_CHOICES, required=False, initial='', label='Status')
|
status = forms.ChoiceField(choices=FORM_STATUS_CHOICES, required=False, initial='', label='Status')
|
||||||
serial = forms.CharField(max_length=50, required=False, label='Serial Number')
|
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):
|
class DeviceBulkDeleteForm(ConfirmationForm):
|
||||||
|
19
netbox/dcim/migrations/0006_remove_device_ro_snmp.py
Normal file
19
netbox/dcim/migrations/0006_remove_device_ro_snmp.py
Normal file
@ -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',
|
||||||
|
),
|
||||||
|
]
|
@ -434,7 +434,6 @@ class Device(models.Model):
|
|||||||
status = models.BooleanField(choices=STATUS_CHOICES, default=STATUS_ACTIVE, verbose_name='Status')
|
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,
|
primary_ip = models.OneToOneField('ipam.IPAddress', related_name='primary_for', on_delete=models.SET_NULL,
|
||||||
blank=True, null=True, verbose_name='Primary IP')
|
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)
|
comments = models.TextField(blank=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@ -321,7 +321,6 @@ class DeviceTest(APITestCase):
|
|||||||
'face',
|
'face',
|
||||||
'status',
|
'status',
|
||||||
'primary_ip',
|
'primary_ip',
|
||||||
'ro_snmp',
|
|
||||||
'comments',
|
'comments',
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -382,7 +381,6 @@ class DeviceTest(APITestCase):
|
|||||||
'rack_facility_id',
|
'rack_facility_id',
|
||||||
'rack_id',
|
'rack_id',
|
||||||
'rack_name',
|
'rack_name',
|
||||||
'ro_snmp',
|
|
||||||
'serial',
|
'serial',
|
||||||
'status',
|
'status',
|
||||||
]
|
]
|
||||||
|
@ -586,7 +586,7 @@ class DeviceBulkEditView(PermissionRequiredMixin, BulkEditView):
|
|||||||
if form.cleaned_data['status']:
|
if form.cleaned_data['status']:
|
||||||
status = form.cleaned_data['status']
|
status = form.cleaned_data['status']
|
||||||
fields_to_update['status'] = True if status == 'True' else False
|
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]:
|
if form.cleaned_data[field]:
|
||||||
fields_to_update[field] = form.cleaned_data[field]
|
fields_to_update[field] = form.cleaned_data[field]
|
||||||
|
|
||||||
|
@ -101,16 +101,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>SNMP String (RO)</td>
|
|
||||||
<td>
|
|
||||||
{% if device.ro_snmp %}
|
|
||||||
<span>{{ device.ro_snmp }}</span>
|
|
||||||
{% else %}
|
|
||||||
<span class="text-muted">Not defined</span>
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
<td>{{ device.device_type }}</td>
|
<td>{{ device.device_type }}</td>
|
||||||
<td>{{ device.device_role }}</td>
|
<td>{{ device.device_role }}</td>
|
||||||
<td>{{ device.serial }}</td>
|
<td>{{ device.serial }}</td>
|
||||||
<td>{{ device.ro_snmp }}</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
{% render_field form.platform %}
|
{% render_field form.platform %}
|
||||||
{% render_field form.status %}
|
{% render_field form.status %}
|
||||||
{% if obj %}{% render_field form.primary_ip %}{% endif %}
|
{% if obj %}{% render_field form.primary_ip %}{% endif %}
|
||||||
{% render_field form.ro_snmp %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
|
Loading…
Reference in New Issue
Block a user