From 39c6848786a332d7c5e347825edb0919fc812fbb Mon Sep 17 00:00:00 2001 From: davidjumani Date: Mon, 23 Aug 2021 11:56:01 +0530 Subject: [PATCH 1/2] Fix security_groups for c8/suse --- scripts/vm/network/security_group.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index 6be06edbfcd4..ebd0039d9fa3 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -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) From a0d8a4f0beea8b15e5457a0fd0bf2dd678b87b6c Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 23 Aug 2021 09:42:24 +0200 Subject: [PATCH 2/2] security_group.py: revert a minor change in #5348 --- test/integration/component/test_multiple_nic_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/component/test_multiple_nic_support.py b/test/integration/component/test_multiple_nic_support.py index 5b1bb7194ffd..333dae58c7d0 100644 --- a/test/integration/component/test_multiple_nic_support.py +++ b/test/integration/component/test_multiple_nic_support.py @@ -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( @@ -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)