From e5e226e549e0224a3f6ddf4cc570e983d1cb9292 Mon Sep 17 00:00:00 2001
From: Kshitij Kansal <kansal.k@gmail.com>
Date: Tue, 15 Sep 2015 14:42:29 +0530
Subject: [PATCH] Fixed: Error given when creating VPN user in one network if
 VR for another network is stopped

---
 .../cloudstack/network/topology/BasicNetworkTopology.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
index 2b8873729d5..0869b2289ca 100644
--- a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
+++ b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
@@ -278,7 +278,11 @@ public class BasicNetworkTopology implements NetworkTopology {
         boolean agentResults = true;
 
         for (final DomainRouterVO router : routers) {
-            if (router.getState() != State.Running) {
+            if(router.getState() == State.Stopped || router.getState() == State.Stopping){
+                s_logger.info("The router " + router.getInstanceName()+ " is in the " + router.getState() + " state. So not applying the VPN rules. Will be applied once the router gets restarted.");
+                continue;
+            }
+            else if (router.getState() != State.Running) {
                 s_logger.warn("Failed to add/remove VPN users: router not in running state");
                 throw new ResourceUnavailableException("Unable to assign ip addresses, domR is not in right state " + router.getState(), DataCenter.class,
                         network.getDataCenterId());