Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: kishan@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 18 Dec 2013 13:00:16 -0000
Message-Id: <6eb89be886504302b5ea9389a0ea234a@git.apache.org>
Subject: [1/2] git commit: updated refs/heads/4.3 to 8a623d8

Updated Branches:
  refs/heads/4.3 efe2549e7 -> 8a623d884
  refs/heads/master 55a6df450 -> cc27a740d


CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a623d88
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a623d88
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a623d88

Branch: refs/heads/4.3
Commit: 8a623d884c9eec98ace30c6bdb01a4ac7eefd3b6
Parents: efe2549
Author: Kishan Kavala <kishan@cloud.com>
Authored: Wed Dec 18 18:22:07 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Wed Dec 18 18:22:07 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a623d88/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
index f193031..f616fc8 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a623d88/server/test/com/cloud/vpc/NetworkACLServiceTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
index bcc06c6..b17491a 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));
     }