apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

vr: add missing rule for port forwarding rule in vpc (#3857)

Browse Source
This commit is contained in:
Wei Zhou 2020-02-06 20:25:56 +01:00 committed by GitHub
parent a9a1737dd9
commit d88c614a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
systemvm/debian/opt/cloud/bin/configure.py
View File

@ -793,6 +793,12 @@ class CsForwardingRules(CsDataBag):
return None return None
def getGuestIpByIp(self, ipa):
for interface in self.config.address().get_interfaces():
if interface.ip_in_subnet(ipa):
return interface.get_ip()
return None
def getDeviceByIp(self, ipa): def getDeviceByIp(self, ipa):
for interface in self.config.address().get_interfaces(): for interface in self.config.address().get_interfaces():
if interface.ip_in_subnet(ipa): if interface.ip_in_subnet(ipa):
@ -930,8 +936,20 @@ class CsForwardingRules(CsDataBag):
if not rule["internal_ports"] == "any": if not rule["internal_ports"] == "any":
fw_output_rule += ":" + self.portsToString(rule["internal_ports"], "-") fw_output_rule += ":" + self.portsToString(rule["internal_ports"], "-")
fw_postrout_rule2 = "-j SNAT --to-source %s -A POSTROUTING -s %s -d %s/32 -o %s -p %s -m %s --dport %s" % \
(
self.getGuestIpByIp(rule['internal_ip']),
self.getNetworkByIp(rule['internal_ip']),
rule['internal_ip'],
self.getDeviceByIp(rule['internal_ip']),
rule['protocol'],
rule['protocol'],
self.portsToString(rule['internal_ports'], ':')
)
self.fw.append(["nat", "", fw_prerout_rule]) self.fw.append(["nat", "", fw_prerout_rule])
self.fw.append(["nat", "", fw_postrout_rule]) self.fw.append(["nat", "", fw_postrout_rule])
self.fw.append(["nat", "", fw_postrout_rule2])
self.fw.append(["nat", "", fw_output_rule]) self.fw.append(["nat", "", fw_output_rule])
def processStaticNatRule(self, rule): def processStaticNatRule(self, rule):