Fixed issue with not resolving choice IDs for interfaces and type keys (#210)

Author: FragmentedPacket

.travis.yml

@@ -10,7 +10,7 @@ env:
   global:
     - COLLECTION_NAMESPACE: netbox
     - COLLECTION_NAME: netbox
-    - COLLECTION_VERSION: 0.2.1
+    - COLLECTION_VERSION: 0.2.2
     - secure: "tE6GtwrRU+Kjobx/94xqR2MqM20pHCnrLcHgPzIHA3npdwuA+GjCBiBLTkEEQM4fUWIfzUTyjSr9bZErm1PTI1GcIRdniTgJ3ZzSSkE7tgeYALB/7xsusB57SlmbBQm2SGwU558uWZ3NHEsi0WTgD8GKZo77OpGX72FZKsVXOz6k2wve51sOtoSVjgCsvWTmZHx4ynGdiA5wFkZfaEcjXECahKtunW+MlB5kpJzkVeLRUEXFMhWlsIYiA5nj8OI/X3Nk9ugh1ribENX9LrjpgrqQ9YariZ8G6py1ONuKZIn2g7xs5kNQ3qL6HL6N7SoUxiwH16CfSyugFaYiMfaxQ4NUVGGRHS4vSGbNIf+gLHcYvP40miI1f/+pntCzqygZMhW73FX2o+KH2OGv09khOl8k1nDg2/XvW0kCc/FU6l+Jp5wCC8H9X2uiULtQpRqts5TzIonlPEzGIpfGFgJ5m54Emhv9gjG1Z5OOyL/qae1Wr+L/uhiFafcglZYh8NHEMWCUCkeqFqR2kDmUMtdgYLD7Q7NdwlL/PSVVs1l7UPiQHlnecQKEHN7CvR3eKByTEmkCKafRYh/JQ9rBt9sZc7aAPVu+w3wWUwbHS4o4vVnmyXvJb1PeJSiuynF7CBo4Qd6qj4YwX8gLK6PylGyaMOp169u6xw1mo5/CX0pJ3x4="
 
 jobs:

galaxy.yml

@@ -9,7 +9,7 @@ namespace: netbox
 name: netbox
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 0.2.1
+version: 0.2.2
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

plugins/module_utils/netbox_utils.py

@@ -248,7 +248,7 @@
     "circuits": set(["status"]),
     "devices": set(["status", "face"]),
     "device_types": set(["subdevice_role"]),
-    "interfaces": set(["form_factor", "mode"]),
+    "interfaces": set(["form_factor", "mode", "type"]),
     "ip_addresses": set(["status", "role"]),
     "prefixes": set(["status"]),
     "racks": set(["status", "outer_unit", "type"]),

tests/integration/targets/latest/tasks/netbox_device_interface.yml

@@ -11,7 +11,7 @@
     data:
       device: test100
       name: GigabitEthernet3
-      form_factor: "1000Base-T (1GE)"
+      type: "1000Base-T (1GE)"
   register: test_one
 
 - name: "1 - ASSERT"
@@ -72,7 +72,7 @@
     data:
       device: test100
       name: port-channel1
-      form_factor: Link Aggregation Group (LAG)
+      type: Link Aggregation Group (LAG)
       mtu: 1600
       mgmt_only: false
       mode: Access
@@ -102,7 +102,7 @@
       device: test100
       name: GigabitEthernet3
       enabled: false
-      form_factor: 1000Base-T (1GE)
+      type: 1000Base-T (1GE)
       lag:
         name: port-channel1
       mtu: 1600
@@ -135,7 +135,7 @@
       device: test100
       name: GigabitEthernet21
       enabled: false
-      form_factor: 1000Base-T (1GE)
+      type: 1000Base-T (1GE)
       untagged_vlan:
         name: Wireless
         site: Test Site
@@ -191,7 +191,7 @@
     data:
       device: "R1-Device"
       name: "port-channel1"
-      form_factor: "Link Aggregation Group (LAG)"
+      type: "Link Aggregation Group (LAG)"
 
 - name: "8 - Create interface and assign it to parent LAG - non dict"
   netbox.netbox.netbox_device_interface:
@@ -201,7 +201,7 @@
       device: test100
       name: GigabitEthernet4
       enabled: false
-      form_factor: 1000Base-T (1GE)
+      type: 1000Base-T (1GE)
       lag: "port-channel1"
       mtu: 1600
       mgmt_only: false
@@ -232,7 +232,7 @@
     data:
       device: Test Nexus Child One
       name: Ethernet2/2
-      form_factor: 1000Base-T (1GE)
+      type: 1000Base-T (1GE)
     state: present
   register: test_nine