cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [2/2] git commit: updated refs/heads/cisco-vnmc-api-integration to 735c4c8
Date Mon, 15 Apr 2013 09:52:18 GMT
Fixed unit tests based on recent changes in the Vnmc resource code


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

Branch: refs/heads/cisco-vnmc-api-integration
Commit: 735c4c895515a7d3acd59c97d98de95cc5935353
Parents: f166f2d
Author: Koushik Das <koushik.das@citrix.com>
Authored: Mon Apr 15 15:20:37 2013 +0530
Committer: Koushik Das <koushik.das@citrix.com>
Committed: Mon Apr 15 15:20:37 2013 +0530

----------------------------------------------------------------------
 .../api/commands/DeleteCiscoVnmcResourceCmd.java   |    4 ++--
 .../network/resource/CiscoVnmcResourceTest.java    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/735c4c89/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
index 9f84057..d2a3720 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
@@ -48,14 +48,14 @@ public class DeleteCiscoVnmcResourceCmd extends BaseCmd {
     /////////////////////////////////////////////////////
 
     @Parameter(name=ApiConstants.RESOURCE_ID, type=CommandType.UUID, required=true, entityType=CiscoVnmcResourceResponse.class,
description="Cisco Vnmc resource ID")
-    private Long CiscoVnmcResourceId;
+    private Long ciscoVnmcResourceId;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
 
     public Long getCiscoVnmcResourceId() {
-        return CiscoVnmcResourceId;
+        return ciscoVnmcResourceId;
     }
 
     /////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/735c4c89/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java
b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java
index d232b01..e814fdc 100755
--- a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java
+++ b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java
@@ -213,7 +213,7 @@ public class CiscoVnmcResourceTest {
                 anyString(), anyString(), anyString())).thenReturn(true);
         when(_connection.createTenantVDCAclRuleForDNat(anyString(),
                 anyString(), anyString(), anyString())).thenReturn(true);
-        when(_connection.associateNatPolicySet(anyString())).thenReturn(true);
+        when(_connection.associateAclPolicySet(anyString())).thenReturn(true);
 
         Answer answer = _resource.executeRequest(cmd);
         System.out.println(answer.getDetails());
@@ -253,7 +253,7 @@ public class CiscoVnmcResourceTest {
         when(_connection.createTenantVDCAclRuleForPF(anyString(),
                 anyString(), anyString(), anyString(),
                 anyString(), anyString(), anyString())).thenReturn(true);
-        when(_connection.associateNatPolicySet(anyString())).thenReturn(true);
+        when(_connection.associateAclPolicySet(anyString())).thenReturn(true);
 
         Answer answer = _resource.executeRequest(cmd);
         System.out.println(answer.getDetails());


Mime
View raw message