You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/12/23 12:57:49 UTC
[1/3] git commit: updated refs/heads/master to cca60cd
Updated Branches:
refs/heads/master 34894f5a9 -> cca60cd86
CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/55d84bdd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/55d84bdd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/55d84bdd
Branch: refs/heads/master
Commit: 55d84bdd5fd7f1452480bb1fd876ebfda8ce0cd9
Parents: 34894f5
Author: Kishan Kavala <ki...@cloud.com>
Authored: Mon Dec 23 16:38:56 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Dec 23 17:15:03 2013 +0530
----------------------------------------------------------------------
.../network/router/VirtualNetworkApplianceManagerImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55d84bdd/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index d3c3312..3f3e9bd 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4138,7 +4138,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
//Checks if the router is at the required version
// Compares MS version and router version
- private boolean checkRouterVersion(VirtualRouter router) {
+ private boolean checkRouterVersion(VirtualRouter router){
+ if(router.getTemplateVersion() == null){
+ return false;
+ }
String trimmedVersion = Version.trimRouterVersion(router.getTemplateVersion());
return (Version.compare(trimmedVersion, MinVRVersion) >= 0);
}
[3/3] git commit: updated refs/heads/master to cca60cd
Posted by ki...@apache.org.
fix network ACL unit test
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cca60cd8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cca60cd8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cca60cd8
Branch: refs/heads/master
Commit: cca60cd86dc06bb292e9e90ae1661d1f2c71089f
Parents: 0335009
Author: Kishan Kavala <ki...@cloud.com>
Authored: Mon Dec 23 17:27:16 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Dec 23 17:27:16 2013 +0530
----------------------------------------------------------------------
server/test/com/cloud/vpc/NetworkACLServiceTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cca60cd8/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 1dd1497..786789f 100644
--- a/server/test/com/cloud/vpc/NetworkACLServiceTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLServiceTest.java
@@ -188,6 +188,7 @@ public class NetworkACLServiceTest extends TestCase {
@Test
public void testDeleteACLItem() throws Exception {
Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem);
+ Mockito.when(_networkAclMgr.getNetworkACL(Matchers.anyLong())).thenReturn(acl);
Mockito.when(_networkAclMgr.revokeNetworkACLItem(Matchers.anyLong())).thenReturn(true);
Mockito.when(_entityMgr.findById(Mockito.eq(Vpc.class), Mockito.anyLong())).thenReturn(new VpcVO());
assertTrue(_aclService.revokeNetworkACLItem(1L));
[2/3] git commit: updated refs/heads/master to cca60cd
Posted by ki...@apache.org.
CLOUDSTACK-5300: Catch vpn add error failure, removed failed user and return failure status
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0335009a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0335009a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0335009a
Branch: refs/heads/master
Commit: 0335009a1e8370babd76a4c3b998a1dc7975f1f7
Parents: 55d84bd
Author: Kishan Kavala <ki...@cloud.com>
Authored: Mon Dec 23 17:07:04 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Dec 23 17:15:21 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0335009a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 9fe3ad6..ef4cccd 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -529,7 +529,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
}
}
}
- } catch (ResourceUnavailableException e) {
+ } catch (Exception e) {
s_logger.warn("Unable to apply vpn users ", e);
success = false;