Skip to content

cloudutils: fix warning, error during kvm agent installation #11318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weizhouapache merged 4 commits into from
Oct 15, 2025
Merged

cloudutils: fix warning, error during kvm agent installation #11318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b809e89
cloudutils: fix warning, error during kvm agent installation
shwstppr Jul 29, 2025
034160a
fix
shwstppr Oct 13, 2025
1cd990e
Merge remote-tracking branch 'apache/4.20' into fix-kvm-agent-install…
shwstppr Oct 13, 2025
da0dc45
Update utilities.py
shwstppr Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions python/lib/cloudutils/configFileOps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ def save(self):
for entry in self.entries:
if entry.op == "add":
if entry.separator == "=":
matchString = "^\ *" + entry.name + ".*"
matchString = r"^\ *" + entry.name + ".*"
elif entry.separator == " ":
matchString = "^\ *" + entry.name + "\ *" + entry.value
matchString = r"^\ *" + entry.name + r"\ *" + entry.value
else:
if entry.separator == "=":
matchString = "^\ *" + entry.name + "\ *=\ *" + entry.value
matchString = r"^\ *" + entry.name + r"\ *=\ *" + entry.value
else:
matchString = "^\ *" + entry.name + "\ *" + entry.value
matchString = r"^\ *" + entry.name + r"\ *" + entry.value
Comment on lines +71 to +78
Copy link

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These regexes should use \s* (or \s+) for whitespace and escape dynamic components to prevent unintended regex metacharacter interpretation. Example: name = re.escape(entry.name); value = re.escape(entry.value); then build patterns with r'^\s*' + name + r'\s*=\s*' + value (or r'^\s*' + name + r'\s+' + value). Also, r'\ *' is unusual; prefer clear whitespace classes.

Copilot uses AI. Check for mistakes.

match = re.match(matchString, line)
if match is not None:
Expand Down
13 changes: 8 additions & 5 deletions python/lib/cloudutils/networkConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ def getDefaultNetwork():
if not cmd.isSuccess():
logging.debug("Failed to get default route")
raise CloudRuntimeException("Failed to get default route")

result = cmd.getStdout().split(" ")
output = cmd.getStdout().strip()
result = output.split(" ")
if len(result) < 2:
logging.debug("Output for the default route incomplete: %s. It should have been '<GATEWAY> <DEVICE>'" % output)
raise CloudRuntimeException("Output for the default route incomplete")
Copy link

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The raised exception lacks context for troubleshooting. Consider including the actual output and the expected format in the exception message, e.g., raise CloudRuntimeException("Output for the default route incomplete: '%s' (expected ' ')" % output).

Suggested change
raise CloudRuntimeException("Output for the default route incomplete")
raise CloudRuntimeException("Output for the default route incomplete: '%s' (expected '<GATEWAY> <DEVICE>')" % output)

Copilot uses AI. Check for mistakes.
gateway = result[0]
dev = result[1]

Comment on lines +48 to 55
Copy link

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Splitting by a literal space can yield empty tokens when the output contains multiple spaces or tabs (common in shell output), causing dev to become an empty string despite len(result) >= 2. Use whitespace splitting to normalize tokens, e.g., parts = output.split(), then gateway = parts[0], dev = parts[1], or use a regex like m = re.match(r'(\S+)\s+(\S+)', output).

Copilot uses AI. Check for mistakes.
Expand Down Expand Up @@ -150,10 +153,10 @@ def getDevInfo(dev):
if line.find("HWaddr") != -1:
macAddr = line.split("HWaddr ")[1].strip(" ")
elif line.find("inet ") != -1:
m = re.search("addr:(.*)\ *Bcast:(.*)\ *Mask:(.*)", line)
m = re.search(r"addr:([^\s]+)\s*Bcast:([^\s]+)\s*Mask:([^\s]+)", line)
Copy link
Member

@weizhouapache weizhouapache Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does not work on either ubuntu or rocky/ol

the line looks like

        inet 10.0.34.xxx  netmask 255.255.240.0  broadcast 10.0.47.255

we can fix it later

if m is not None:
ipAddr = m.group(1).rstrip(" ")
netmask = m.group(3).rstrip(" ")
ipAddr = m.group(1).strip()
netmask = m.group(3).strip()

if networkConfig.isBridgePort(dev):
type = "brport"
Expand Down
2 changes: 1 addition & 1 deletion python/lib/cloudutils/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def getStdout(self):
return self.stdout.decode('utf-8').strip('\n')

def getLines(self):
return self.stdout.decode('utf-8').strip('\n')
return self.stdout.decode('utf-8').strip('\n').split('\n')
Copy link

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use splitlines() to robustly handle different newline conventions and avoid edge cases with trailing newlines: return self.stdout.decode('utf-8').splitlines().

Suggested change
return self.stdout.decode('utf-8').strip('\n').split('\n')
return self.stdout.decode('utf-8').splitlines()

Copilot uses AI. Check for mistakes.

def getStderr(self):
return self.stderr.decode('utf-8').strip('\n')
Expand Down
Loading