diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index 8014085d8b1..ca6237f1713 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -1455,7 +1455,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/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 diff --git a/test/integration/component/test_multiple_nic_support.py b/test/integration/component/test_multiple_nic_support.py index 6c99999e2d8..55e01097fba 100644 --- a/test/integration/component/test_multiple_nic_support.py +++ b/test/integration/component/test_multiple_nic_support.py @@ -225,7 +225,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( @@ -244,7 +244,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) @@ -307,7 +307,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