From 8a623d884c9eec98ace30c6bdb01a4ac7eefd3b6 Mon Sep 17 00:00:00 2001
From: Kishan Kavala <kishan@cloud.com>
Date: Wed, 18 Dec 2013 18:22:07 +0530
Subject: [PATCH] CLOUDSTACK-5528 : When VR version is not known set
 requiresUpgrade flag to true

---
 .../src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java   | 3 +++
 server/test/com/cloud/vpc/NetworkACLServiceTest.java           | 1 +
 2 files changed, 4 insertions(+)

diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
index f1930317fb1..f616fc81d70 100644
--- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
@@ -82,6 +82,9 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO,
             String routerVersion = Version.trimRouterVersion(router.getTemplateVersion());
             routerResponse.setVersion(routerVersion);
             routerResponse.setRequiresUpgrade((Version.compare(routerVersion, VirtualNetworkApplianceService._minVRVersion) < 0));
+        } else {
+            routerResponse.setVersion("UNKNOWN");
+            routerResponse.setRequiresUpgrade(true);
         }
 
         if (caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN
diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
index bcc06c6375a..b17491a994f 100644
--- a/server/test/com/cloud/vpc/NetworkACLServiceTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
@@ -177,6 +177,7 @@ public class NetworkACLServiceTest extends TestCase{
     public void testDeleteACLItem() throws Exception {
         Mockito.when(_networkACLItemDao.findById(Mockito.anyLong())).thenReturn(aclItem);
         Mockito.when(_networkAclMgr.revokeNetworkACLItem(Mockito.anyLong())).thenReturn(true);
+        Mockito.when(_entityMgr.findById(Mockito.eq(Vpc.class), Mockito.anyLong())).thenReturn(new VpcVO());
         assertTrue(_aclService.revokeNetworkACLItem(1L));
     }