You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/28 00:24:56 UTC
[1/2] git commit: updated refs/heads/master to 48cbef6
Repository: cloudstack
Updated Branches:
refs/heads/master fa85151be -> 48cbef6d2
CLOUDSTACK-9757: Fixed issue in traffic from additional public subnet
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/baac7470
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/baac7470
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/baac7470
Branch: refs/heads/master
Commit: baac747089ef48ea6627a6aacf27156222862352
Parents: bb274a1
Author: Jayapal <ja...@accelerite.com>
Authored: Thu Feb 23 11:10:47 2017 +0530
Committer: Jayapal <ja...@accelerite.com>
Committed: Fri Feb 24 14:50:48 2017 +0530
----------------------------------------------------------------------
.../network/router/CommandSetupHelper.java | 27 +++++++++++++++++++-
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 2 +-
2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/baac7470/server/src/com/cloud/network/router/CommandSetupHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java b/server/src/com/cloud/network/router/CommandSetupHelper.java
index 7208b25..2f91502 100644
--- a/server/src/com/cloud/network/router/CommandSetupHelper.java
+++ b/server/src/com/cloud/network/router/CommandSetupHelper.java
@@ -681,19 +681,38 @@ public class CommandSetupHelper {
for (final Map.Entry<String, ArrayList<PublicIpAddress>> vlanAndIp : vlanIpMap.entrySet()) {
final List<PublicIpAddress> ipAddrList = vlanAndIp.getValue();
+ // Source nat ip address should always be sent first
+ Collections.sort(ipAddrList, new Comparator<PublicIpAddress>() {
+ @Override
+ public int compare(final PublicIpAddress o1, final PublicIpAddress o2) {
+ final boolean s1 = o1.isSourceNat();
+ final boolean s2 = o2.isSourceNat();
+ return s1 ^ s2 ? s1 ^ true ? 1 : -1 : 0;
+ }
+ });
+
+
// Get network rate - required for IpAssoc
final Integer networkRate = _networkModel.getNetworkRate(ipAddrList.get(0).getNetworkId(), router.getId());
final Network network = _networkModel.getNetwork(ipAddrList.get(0).getNetworkId());
final IpAddressTO[] ipsToSend = new IpAddressTO[ipAddrList.size()];
int i = 0;
+ boolean firstIP = true;
for (final PublicIpAddress ipAddr : ipAddrList) {
final boolean add = ipAddr.getState() == IpAddress.State.Releasing ? false : true;
+ boolean sourceNat = ipAddr.isSourceNat();
+ /* enable sourceNAT for the first ip of the public interface
+ * For additional public subnet source nat rule needs to be added for vm to reach ips in that subnet
+ */
+ if (firstIP) {
+ sourceNat = true;
+ }
final String macAddress = vlanMacAddress.get(BroadcastDomainType.getValue(BroadcastDomainType.fromString(ipAddr.getVlanTag())));
- final IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, false, ipAddr.isSourceNat(), BroadcastDomainType.fromString(ipAddr.getVlanTag()).toString(), ipAddr.getGateway(),
+ final IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, firstIP, sourceNat, BroadcastDomainType.fromString(ipAddr.getVlanTag()).toString(), ipAddr.getGateway(),
ipAddr.getNetmask(), macAddress, networkRate, ipAddr.isOneToOneNat());
ip.setTrafficType(network.getTrafficType());
@@ -703,6 +722,12 @@ public class CommandSetupHelper {
sourceNatIpAdd = new Pair<IpAddressTO, Long>(ip, ipAddr.getNetworkId());
addSourceNat = add;
}
+
+ //for additional public subnet on delete it is not sure which ip is set to first ip. So on delete we
+ //want to set sourcenat to true for all ips to delete source nat rules.
+ if (!firstIP || add) {
+ firstIP = false;
+ }
}
final IpAssocVpcCommand cmd = new IpAssocVpcCommand(ipsToSend);
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/baac7470/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index a16fd07..fed5849 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -571,7 +571,7 @@ class CsIP:
if self.get_type() in ["guest"] and not cmdline.is_redundant():
pwdsvc = CsPasswdSvc(self.address['public_ip']).start()
- if self.get_type() == "public" and self.config.is_vpc():
+ if self.get_type() == "public" and self.config.is_vpc() and method == "add":
if self.address["source_nat"]:
vpccidr = cmdline.get_vpccidr()
self.fw.append(
[2/2] git commit: updated refs/heads/master to 48cbef6
Posted by ra...@apache.org.
Merge pull request #1922 from Accelerite/vpcApub
CLOUDSTACK-9757: Fixed issue in traffic from additional public subnetAcquire ip from additional public subnet and configure nat on that ip.
After this pick any from that network and access additional public subnet from this vm. Traffic is supposed to go via additional public subnet interface in the VR.
* pr/1922:
CLOUDSTACK-9757: Fixed issue in traffic from additional public subnet
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48cbef6d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48cbef6d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48cbef6d
Branch: refs/heads/master
Commit: 48cbef6d248551a446e1e6a293001037e9cbb9a2
Parents: fa85151 baac747
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Feb 28 05:53:58 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Feb 28 05:53:59 2017 +0530
----------------------------------------------------------------------
.../network/router/CommandSetupHelper.java | 27 +++++++++++++++++++-
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 2 +-
2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48cbef6d/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------