Merge upstream v2.7.8 into develop

This commit is contained in:
Marco Ceppi
2020-02-27 07:18:06 -05:00
1195 changed files with 107886 additions and 16972 deletions

View File

@@ -1,5 +1,4 @@
from dcim.models import Site, Rack, DeviceRole, DeviceType, Device, Platform
from dcim.constants import RACK_FACE_CHOICES
from ipam.models import IPAddress
from virtualization.models import Cluster
from tenancy.models import Tenant
@@ -26,6 +25,7 @@ with file.open('r') as stream:
optional_assocs = {
'tenant': (Tenant, 'name'),
'platform': (Platform, 'name'),
'rack': (Rack, 'name'),
'cluster': (Cluster, 'name'),
'primary_ip4': (IPAddress, 'address'),
'primary_ip6': (IPAddress, 'address')
@@ -48,14 +48,6 @@ with file.open('r') as stream:
params[assoc] = model.objects.get(**query)
if 'rack' in params:
params['rack'] = Rack.objects.get(name=params.pop('rack'), site=params['site'].id)
if 'face' in params:
for rack_face in RACK_FACE_CHOICES:
if params['face'] in rack_face:
params['face'] = rack_face[0]
device, created = Device.objects.get_or_create(**params)
if created: