podman-pod: Fix idempotency for pods in 4.4.x versions (#593)

Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>

plugins/module_utils/podman/podman_pod_lib.py

@@ -443,6 +443,15 @@ class PodmanPodDiff:
             net_mode_before = net_mode_before.replace('bridge', 'default')
             net_mode_before = net_mode_before.replace('slirp4netns', 'default')
             return self._diff_update_and_compare('network', net_mode_before, net_mode_after)
+        # For 4.4.0+ podman versions with no network specified
+        if not net_mode_after and net_mode_before == 'slirp4netns' and not after:
+            net_mode_after = 'slirp4netns'
+            if before == ['slirp4netns']:
+                after = ['slirp4netns']
+        if not net_mode_after and net_mode_before == 'bridge' and not after:
+            net_mode_after = 'bridge'
+            if before == ['bridge']:
+                after = ['bridge']
         before, after = sorted(list(set(before))), sorted(list(set(after)))
         return self._diff_update_and_compare('network', before, after)
 

tests/integration/targets/podman_pod/tasks/main.yml

@@ -32,6 +32,15 @@
         - "pod1"
         - "pod2"
 
+    - name: Delete all container leftovers from tests
+      containers.podman.podman_container:
+        executable: "{{ test_executable | default('podman') }}"
+        name: "{{ item }}"
+        state: absent
+      loop:
+        - "container1"
+        - "container2"
+
     - name: Create pod
       containers.podman.podman_pod:
         executable: "{{ test_executable | default('podman') }}"
@@ -860,7 +869,7 @@
 - name: Test idempotency for root pods
   include_tasks: root-pod.yml
   vars:
-    ansible_python_interpreter: "/usr/bin/python"
+    ansible_python_interpreter: "/usr/bin/python3"
   args:
     apply:
       become: true
@@ -868,7 +877,7 @@
 - name: Test idempotency for root pods and networks
   include_tasks: net-pod.yml
   vars:
-    ansible_python_interpreter: "/usr/bin/python"
+    ansible_python_interpreter: "/usr/bin/python3"
   args:
     apply:
       become: true