Adding connecting elsewhere

Author: davidjumani

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

@@ -817,7 +817,8 @@ protected void updateSite2SiteVpnConnectionState(final List<DomainRouterVO> rout
             }
             final List<String> ipList = new ArrayList<String>();
             for (final Site2SiteVpnConnectionVO conn : conns) {
-                if (conn.getState() != Site2SiteVpnConnection.State.Connected && conn.getState() != Site2SiteVpnConnection.State.Disconnected  && conn.getState() != Site2SiteVpnConnection.State.Connecting) {
+                if (conn.getState() != Site2SiteVpnConnection.State.Connected && conn.getState() != Site2SiteVpnConnection.State.Disconnected
+                    && conn.getState() != Site2SiteVpnConnection.State.Connecting) {
                     continue;
                 }
                 final Site2SiteCustomerGateway gw = _s2sCustomerGatewayDao.findById(conn.getCustomerGatewayId());

server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java

@@ -530,7 +530,7 @@ private void setupVpnConnection(Account caller, Long vpnCustomerGwIp) {
                     continue;
                 }
                 try {
-                    if (conn.getState() == State.Connected || conn.getState() == State.Error) {
+                    if (conn.getState() == State.Connected || conn.getState() == State.Connecting || conn.getState() == State.Error) {
                         stopVpnConnection(conn.getId());
                     }
                     startVpnConnection(conn.getId());
@@ -608,7 +608,8 @@ public Site2SiteVpnConnection resetVpnConnection(ResetVpnConnectionCmd cmd) thro
         if (conn.getState() == State.Pending) {
             conn.setState(State.Disconnected);
         }
-        if (conn.getState() == State.Connected || conn.getState() == State.Error || conn.getState() == State.Disconnected) {
+        if (conn.getState() == State.Connected || conn.getState() == State.Error
+            || conn.getState() == State.Disconnected || conn.getState() == State.Connecting) {
             stopVpnConnection(id);
         }
         startVpnConnection(id);
@@ -795,7 +796,7 @@ public void markDisconnectVpnConnByVpc(long vpcId) {
                 throw new CloudRuntimeException("Unable to acquire lock on " + conn);
             }
             try {
-                if (conn.getState() == Site2SiteVpnConnection.State.Connected) {
+                if (conn.getState() == Site2SiteVpnConnection.State.Connected || conn.getState() == Site2SiteVpnConnection.State.Connecting) {
                     conn.setState(Site2SiteVpnConnection.State.Disconnected);
                     _vpnConnectionDao.persist(conn);
                 }