This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 1b10c18 Merge branch '4.11' add a77ed56 CLOUDSTACK-9114: Reduce VR downtime during network restart (#2508) new 65511c4 Merge branch '4.11': Reduce VR downtime during network restart (#2508) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: api/src/main/java/com/cloud/network/Network.java | 2 + .../java/com/cloud/network/NetworkProfile.java | 5 + .../java/com/cloud/network/NetworkService.java | 2 +- api/src/main/java/com/cloud/network/vpc/Vpc.java | 4 + .../org/apache/cloudstack/api/ApiConstants.java | 3 +- .../command/user/network/RestartNetworkCmd.java | 16 +- .../api/command/user/vpc/RestartVPCCmd.java | 16 +- .../cloudstack/api/response/NetworkResponse.java | 12 ++ .../service/NetworkOrchestrationService.java | 24 +++ .../engine/orchestration/NetworkOrchestrator.java | 204 ++++++++++++++------- .../java/com/cloud/network/dao/NetworkDaoImpl.java | 3 +- .../main/java/com/cloud/network/dao/NetworkVO.java | 25 ++- .../src/main/java/com/cloud/network/vpc/VpcVO.java | 13 ++ .../main/java/com/cloud/api/ApiResponseHelper.java | 1 + .../api/query/dao/DomainRouterJoinDaoImpl.java | 4 +- .../java/com/cloud/network/NetworkServiceImpl.java | 10 +- .../network/element/VirtualRouterElement.java | 8 +- .../java/com/cloud/network/vpc/VpcManagerImpl.java | 92 ++++++++-- .../deployment/RouterDeploymentDefinition.java | 8 +- .../deployment/VpcRouterDeploymentDefinition.java | 5 + .../java/com/cloud/vpc/MockNetworkManagerImpl.java | 12 +- systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 4 +- systemvm/debian/opt/cloud/bin/setup/common.sh | 6 +- systemvm/debian/opt/cloud/bin/setup/postinit.sh | 6 +- .../opt/cloud/templates/keepalived.conf.templ | 3 - ui/scripts/network.js | 31 +++- 26 files changed, 391 insertions(+), 128 deletions(-) -- To stop receiving notification emails like this one, please contact ro...@apache.org.