Merge pull request #1577 from nlivens/CLOUDSTACK-9321 CLOUDSTACK-9321 : Multiple Internal LB rules (more than one Internal LB rule with same source IP address) are not getting resolved in the corresponding InternalLbVm instance's haproxy.cfg fileMultiple Internal LB rules (more than one Internal LB rule with same source IP address) are not getting resolved in the corresponding InternalLbVm instance's haproxy.cfg file. Moreover, each time a new Internal LB rule is added to the corresponding InternalLbVm instance, it replaces the existing one. Thus, traffic corresponding to these un-resolved (old) Internal LB rules are getting dropped by the InternalLbVm instance.
PR contents: 1) Fix for this bug. 2) Marvin test coverage for Internal LB feature on master with native ACS setup (component directory) including validations for this bug fix. 3) Enhancements on our exiting Internal LB Marvin test code (nuagevsp plugins directory) to validate this bug fix. 4) PEP8 & PyFlakes compliance with the added Marvin test code. * pr/1577: CLOUDSTACK-9321 : Multiple Internal LB rules (more than one Internal LB rule with same source IP address) are not getting resolved in the corresponding InternalLbVm instance's haproxy.cfg file Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/185be24e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/185be24e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/185be24e Branch: refs/heads/master Commit: 185be24ed8ddcda5250ca17f230ca9c640ba4d11 Parents: 62c8496 62e8581 Author: Rohit Yadav <[email protected]> Authored: Fri Nov 25 13:31:24 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Fri Nov 25 13:31:45 2016 +0530 ---------------------------------------------------------------------- .../element/LoadBalancingServiceProvider.java | 2 + .../element/ElasticLoadBalancerElement.java | 5 + .../element/F5ExternalLoadBalancerElement.java | 5 + .../element/InternalLoadBalancerElement.java | 5 + .../cloud/network/element/NetscalerElement.java | 5 + .../com/cloud/network/element/OvsElement.java | 5 + .../network/element/VirtualRouterElement.java | 5 + .../lb/LoadBalancingRulesManagerImpl.java | 18 +- .../vpc/dao/MockVpcVirtualRouterElement.java | 4 + .../test_vpc_network_internal_lbrules.py | 1205 ++++++++++++++++++ .../nuagevsp/test_nuage_vpc_internal_lb.py | 123 +- tools/marvin/marvin/config/test_data.py | 16 + 12 files changed, 1362 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/185be24e/tools/marvin/marvin/config/test_data.py ----------------------------------------------------------------------
