Skip to content

Fix security_groups for c8/suse #5354

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
yadvr merged 2 commits into from
Aug 24, 2021
Merged

Fix security_groups for c8/suse #5354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39c6848
Fix security_groups for c8/suse
davidjumani Aug 23, 2021
a0d8a4f
security_group.py: revert a minor change in #5348
weizhouapache Aug 23, 2021
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
4 changes: 2 additions & 2 deletions scripts/vm/network/security_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,13 +1369,13 @@ def verify_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec
vm_id = vm_name.split("-")[-2]

if brname is None:
brname = execute("virsh domiflist %s |grep -w '%s' |tr -s ' '|cut -d ' ' -f3" % (vm_name, vm_mac)).strip()
brname = execute("virsh domiflist %s |grep -w '%s' | awk '{print $3}'" % (vm_name, vm_mac)).strip()
if not brname:
print("Cannot find bridge")
sys.exit(1)

if vif is None:
vif = execute("virsh domiflist %s |grep -w '%s' |tr -s ' '|cut -d ' ' -f1" % (vm_name, vm_mac)).strip()
vif = execute("virsh domiflist %s |grep -w '%s' | awk '{print $1}'" % (vm_name, vm_mac)).strip()
if not vif:
print("Cannot find vif")
sys.exit(1)
Expand Down
4 changes: 2 additions & 2 deletions test/integration/component/test_multiple_nic_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def setUpClass(cls):
cls.virtual_machine1.default_network_id = nic.networkid
break
except Exception as e:
cls.fail(f"Exception while deploying virtual machine: {e}")
cls.fail("Exception while deploying virtual machine: %s" % {e})

try:
cls.virtual_machine2 = VirtualMachine.create(
Expand All @@ -243,7 +243,7 @@ def setUpClass(cls):
cls.virtual_machine2.default_network_id = nic.networkid
break
except Exception as e:
cls.fail(f"Exception while deploying virtual machine: {e}")
cls.fail("Exception while deploying virtual machine: %s" % {e})

cls._cleanup.append(cls.virtual_machine1)
cls._cleanup.append(cls.virtual_machine2)
Expand Down