Bugfix: Adding assigned_object as allowed query param for ip addresses (#435)

Author: FragmentedPacket

.github/workflows/main.yml

@@ -58,16 +58,43 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Clone & Start netbox-docker containers
+      - name: Clone & Start netbox-docker containers - latest
         env:
           VERSION: ${{ matrix.VERSION }}
         run: |
           cd ..
           git clone https://github.com/netbox-community/netbox-docker.git
           cd netbox-docker
+          tee docker-compose.override.yml <<EOF
+          version: '3.4'
+          services:
+            netbox:
+              ports:
+                - 32768:8080
+          EOF
           docker-compose up -d --quiet-pull
           docker container ls
           cd ..
+        if: matrix.VERSION == 'latest'
+      - name: Clone & Start netbox-docker containers - 2.9
+        env:
+          VERSION: ${{ matrix.VERSION }}
+        run: |
+          cd ..
+          git clone https://github.com/netbox-community/netbox-docker.git
+          cd netbox-docker
+          git checkout 0.26.2
+          tee docker-compose.override.yml <<EOF
+          version: '3.4'
+          services:
+            nginx:
+              ports:
+                - 32768:8080
+          EOF
+          docker-compose up -d --quiet-pull
+          docker container ls
+          cd ..
+        if: matrix.VERSION == 'v2.9'
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1.1.1
         with:

.github/workflows/release.yml

@@ -1,8 +1,8 @@
 name: Deploy collection to Ansible Galaxy
 on:
-  create:
-    tags:
-      - "v*"
+  push:
+    branches:
+      - "refs/tags/v*"
 jobs:
   deploy:
     runs-on: ubuntu-latest

plugins/module_utils/netbox_utils.py

@@ -293,9 +293,9 @@
     "interface": set(["name", "device", "virtual_machine"]),
     "interface_template": set(["name", "device_type"]),
     "inventory_item": set(["name", "device"]),
-    "ip_address": set(["address", "vrf", "device", "interface"]),
-    "ip_addresses": set(["address", "vrf", "device", "interface"]),
-    "ipaddresses": set(["address", "vrf", "device", "interface"]),
+    "ip_address": set(["address", "vrf", "device", "interface", "assigned_object"]),
+    "ip_addresses": set(["address", "vrf", "device", "interface", "assigned_object"]),
+    "ipaddresses": set(["address", "vrf", "device", "interface", "assigned_object"]),
     "lag": set(["name"]),
     "manufacturer": set(["slug"]),
     "master": set(["name"]),

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

@@ -171,7 +171,7 @@
       - test_eight['msg'] == "ip_address 10.10.1.30/16 created"
       - test_eight['ip_address']['address'] == "10.10.1.30/16"
       - test_eight['ip_address']['family'] == 4
-      - test_eight['ip_address']['nat_inside'] == 11
+      - test_eight['ip_address'].get('nat_inside')
       - test_eight['ip_address']['vrf'] == 1
 
 - name: "9 - Create IP address on GigabitEthernet2 - test100 - State: present"
@@ -316,7 +316,7 @@
       assigned_object:
         name: Eth0
         virtual_machine: test101-vm
-    state: "new"
+    state: "present"
   register: test_fifteen
 
 - name: "15 - ASSERT"

tests/integration/targets/regression-latest/tasks/main.yml

@@ -216,3 +216,51 @@
         that:
           - test_results is failed
           - 'test_results["msg"] == "One or more of the kwargs provided are invalid for circuits.circuittermination, provided kwargs: name. Acceptable kwargs: circuit, term_side"'
+
+    - name: "Issue #432 - Make sure same IPs get assigned to different device interfaces"
+      netbox.netbox.netbox_ip_address:
+        netbox_url: "http://localhost:32768"
+        netbox_token: "0123456789abcdef0123456789abcdef01234567"
+        data: "{{ item }}"
+      loop: "{{ data }}"
+      register: "test_results"
+      vars:
+        data:
+          - address: 121.121.121.121/32
+            assigned_object:
+              device: "Test Nexus One"
+              name: "Ethernet1/1"
+            description: ansible-netbox-1.2.1
+            dns_name: ansible-netbox-1.2.1
+            role: HSRP
+            status: Active
+          - address: 121.121.121.121/32
+            assigned_object:
+              device: "Test Nexus Child One"
+              name: "Ethernet2/1"
+            description: ansible-netbox-1.2.1
+            dns_name: ansible-netbox-1.2.1
+            role: HSRP
+            status: Active
+          - address: 1.121.121.121/32
+            assigned_object:
+              device: "Test Nexus One"
+              name: "Ethernet1/1"
+            description: ansible-netbox-1.2.1
+            dns_name: ansible-netbox-1.2.1
+            role: HSRP
+            status: Active
+          - address: 1.121.121.121/32
+            assigned_object:
+              device: "Test Nexus Child One"
+              name: "Ethernet2/1"
+            description: ansible-netbox-1.2.1
+            dns_name: ansible-netbox-1.2.1
+            role: HSRP
+            status: Active
+
+    - name: "ASSERT Issue #432 changes reflect correct device"
+      assert:
+        that:
+          - test_results | json_query('results[?ip_address.address==`1.121.121.121/32`]') | length == 2
+          - test_results | json_query('results[?ip_address.address==`121.121.121.121/32`]') | length == 2

tests/integration/targets/v2.9/tasks/netbox_ip_address.yml

@@ -316,7 +316,7 @@
       assigned_object:
         name: Eth0
         virtual_machine: test101-vm
-    state: "new"
+    state: "present"
   register: test_fifteen
 
 - name: "15 - ASSERT"