Skip to content

Commit

Permalink
Add napalm_optional_args field to platform model
Browse files Browse the repository at this point in the history
  • Loading branch information
orgito committed Jun 22, 2018
1 parent 6dde0f0 commit d7491e5
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 3 deletions.
19 changes: 18 additions & 1 deletion netbox/dcim/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,21 @@ def napalm(self, request, pk):
# TODO: Improve error handling
response = OrderedDict([(m, None) for m in napalm_methods])
ip_address = str(device.primary_ip.address.ip)

# Merge NAPALM_ARGS and form data
optional_args = {}
if settings.NAPALM_ARGS:
optional_args.update(settings.NAPALM_ARGS)

if device.platform.napalm_optional_args:
optional_args.update(parse_optional_args(device.platform.napalm_optional_args))

d = driver(
hostname=ip_address,
username=settings.NAPALM_USERNAME,
password=settings.NAPALM_PASSWORD,
timeout=settings.NAPALM_TIMEOUT,
optional_args=settings.NAPALM_ARGS
optional_args=optional_args
)
try:
d.open()
Expand Down Expand Up @@ -446,3 +455,11 @@ def list(self, request):
return Response()

return Response(serializers.DeviceSerializer(local_interface.device, context={'request': request}).data)


# Helper function to parser optional_args
def parse_optional_args(optional_args):
if optional_args is not None:
return {x.split('=')[0].strip(): x.split('=')[1].strip()
for x in optional_args.split(',')}
return {}
2 changes: 1 addition & 1 deletion netbox/dcim/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ class PlatformForm(BootstrapMixin, forms.ModelForm):

class Meta:
model = Platform
fields = ['name', 'slug', 'manufacturer', 'napalm_driver', 'rpc_client']
fields = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_optional_args', 'rpc_client']


class PlatformCSVForm(forms.ModelForm):
Expand Down
20 changes: 20 additions & 0 deletions netbox/dcim/migrations/0056_platform_napalm_optional_args.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.13 on 2018-06-22 19:51
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('dcim', '0055_virtualchassis_ordering'),
]

operations = [
migrations.AddField(
model_name='platform',
name='napalm_optional_args',
field=models.CharField(blank=True, help_text='Comma separated key=value pairs passed via optional_args to the driver.', max_length=200, verbose_name='NAPALM optional arguments'),
),
]
8 changes: 7 additions & 1 deletion netbox/dcim/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -815,14 +815,20 @@ class Platform(models.Model):
verbose_name='NAPALM driver',
help_text="The name of the NAPALM driver to use when interacting with devices"
)
napalm_optional_args = models.CharField(
max_length=200,
blank=True,
verbose_name='NAPALM optional arguments',
help_text="Comma separated key=value pairs passed via optional_args to the driver."
)
rpc_client = models.CharField(
max_length=30,
choices=RPC_CLIENT_CHOICES,
blank=True,
verbose_name="Legacy RPC client"
)

csv_headers = ['name', 'slug', 'manufacturer', 'napalm_driver']
csv_headers = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_optional_args']

class Meta:
ordering = ['name']
Expand Down

0 comments on commit d7491e5

Please sign in to comment.