[cloudstack] branch 4.13 updated: server: ignore site to site vpn status check on internallbvm (#3864)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.13 by this push:
     new bbe2bf1  server: ignore site to site vpn status check on internallbvm 
(#3864)
bbe2bf1 is described below

commit bbe2bf1a6ef6728132a92bb3b586795f068a403d
Author: Rakesh <rakeshv....@gmail.com>
AuthorDate: Tue Feb 18 09:33:30 2020 +0100

    server: ignore site to site vpn status check on internallbvm (#3864)
    
    When the state of the site to site vpn changes, the check
    is done on all the virtual routers including the internal
    load balancing vm as well. It is not needed to check the
    state for internal load balancing vm
---
 .../com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 
b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 643ccbb..43069cb 100644
--- 
a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -840,6 +840,10 @@ Configurable, StateListener<VirtualMachine.State, 
VirtualMachine.Event, VirtualM
     @DB
     protected void updateSite2SiteVpnConnectionState(final 
List<DomainRouterVO> routers) {
         for (final DomainRouterVO router : routers) {
+            if (router.getRole() == Role.INTERNAL_LB_VM) {
+                continue;
+            }
+
             final List<Site2SiteVpnConnectionVO> conns = 
_s2sVpnMgr.getConnectionsForRouter(router);
             if (conns == null || conns.isEmpty()) {
                 continue;