From f9fe9da734318f3e9d7f2f06b5b10666fdd8ecd4 Mon Sep 17 00:00:00 2001
From: Wei Zhou <57355700+weizhouapache@users.noreply.github.com>
Date: Fri, 20 Aug 2021 13:36:26 +0200
Subject: [PATCH 1/2] security group: fix component test
 test_multiple_nic_support.py failures  (#5348)

This PR fixes component test failure with test_multiple_nic_support.py, in advanced zone with security groups.

Co-authored-by: dahn <daan.hoogland@gmail.com>
---
 scripts/vm/network/security_group.py                    | 2 +-
 test/integration/component/test_multiple_nic_support.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index a42ac345e23..6be06edbfcd 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -1453,7 +1453,7 @@ def verify_iptables_rules_for_bridge(brname):
     expected_rules.append("-A %s -m state --state RELATED,ESTABLISHED -j ACCEPT" % (brfw))
     expected_rules.append("-A %s -m physdev --physdev-is-in --physdev-is-bridged -j %s" % (brfw, brfwin))
     expected_rules.append("-A %s -m physdev --physdev-is-out --physdev-is-bridged -j %s" % (brfw, brfwout))
-    phydev = execute("ip link show type bridge | awk '/^%s[ \t]/ {print $4}'" % brname ).strip()
+    phydev = get_bridge_physdev(brname)
     expected_rules.append("-A %s -m physdev --physdev-out %s --physdev-is-bridged -j ACCEPT" % (brfw, phydev))
 
     rules = execute("iptables-save |grep -w %s |grep -v \"^:\"" % brfw).split('\n')
diff --git a/test/integration/component/test_multiple_nic_support.py b/test/integration/component/test_multiple_nic_support.py
index d38693c9cb1..5b1bb7194ff 100644
--- a/test/integration/component/test_multiple_nic_support.py
+++ b/test/integration/component/test_multiple_nic_support.py
@@ -224,7 +224,7 @@ class TestMulipleNicSupport(cloudstackTestCase):
                     cls.virtual_machine1.default_network_id = nic.networkid
                     break
         except Exception as e:
-            cls.fail("Exception while deploying virtual machine: %s" % e)
+            cls.fail(f"Exception while deploying virtual machine: {e}")
 
         try:
             cls.virtual_machine2 = VirtualMachine.create(
@@ -243,7 +243,7 @@ class TestMulipleNicSupport(cloudstackTestCase):
                     cls.virtual_machine2.default_network_id = nic.networkid
                     break
         except Exception as e:
-            cls.fail("Exception while deploying virtual machine: %s" % e)
+            cls.fail(f"Exception while deploying virtual machine: {e}")
 
         cls._cleanup.append(cls.virtual_machine1)
         cls._cleanup.append(cls.virtual_machine2)
@@ -306,7 +306,7 @@ class TestMulipleNicSupport(cloudstackTestCase):
             if len(result) > 0:
                 self.fail("The iptables/ebtables rules for nic %s on vm %s on host %s are not correct" %(nic.ipaddress, vm.instancename, host.name))
 
-    @attr(tags=["adeancedsg"], required_hardware="false")
+    @attr(tags=["advancedsg"], required_hardware="false")
     def test_01_create_vm_with_multiple_nics(self):
         """Create Vm with multiple NIC's
 

From 0390281ad2d1574c5fb8b9164375b6236858dce9 Mon Sep 17 00:00:00 2001
From: Wei Zhou <57355700+weizhouapache@users.noreply.github.com>
Date: Fri, 20 Aug 2021 13:40:04 +0200
Subject: [PATCH 2/2] vr: cleanup files in /var/cache/cloud/processed every day
 (#5331)

* vr: cleanup files in /var/cache/cloud/processed every day

* #5331: add license header
---
 .../cron.daily/clean_cloud_processed_files    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100755 systemvm/debian/etc/cron.daily/clean_cloud_processed_files

diff --git a/systemvm/debian/etc/cron.daily/clean_cloud_processed_files b/systemvm/debian/etc/cron.daily/clean_cloud_processed_files
new file mode 100755
index 00000000000..fbd7c5ba07c
--- /dev/null
+++ b/systemvm/debian/etc/cron.daily/clean_cloud_processed_files
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# clear processed files in /var/cache/cloud/processed
+
+THRESHOLD=80
+DIRECTORY=/var/cache/cloud/processed
+DAYS=180
+MIN_DAYS=5
+
+if [ ! -d $DIRECTORY ];then
+    echo "$DIRECTORY not found"
+    exit 0
+fi
+
+percent=$(df --output=pcent $DIRECTORY | tr -dc '0-9')
+
+while [[ $percent -gt $THRESHOLD ]] && [[ $DAYS -gt $MIN_DAYS ]];do
+    echo "Removing files in $DIRECTORY older than $DAYS days"
+    find $DIRECTORY -type f -a -mtime +$DAYS -delete
+    DAYS=$((DAYS-1))
+    percent=$(df --output=pcent $DIRECTORY | tr -dc '0-9')
+done