review: Using shlex method

canonical · Mar 24, 2021 · e2c5027 · e2c5027
1 parent e1e59da
commit e2c5027
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
@@ -12,7 +12,7 @@
 import io
 import logging
 import os
-import re
+import shlex
 
 from cloudinit import util
 
@@ -73,8 +73,9 @@ def is_applicable(self) -> bool:
                 (ii) an open-iscsi interface file is present in the system
         """
         if self._files:
-            if re.search(r'(^|\s)ip6?=', self._cmdline):
-                return True
+            for item in shlex.split(self._cmdline):
+                if item.startswith('ip=') or item.startswith('ip6='):
+                    return True
             if os.path.exists(_OPEN_ISCSI_INTERFACE_FILE):
                 # iBft can configure networking without ip=
                 return True

diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
@@ -4427,6 +4427,16 @@ def test_cmdline_no_lhand(self):
         )
         self.assertFalse(src.is_applicable())
 
+    def test_cmdline_embedded_ip(self):
+        content = {'net6-eno1.conf': DHCP6_CONTENT_1}
+        files = sorted(populate_dir(self.tmp_dir(), content))
+        src = cmdline.KlibcNetworkConfigSource(
+            _files=files,
+            _cmdline='opt="some things and ip=foo"',
+            _mac_addrs=self.macs,
+        )
+        self.assertFalse(src.is_applicable())
+
     def test_with_both_ip_ip6(self):
         content = {
             '/run/net-eth0.conf': DHCP_CONTENT_1,