Do not pass cni and flannel.* devices to Cobbler

uyuni-project · Jul 23, 2024 · 912b115 · 912b115
1 parent aac1c92
commit 912b115
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
@@ -318,7 +318,13 @@ public boolean isBond() {
      * @return true if the nic is a container network
      */
     public boolean isContainerNetwork() {
-        return ("bridge".equals(module) && (getName().startsWith("docker") || getName().startsWith("cni-podman") || getName().startsWith("podman")));
+        return (
+            "bridge".equals(module) && (
+                    getName().startsWith("docker") ||
+                    getName().startsWith("cni-podman") ||
+                    getName().startsWith("podman") ||
+                    getName().startsWith("cni")
+            ) || getName().startsWith("flannel"));
     }
 
     /**

diff --git a/java/code/src/com/redhat/rhn/domain/server/test/NetworkInterfaceTest.java b/java/code/src/com/redhat/rhn/domain/server/test/NetworkInterfaceTest.java
@@ -75,6 +75,15 @@ public void testIsContainerNetwork() throws Exception {
         netint1.setModule("bridge");
         netint1.setName("cni-podman0");
         assertTrue(netint1.isContainerNetwork());
+        netint1.setModule("bridge");
+        netint1.setName("cni0");
+        assertTrue(netint1.isContainerNetwork());
+        netint1.setModule("foobar");
+        netint1.setName("flannel.1");
+        assertTrue(netint1.isContainerNetwork());
+        netint1.setModule("foobar");
+        netint1.setName("eth0");
+        assertFalse(netint1.isContainerNetwork());
     }
 
     /**