[GitHub] rhtyd closed pull request #2590: network: Fix security groups for CentOS

[GitBox <gi...@apache.org>]

rhtyd closed pull request #2590: network: Fix security groups for CentOS
URL: https://github.com/apache/cloudstack/pull/2590
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index 6a11057b237..19aa7359081 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -1154,8 +1154,7 @@ def addFWFramework(brname):
         execute("sysctl -w net.bridge.bridge-nf-call-iptables=1")
         execute("sysctl -w net.bridge.bridge-nf-call-ip6tables=1")
     except:
-        logging.debug("failed to turn on bridge netfilter")
-        return False
+        logging.warn("failed to turn on bridge netfilter")
 
     brfw = getBrfw(brname)
     try:
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index dfd5916892f..f84afdb4529 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -521,9 +521,9 @@ def test_04_restart_network_wo_cleanup(self):
         )
         if str(result[3]) == "min,":
             self.assertEqual(
-                (int(result[2]) < 3),
+                (int(result[2]) < 20),
                 True,
-                "Check uptime is less than 3 mins or not"
+                "Check uptime is less than 20 mins or not"
             )
         else:
             self.assertEqual(


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services