[GitHub] rhtyd closed pull request #2334: CLOUDSTACK-10152:Skip the destination cidr in ipset when 0.0.0.0/0 pa?

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

rhtyd closed pull request #2334: CLOUDSTACK-10152:Skip the destination cidr in ipset when 0.0.0.0/0 pa?
URL: https://github.com/apache/cloudstack/pull/2334
 
 
   

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/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index 0a469d11e0e..c6ea690472e 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -90,6 +90,7 @@ def create(self):
             self.add_rule()
 
         def add_rule(self):
+            CIDR_ALL = '0.0.0.0/0'
             icmp_type = ''
             rule = self.rule
             icmp_type = "any"
@@ -142,6 +143,8 @@ def add_rule(self):
 
                 logging.debug("egress   rule  ####==> %s", self.rule)
                 for cidr in self.rule['dcidr']:
+                    if cidr == CIDR_ALL:
+                        continue
                     ipsetAddCmd = 'ipset add '+ destIpsetName + ' '+cidr
                     CsHelper.execute(ipsetAddCmd)
                     dflag = True


 

----------------------------------------------------------------
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