You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/07 21:19:02 UTC
[7/7] git commit: updated refs/heads/4.6 to 6d3fffa
Merge pull request #1184 from ekholabs/fix/4.6-rvpc-pvtgw-CLOUDSTACK-9106
CLOUDSTACK-9106 - As a Developer I want the Redundant VPC private gateway feature fixedThis PR contains the same fixes from PR #1179, which was created against the master branch.
In addition, the points mentioned by @DaanHoogland were handled in this new PR:
* Made the code more consistent
- result = result && methodCall(), instead of throwing exceptions in some places or not checking 2 consecutive returns - in case of rVPC.
* Added an unit test to cover changes in the VpcRouterElementImpl.applyVpnUsers() method. The method returns an array of String, so I had to make sure it would contain the users from 2 consecutive calls. There are 2 tests to cover negative scenarios.
* pr/1184:
CLOUDSTACK-9106 - Makes Enum name compliant with Java code conventions.
CLOUDSTACK-9106 - Adds a test to cover the changes in the applyVpnUsers() method
CLOUDSTACK-9106 - Makes the router commands call more consistent.
CLOUDSTACK-9106 - Enables private gateway tests on Redundant VPCs
CLOUDSTACK-9106 - Refactor the createPrivateNicProfileForGateway() method
CLOUDSTACK-9106 - Reduces the amount of iterations through the routers of a VPC
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d3fffa2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d3fffa2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d3fffa2
Branch: refs/heads/4.6
Commit: 6d3fffa229758ad9823abd9181bf5dbc5e691b36
Parents: e9de865 14db2d3
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Dec 7 21:18:01 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Dec 7 21:18:01 2015 +0100
----------------------------------------------------------------------
.../com/cloud/network/element/OvsElement.java | 126 +++++++------
.../network/element/VirtualRouterElement.java | 93 +++++----
.../element/VpcVirtualRouterElement.java | 79 ++++----
.../cloud/network/router/NicProfileHelper.java | 3 +-
.../network/router/NicProfileHelperImpl.java | 18 +-
.../network/router/VpcNetworkHelperImpl.java | 2 +-
.../network/rules/PrivateGatewayRules.java | 28 +--
server/src/com/cloud/server/StatsCollector.java | 10 +-
.../topology/AdvancedNetworkTopology.java | 22 +--
.../network/topology/BasicNetworkTopology.java | 110 ++++++-----
.../network/topology/NetworkTopology.java | 22 +--
.../topology/NetworkTopologyContext.java | 16 ++
.../element/VpcVirtualRouterElementTest.java | 188 +++++++++++++++++++
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 9 +-
test/integration/smoke/test_privategw_acl.py | 4 -
15 files changed, 476 insertions(+), 254 deletions(-)
----------------------------------------------------------------------