Merge pull request #1344 from DaanHoogland/master resolving a conflict due to reformatting
* pr/1344: 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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c9922ea9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c9922ea9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c9922ea9 Branch: refs/heads/master Commit: c9922ea9557dccc1a0212558781337bba81df383 Parents: fa41bc7 addb264 Author: Remi Bergsma <[email protected]> Authored: Mon Jan 18 12:12:35 2016 +0100 Committer: Remi Bergsma <[email protected]> Committed: Mon Jan 18 12:12:35 2016 +0100 ---------------------------------------------------------------------- .../orchestration/NetworkOrchestrator.java | 962 ++++++++++--------- .../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, 646 insertions(+), 541 deletions(-) ----------------------------------------------------------------------
