From 4e7b65ef711bde232dc5657150f3d77de5dc291e Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Mon, 25 Jun 2012 11:31:53 -0700
Subject: [PATCH] VPC: CS-15354 - fixed updateNetworkServiceProvider for
 VpcVirtualRouter

---
 .../cloud/network/element/VirtualRouterElement.java    | 10 ++++++++--
 .../cloud/network/element/VpcVirtualRouterElement.java |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 0feaa984c28..d0b90462316 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -711,7 +711,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
 
     @Override
     public boolean isReady(PhysicalNetworkServiceProvider provider) {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), 
+                getVirtualRouterProvider());
         if (element == null) {
             return false;
         }
@@ -722,7 +723,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) 
             throws ConcurrentOperationException,
             ResourceUnavailableException {
-        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), VirtualRouterProviderType.VirtualRouter);
+        VirtualRouterProviderVO element = _vrProviderDao.findByNspIdAndType(provider.getId(), 
+                getVirtualRouterProvider());
         if (element == null) {
             return true;
         }
@@ -874,4 +876,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     public IpDeployer getIpDeployer(Network network) {
         return this;
     }
+    
+    protected VirtualRouterProviderType getVirtualRouterProvider() {
+        return VirtualRouterProviderType.VirtualRouter;
+    }
 }
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
index 563f5eface1..dcd121865a3 100644
--- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -32,6 +32,7 @@ import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
+import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
 import com.cloud.network.NetworkService;
 import com.cloud.network.PublicIpAddress;
 import com.cloud.network.router.VirtualRouter;
@@ -395,4 +396,9 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc
             return true;
         }
     }
+    
+    @Override
+    protected VirtualRouterProviderType getVirtualRouterProvider() {
+        return VirtualRouterProviderType.VPCVirtualRouter;
+    }
 }