Merge pull request #866 from bvbharatk/CLOUDSTACK-8751 CLOUDSTACK-8751 minimise downtime of network when network update is in progress.more info in the bug link below. https://issues.apache.org/jira/browse/CLOUDSTACK-8751
* pr/866: Added license headders Added a test to test update router in sequence Do not update network if one of the router's state is unknown CLOUDSTACK-8751 Added tests CLOUDSTACK-8751 Signed-off-by: Rajani Karuturi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2acb0b76 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2acb0b76 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2acb0b76 Branch: refs/heads/4.9-bountycastle-daan Commit: 2acb0b7608a9e2a2e9135c558c8e364b3c8eb623 Parents: 1f0955d 8805f95 Author: Rajani Karuturi <[email protected]> Authored: Mon Sep 12 17:15:23 2016 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Mon Sep 12 17:15:23 2016 +0530 ---------------------------------------------------------------------- api/src/com/cloud/network/Network.java | 2 + api/src/com/cloud/network/NetworkService.java | 2 +- .../network/element/RedundantResource.java | 27 ++ .../com/cloud/network/router/VirtualRouter.java | 4 + .../network/vpn/RemoteAccessVpnService.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../admin/network/UpdateNetworkCmdByAdmin.java | 2 +- .../command/user/network/UpdateNetworkCmd.java | 21 +- .../user/vpn/DeleteRemoteAccessVpnCmd.java | 2 +- .../service/NetworkOrchestrationService.java | 10 + .../orchestration/NetworkOrchestrator.java | 166 ++++++++++- .../schema/src/com/cloud/vm/DomainRouterVO.java | 14 + .../com/cloud/network/IpAddressManagerImpl.java | 2 +- .../com/cloud/network/NetworkServiceImpl.java | 278 +++++++++++-------- .../network/element/VirtualRouterElement.java | 98 ++++++- .../VirtualNetworkApplianceManagerImpl.java | 5 + .../VpcVirtualNetworkApplianceManagerImpl.java | 10 + .../network/vpn/RemoteAccessVpnManagerImpl.java | 6 +- .../src/com/cloud/user/AccountManagerImpl.java | 2 +- .../deployment/RouterDeploymentDefinition.java | 12 +- .../RouterDeploymentDefinitionBuilder.java | 4 + .../element/VirtualRouterElementTest.java | 151 +++++++++- .../com/cloud/vpc/MockNetworkManagerImpl.java | 27 +- .../RouterDeploymentDefinitionTest.java | 2 +- .../RouterDeploymentDefinitionTestBase.java | 3 + setup/db/db/schema-452to460.sql | 2 + setup/db/db/schema-4910to41000.sql | 2 + .../component/maint/test_redundant_router.py | 154 ++++++++++ 28 files changed, 878 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
