Merge pull request #1277 from ekholabs/fix/4.7-rvpc-net-gc-CLOUDSTACK-9154 [4.7] Critical VPCVR issues fixed: CLOUDSTACK-9154; CLOUDSTACK-9187; and CLOUDSTACK-9188This PR applies the same fixes as in the PR #1259, but against branch 4.7.
Please refer to PR #1259 for the tests results and all the comments already made there. Issues fixed are: * CLOUDSTACK-9154: rVPC doesn't recover from cleaning up of network garbage collector * CLOUDSTACK-9187: rVPC routers in Master/Master due to concurrency problem when writing the keepalivd.conf * CLOUDSTACK-9188: NetworkGarbageCollector is not using gc.interval and gc.wait from settings Those changes have been covered by 2 new tests added to ```smoke/test_vpc_redundant.py```: * test_04_rvpc_network_garbage_collector_nics * test_05_rvpc_multi_tiers The test ```test_04_rvpc_network_garbage_collector_nics``` depends on the global settings for the network.gc.interval and gc.wait. If one wants the test to run quicker, please change the settings (default is 600 seconds for each) and restart the Management Server before running the tests. I would suggest to set it to 60 seconds. In addition, the NetworkGarbageCollector was redefining the settings above mentioned and not reading their values through ConfigDao. Due to that, the settings were not being applied properly and the test was waiting to long to check the VPC routers. * pr/1277: CLOUDSTACK-9154 - Sets the pub interface down when all guest nets are gone CLOUDSTACK-9187 - Makes code ready for more something like ethXXXX, if we ever get that far CLOUDSTACK-9188 - Reads network GC interval and wait from configDao CLOUDSTACK-9187 - Fixes interface allocation to VRRP instances CLOUDSTACK-9187 - Adds test to cover multiple nics and nic removal CLOUDSTACK-9154 - Adds test to cover nics state after GC CLOUDSTACK-9154 - Returns the guest iterface that is marked as added Signed-off-by: Remi Bergsma <git...@remi.nl> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff89587f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff89587f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff89587f Branch: refs/heads/4.7 Commit: ff89587fd119b1cad543d8e96f0c428e41c35840 Parents: 7d4b3d4 5ef3144 Author: Remi Bergsma <git...@remi.nl> Authored: Sun Jan 17 19:12:42 2016 +0100 Committer: Remi Bergsma <git...@remi.nl> Committed: Sun Jan 17 19:12:43 2016 +0100 ---------------------------------------------------------------------- .../orchestration/NetworkOrchestrator.java | 944 ++++++++++--------- .../debian/config/opt/cloud/bin/cs/CsAddress.py | 21 +- .../config/opt/cloud/bin/cs/CsRedundant.py | 70 +- test/integration/smoke/test_vpc_redundant.py | 134 ++- 4 files changed, 637 insertions(+), 532 deletions(-) ----------------------------------------------------------------------
