cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From frankzh...@apache.org
Subject git commit: updated refs/heads/master to 697b7c9
Date Fri, 26 Jul 2013 18:19:13 GMT
Updated Branches:
  refs/heads/master 4be18aefc -> 697b7c947


make UCS api name better


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

Branch: refs/heads/master
Commit: 697b7c94710d90677639fc1632e0a91a64e856d6
Parents: 4be18ae
Author: frank <frank.zhang@citrix.com>
Authored: Fri Jul 26 11:28:23 2013 -0700
Committer: frank <frank.zhang@citrix.com>
Committed: Fri Jul 26 11:28:47 2013 -0700

----------------------------------------------------------------------
 client/tomcatconf/commands.properties.in                     | 8 ++++----
 .../ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java        | 1 +
 .../apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java | 2 +-
 .../ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java   | 2 +-
 .../ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java | 2 +-
 .../ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java | 2 +-
 utils/src/com/cloud/utils/xmlobject/XmlObject.java           | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697b7c94/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index f6d9182..729dd23 100644
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -609,10 +609,10 @@ listBaremetalPxePingServer=1
 
 #### UCS commands
 addUcsManager=1
-listUcsManager=1
-listUcsProfile=1
-listUcsBlade=1
-associatesUcsProfileToBlade=1
+listUcsManagers=1
+listUcsProfiles=1
+listUcsBlades=1
+associateUcsProfileToBlade=1
 
 #### New Load Balancer commands
 createLoadBalancer=15

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697b7c94/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
index 8595d3a..df874cb 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
@@ -424,6 +424,7 @@ public class UcsManagerImpl implements UcsManager {
         rsp.setId(vo.getUuid());
         rsp.setDn(vo.getDn());
         rsp.setHostId(hostIdToUuid(vo.getHostId()));
+        rsp.setAssociatedProfileDn(vo.getProfileDn());
         rsp.setUcsManagerId(ucsManagerIdToUuid(vo.getUcsManagerId()));
         return rsp;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697b7c94/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
index 5e65ece..b48f057 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
@@ -37,7 +37,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.ucs.manager.UcsManager;
 import com.cloud.user.Account;
-@APICommand(name="associatesUcsProfileToBlade", description="associate a profile to a blade",
responseObject=UcsBladeResponse.class)
+@APICommand(name="associateUcsProfileToBlade", description="associate a profile to a blade",
responseObject=UcsBladeResponse.class)
 public class AssociateUcsProfileToBladeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(AssociateUcsProfileToBladeCmd.class);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697b7c94/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
index e42cf65..e4f052a 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
@@ -38,7 +38,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.ucs.manager.UcsManager;
 import com.cloud.user.Account;
 
-@APICommand(name="listUcsBlade", description="List ucs blades", responseObject=UcsBladeResponse.class)
+@APICommand(name="listUcsBlades", description="List ucs blades", responseObject=UcsBladeResponse.class)
 public class ListUcsBladeCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListUcsBladeCmd.class);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697b7c94/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
index 228fbcb..da13b17 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
@@ -47,7 +47,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.server.ManagementService;
 import com.cloud.ucs.manager.UcsManager;
 import com.cloud.user.Account;
-@APICommand(name="listUcsManager", description="List ucs manager", responseObject=UcsManagerResponse.class)
+@APICommand(name="listUcsManagers", description="List ucs manager", responseObject=UcsManagerResponse.class)
 public class ListUcsManagerCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListUcsManagerCmd.class);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697b7c94/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
index 56f3f5d..816c26c 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
@@ -40,7 +40,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.server.ManagementService;
 import com.cloud.ucs.manager.UcsManager;
 import com.cloud.user.Account;
-@APICommand(name="listUcsProfile", description="List profile in ucs manager", responseObject=UcsProfileResponse.class)
+@APICommand(name="listUcsProfiles", description="List profile in ucs manager", responseObject=UcsProfileResponse.class)
 public class ListUcsProfileCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListUcsProfileCmd.class);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/697b7c94/utils/src/com/cloud/utils/xmlobject/XmlObject.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/xmlobject/XmlObject.java b/utils/src/com/cloud/utils/xmlobject/XmlObject.java
index 4162e4a..789a74d 100755
--- a/utils/src/com/cloud/utils/xmlobject/XmlObject.java
+++ b/utils/src/com/cloud/utils/xmlobject/XmlObject.java
@@ -46,7 +46,7 @@ public class XmlObject {
         }
         Object old = elements.get(key);
         if (old == null) {
-            System.out.println(String.format("no %s, add new", key));
+            //System.out.println(String.format("no %s, add new", key));
             elements.put(key, e);
         } else {
             if (old instanceof List) {


Mime
View raw message