Keep iocage_ip4 a string.

ansible-collections · Jan 8, 2025 · 5955cf5 · 5955cf5
1 parent 573831c
commit 5955cf5
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 27 deletions.
diff --git a/plugins/inventory/iocage.py b/plugins/inventory/iocage.py
@@ -258,13 +258,16 @@ def get_jails(self, t_stdout, results):
         for line in lines[3::2]:
             jail = [line[i + 1:j].strip() for i, j in zip(indices[:-1], indices[1:])]
             iocage_name = jail[1]
+            iocage_ip4_dict = _parse_ip4(jail[6])
+            iocage_ip4 = ','.join([d['ip'] for d in iocage_ip4_dict['ip4']])
             results['_meta']['hostvars'][iocage_name] = {}
             results['_meta']['hostvars'][iocage_name]['iocage_jid'] = jail[0]
             results['_meta']['hostvars'][iocage_name]['iocage_boot'] = jail[2]
             results['_meta']['hostvars'][iocage_name]['iocage_state'] = jail[3]
             results['_meta']['hostvars'][iocage_name]['iocage_type'] = jail[4]
             results['_meta']['hostvars'][iocage_name]['iocage_release'] = jail[5]
-            results['_meta']['hostvars'][iocage_name]['iocage_ip4'] = _parse_ip4(jail[6])
+            results['_meta']['hostvars'][iocage_name]['iocage_ip4_dict'] = iocage_ip4_dict
+            results['_meta']['hostvars'][iocage_name]['iocage_ip4'] = iocage_ip4
             results['_meta']['hostvars'][iocage_name]['iocage_ip6'] = jail[7]
             results['_meta']['hostvars'][iocage_name]['iocage_template'] = jail[8]
             results['_meta']['hostvars'][iocage_name]['iocage_basejail'] = jail[9]

diff --git a/...s/inventory/fixtures/iocage_inventory.yml → ...tory/fixtures/iocage/iocage_inventory.yml b/...s/inventory/fixtures/iocage_inventory.yml → ...tory/fixtures/iocage/iocage_inventory.yml
@@ -5,12 +5,13 @@ all:
         test_101:
           iocage_basejail: 'yes'
           iocage_boot: 'off'
-          iocage_ip4:
+          iocage_ip4_dict:
             ip4:
               - ifc: vnet0
                 ip: 10.1.0.101
                 mask: '24'
             msg: ''
+          iocage_ip4: 10.1.0.101
           iocage_ip6: '-'
           iocage_jid: '-'
           iocage_properties:
@@ -162,12 +163,13 @@ all:
         test_102:
           iocage_basejail: 'yes'
           iocage_boot: 'off'
-          iocage_ip4:
+          iocage_ip4_dict:
             ip4:
               - ifc: vnet0
                 ip: 10.1.0.102
                 mask: '24'
             msg: ''
+          iocage_ip4: 10.1.0.102
           iocage_ip6: '-'
           iocage_jid: '-'
           iocage_properties:
@@ -319,12 +321,13 @@ all:
         test_103:
           iocage_basejail: 'yes'
           iocage_boot: 'off'
-          iocage_ip4:
+          iocage_ip4_dict:
             ip4:
               - ifc: vnet0
                 ip: 10.1.0.103
                 mask: '24'
             msg: ''
+          iocage_ip4: 10.1.0.103
           iocage_ip6: '-'
           iocage_jid: '-'
           iocage_properties:

diff --git a/...ory/fixtures/iocage_inventory.yml.license → ...tures/iocage/iocage_inventory.yml.license b/...ory/fixtures/iocage_inventory.yml.license → ...tures/iocage/iocage_inventory.yml.license
diff --git a/...ugins/inventory/fixtures/iocage_jails.txt → ...nventory/fixtures/iocage/iocage_jails.txt b/...ugins/inventory/fixtures/iocage_jails.txt → ...nventory/fixtures/iocage/iocage_jails.txt
diff --git a/...ventory/fixtures/iocage_jails.txt.license → .../fixtures/iocage/iocage_jails.txt.license b/...ventory/fixtures/iocage_jails.txt.license → .../fixtures/iocage/iocage_jails.txt.license
diff --git a/...ugins/inventory/fixtures/iocage_jails.yml → ...nventory/fixtures/iocage/iocage_jails.yml b/...ugins/inventory/fixtures/iocage_jails.yml → ...nventory/fixtures/iocage/iocage_jails.yml
@@ -3,7 +3,8 @@ _meta:
     test_101:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4: 10.1.0.101
+      iocage_ip4_dict:
         ip4:
           - ifc: vnet0
             ip: 10.1.0.101
@@ -18,7 +19,8 @@ _meta:
     test_102:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4: 10.1.0.102
+      iocage_ip4_dict:
         ip4:
           - ifc: vnet0
             ip: 10.1.0.102
@@ -33,7 +35,8 @@ _meta:
     test_103:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4: 10.1.0.103
+      iocage_ip4_dict:
         ip4:
           - ifc: vnet0
             ip: 10.1.0.103

diff --git a/...ventory/fixtures/iocage_jails.yml.license → .../fixtures/iocage/iocage_jails.yml.license b/...ventory/fixtures/iocage_jails.yml.license → .../fixtures/iocage/iocage_jails.yml.license
diff --git a/.../inventory/fixtures/iocage_jails_dhcp.txt → ...ory/fixtures/iocage/iocage_jails_dhcp.txt b/.../inventory/fixtures/iocage_jails_dhcp.txt → ...ory/fixtures/iocage/iocage_jails_dhcp.txt
diff --git a/...ry/fixtures/iocage_jails_dhcp.txt.license → ...ures/iocage/iocage_jails_dhcp.txt.license b/...ry/fixtures/iocage_jails_dhcp.txt.license → ...ures/iocage/iocage_jails_dhcp.txt.license
diff --git a/.../inventory/fixtures/iocage_jails_dhcp.yml → ...ory/fixtures/iocage/iocage_jails_dhcp.yml b/.../inventory/fixtures/iocage_jails_dhcp.yml → ...ory/fixtures/iocage/iocage_jails_dhcp.yml
@@ -3,12 +3,13 @@ _meta:
     test_111:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4_dict:
         ip4:
           - ifc: epair0b
             ip: 10.1.0.174
             mask: '-'
         msg: ''
+      iocage_ip4: 10.1.0.174
       iocage_ip6: '-'
       iocage_jid: '268'
       iocage_release: 14.1-RELEASE-p6
@@ -18,12 +19,13 @@ _meta:
     test_112:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4_dict:
         ip4:
           - ifc: epair0b
             ip: 10.1.0.147
             mask: '-'
         msg: ''
+      iocage_ip4: 10.1.0.147
       iocage_ip6: '-'
       iocage_jid: '269'
       iocage_release: 14.1-RELEASE-p6
@@ -33,12 +35,13 @@ _meta:
     test_113:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4_dict:
         ip4:
           - ifc: epair0b
             ip: 10.1.0.231
             mask: '-'
         msg: ''
+      iocage_ip4: 10.1.0.231
       iocage_ip6: '-'
       iocage_jid: '270'
       iocage_release: 14.1-RELEASE-p6

diff --git a/...ry/fixtures/iocage_jails_dhcp.yml.license → ...ures/iocage/iocage_jails_dhcp.yml.license b/...ry/fixtures/iocage_jails_dhcp.yml.license → ...ures/iocage/iocage_jails_dhcp.yml.license
diff --git a/...ixtures/iocage_jails_dhcp_not_running.txt → .../iocage/iocage_jails_dhcp_not_running.txt b/...ixtures/iocage_jails_dhcp_not_running.txt → .../iocage/iocage_jails_dhcp_not_running.txt
diff --git a/...iocage_jails_dhcp_not_running.txt.license → ...iocage_jails_dhcp_not_running.txt.license b/...iocage_jails_dhcp_not_running.txt.license → ...iocage_jails_dhcp_not_running.txt.license
diff --git a/...ixtures/iocage_jails_dhcp_not_running.yml → .../iocage/iocage_jails_dhcp_not_running.yml b/...ixtures/iocage_jails_dhcp_not_running.yml → .../iocage/iocage_jails_dhcp_not_running.yml
@@ -3,7 +3,8 @@ _meta:
     test_111:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4: ''
+      iocage_ip4_dict:
         ip4: []
         msg: 'DHCP (not running)'
       iocage_ip6: '-'
@@ -15,7 +16,8 @@ _meta:
     test_112:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4: ''
+      iocage_ip4_dict:
         ip4: []
         msg: 'DHCP (not running)'
       iocage_ip6: '-'
@@ -27,7 +29,8 @@ _meta:
     test_113:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4: ''
+      iocage_ip4_dict:
         ip4: []
         msg: 'DHCP (not running)'
       iocage_ip6: '-'

diff --git a/...iocage_jails_dhcp_not_running.yml.license → ...iocage_jails_dhcp_not_running.yml.license b/...iocage_jails_dhcp_not_running.yml.license → ...iocage_jails_dhcp_not_running.yml.license
diff --git a/.../inventory/fixtures/iocage_properties.txt → ...ory/fixtures/iocage/iocage_properties.txt b/.../inventory/fixtures/iocage_properties.txt → ...ory/fixtures/iocage/iocage_properties.txt
diff --git a/...ry/fixtures/iocage_properties.txt.license → ...ures/iocage/iocage_properties.txt.license b/...ry/fixtures/iocage_properties.txt.license → ...ures/iocage/iocage_properties.txt.license
diff --git a/.../inventory/fixtures/iocage_properties.yml → ...ory/fixtures/iocage/iocage_properties.yml b/.../inventory/fixtures/iocage_properties.yml → ...ory/fixtures/iocage/iocage_properties.yml
@@ -3,12 +3,13 @@ _meta:
     test_101:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4_dict:
         ip4:
           - ifc: vnet0
             ip: 10.1.0.101
             mask: '24'
         msg: ''
+      iocage_ip4: 10.1.0.101
       iocage_ip6: '-'
       iocage_jid: '-'
       iocage_properties:
@@ -160,12 +161,13 @@ _meta:
     test_102:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4_dict:
         ip4:
           - ifc: vnet0
             ip: 10.1.0.102
             mask: '24'
         msg: ''
+      iocage_ip4: 10.1.0.102
       iocage_ip6: '-'
       iocage_jid: '-'
       iocage_properties:
@@ -317,12 +319,13 @@ _meta:
     test_103:
       iocage_basejail: 'yes'
       iocage_boot: 'off'
-      iocage_ip4:
+      iocage_ip4_dict:
         ip4:
           - ifc: vnet0
             ip: 10.1.0.103
             mask: '24'
         msg: ''
+      iocage_ip4: 10.1.0.103
       iocage_ip6: '-'
       iocage_jid: '-'
       iocage_properties:

diff --git a/...ry/fixtures/iocage_properties.yml.license → ...ures/iocage/iocage_properties.yml.license b/...ry/fixtures/iocage_properties.yml.license → ...ures/iocage/iocage_properties.yml.license
diff --git a/...y/fixtures/iocage_properties_test_101.txt → ...res/iocage/iocage_properties_test_101.txt b/...y/fixtures/iocage_properties_test_101.txt → ...res/iocage/iocage_properties_test_101.txt
diff --git a/...es/iocage_properties_test_101.txt.license → ...ge/iocage_properties_test_101.txt.license b/...es/iocage_properties_test_101.txt.license → ...ge/iocage_properties_test_101.txt.license
diff --git a/...y/fixtures/iocage_properties_test_102.txt → ...res/iocage/iocage_properties_test_102.txt b/...y/fixtures/iocage_properties_test_102.txt → ...res/iocage/iocage_properties_test_102.txt
diff --git a/...es/iocage_properties_test_102.txt.license → ...ge/iocage_properties_test_102.txt.license b/...es/iocage_properties_test_102.txt.license → ...ge/iocage_properties_test_102.txt.license
diff --git a/...y/fixtures/iocage_properties_test_103.txt → ...res/iocage/iocage_properties_test_103.txt b/...y/fixtures/iocage_properties_test_103.txt → ...res/iocage/iocage_properties_test_103.txt
diff --git a/...es/iocage_properties_test_103.txt.license → ...ge/iocage_properties_test_103.txt.license b/...es/iocage_properties_test_103.txt.license → ...ge/iocage_properties_test_103.txt.license
diff --git a/tests/unit/plugins/inventory/test_iocage.py b/tests/unit/plugins/inventory/test_iocage.py
@@ -20,18 +20,18 @@ def inventory():
     inv = InventoryModule()
     inv.inventory = InventoryData()
     inv.templar = Templar(None)
-    inv.jails = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage_jails.txt')
-    inv.js_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage_jails.yml')
-    inv.jails_dhcp = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage_jails_dhcp.txt')
-    inv.js_dhcp_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage_jails_dhcp.yml')
-    inv.jails_dhcp_nr = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage_jails_dhcp_not_running.txt')
-    inv.js_dhcp_nr_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage_jails_dhcp_not_running.yml')
-    prpts_101 = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage_properties_test_101.txt')
-    prpts_102 = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage_properties_test_102.txt')
-    prpts_103 = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage_properties_test_103.txt')
+    inv.jails = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_jails.txt')
+    inv.js_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_jails.yml')
+    inv.jails_dhcp = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp.txt')
+    inv.js_dhcp_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp.yml')
+    inv.jails_dhcp_nr = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp_not_running.txt')
+    inv.js_dhcp_nr_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_jails_dhcp_not_running.yml')
+    prpts_101 = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_properties_test_101.txt')
+    prpts_102 = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_properties_test_102.txt')
+    prpts_103 = load_txt_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_properties_test_103.txt')
     inv.prpts = {'test_101': prpts_101, 'test_102': prpts_102, 'test_103': prpts_103}
-    inv.ps_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage_properties.yml')
-    inv.ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage_inventory.yml')
+    inv.ps_ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_properties.yml')
+    inv.ok = load_yml_data('tests/unit/plugins/inventory/fixtures/iocage/iocage_inventory.yml')
     return inv