From 2d25907cba66fed39b2cdb401753a22909502310 Mon Sep 17 00:00:00 2001
From: Alvaro Arriola <alarriol@cisco.com>
Date: Fri, 11 Oct 2019 17:30:38 +0200
Subject: [PATCH] Fixing typos.

---
 initializers/ip_addresses.yml                          | 4 ++--
 initializers/prefixes.yml                              | 1 -
 initializers/{tenants_groups.yml => tenant_groups.yml} | 0
 initializers/virtualization_interfaces.yml             | 4 ++--
 initializers/vlan_groups.yml                           | 2 +-
 initializers/vrfs.yml                                  | 1 -
 startup_scripts/250_dcim_interfaces.py                 | 8 ++++----
 7 files changed, 9 insertions(+), 11 deletions(-)
 rename initializers/{tenants_groups.yml => tenant_groups.yml} (100%)

diff --git a/initializers/ip_addresses.yml b/initializers/ip_addresses.yml
index abcc918..29a3917 100644
--- a/initializers/ip_addresses.yml
+++ b/initializers/ip_addresses.yml
@@ -1,11 +1,11 @@
 #- address: 10.1.1.1/24
 #  device: server01
-#  interface: Loopback0
+#  interface: to-server02 
 #  status: Active
 #  vrf: vrf1
 #- address: 10.1.1.2/24
 #  device: server02
-#  interface: Vlan5
+#  interface: to-server01
 #  status: Active
 #- address: 10.1.1.10/24
 #  description: reserved IP
diff --git a/initializers/prefixes.yml b/initializers/prefixes.yml
index ef6330a..f70685c 100644
--- a/initializers/prefixes.yml
+++ b/initializers/prefixes.yml
@@ -12,7 +12,6 @@
 #  vlan: vlan2
 #  is_pool: true
 #  vrf: vrf2
-#  tenant: tenant2
 #- description: ipv6 prefix1
 #  prefix: fd00:ccdd:a000:1::/64
 #  site: AMS 2
diff --git a/initializers/tenants_groups.yml b/initializers/tenant_groups.yml
similarity index 100%
rename from initializers/tenants_groups.yml
rename to initializers/tenant_groups.yml
diff --git a/initializers/virtualization_interfaces.yml b/initializers/virtualization_interfaces.yml
index deff914..37d3252 100644
--- a/initializers/virtualization_interfaces.yml
+++ b/initializers/virtualization_interfaces.yml
@@ -3,10 +3,10 @@
 #  mac_address: 00:77:77:77:77:77
 #  mtu: 1500
 #  name: Network Interface 1
-#  virtual_machine: virtual_machine1
+#  virtual_machine: virtual machine 1
 #- description: Network Interface 2
 #  enabled: true
 #  mac_address: 00:55:55:55:55:55
 #  mtu: 1500
 #  name: Network Interface 2
-#  virtual_machine: virtual_machine1
+#  virtual_machine: virtual machine 1
diff --git a/initializers/vlan_groups.yml b/initializers/vlan_groups.yml
index 11a48fc..81546eb 100644
--- a/initializers/vlan_groups.yml
+++ b/initializers/vlan_groups.yml
@@ -1,6 +1,6 @@
 #- name: VLAN group 1
 #  site: AMS 1
-#  slug: vlan-group-2
+#  slug: vlan-group-1
 #- name: VLAN group 2
 #  site: AMS 1
 #  slug: vlan-group-2
diff --git a/initializers/vrfs.yml b/initializers/vrfs.yml
index 0f3684d..fd50d87 100644
--- a/initializers/vrfs.yml
+++ b/initializers/vrfs.yml
@@ -6,4 +6,3 @@
 #  name: vrf2
 #  rd: "6500:6500"
 #  tenant: tenant2
-#  tenant_group: Tenant Group 2
diff --git a/startup_scripts/250_dcim_interfaces.py b/startup_scripts/250_dcim_interfaces.py
index b0baf39..ce7e7bd 100644
--- a/startup_scripts/250_dcim_interfaces.py
+++ b/startup_scripts/250_dcim_interfaces.py
@@ -28,11 +28,11 @@ with file.open('r') as stream:
 
         params[assoc] = model.objects.get(**query)
 
-      if 'form_factor' in params:
+      if 'type' in params:
         for outer_list in IFACE_TYPE_CHOICES:
-          for ffactor_choices in outer_list[1]:
-            if params['form_factor'] in ffactor_choices:
-              params['form_factor'] = ffactor_choices[0]
+          for type_choices in outer_list[1]:
+            if params['type'] in type_choices:
+              params['type'] = type_choices[0]
               break
           else:
             continue