From d4b1732ff4768686ef7811d1945be7fffcadf615 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Wed, 16 Nov 2011 11:14:59 -0800
Subject: [PATCH] NaaS: Fix redundant virtual router

---
 api/src/com/cloud/network/VirtualRouterProvider.java          | 1 -
 .../network/router/VirtualNetworkApplianceManagerImpl.java    | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/api/src/com/cloud/network/VirtualRouterProvider.java b/api/src/com/cloud/network/VirtualRouterProvider.java
index 1eea3f236e3..b25a898b64c 100644
--- a/api/src/com/cloud/network/VirtualRouterProvider.java
+++ b/api/src/com/cloud/network/VirtualRouterProvider.java
@@ -21,7 +21,6 @@ package com.cloud.network;
 public interface VirtualRouterProvider {
     public enum VirtualRouterProviderType {
         VirtualRouter,
-        RedundantVirtualRouter,
         ElasticLoadBalancerVm
     }
     public VirtualRouterProviderType getType();
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 6231038f9c8..5865973c95e 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1259,10 +1259,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                     offering_id = _offering.getId();
                 }
                 VirtualRouterProviderType type = VirtualRouterProviderType.VirtualRouter;
-                if (isRedundant) {
-                    type = VirtualRouterProviderType.RedundantVirtualRouter;
-                }
-                
                 Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network);
                 PhysicalNetworkServiceProvider provider = _physicalProviderDao.findByServiceProvider(physicalNetworkId, type.toString());
                 if (provider == null) {