You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by fr...@apache.org on 2013/07/26 20:19:57 UTC
git commit: updated refs/heads/4.2 to c544f34
Updated Branches:
refs/heads/4.2 782333e14 -> c544f34f7
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/c544f34f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c544f34f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c544f34f
Branch: refs/heads/4.2
Commit: c544f34f70c961700cce81eaf3919fb89c34f0df
Parents: 782333e
Author: frank <fr...@citrix.com>
Authored: Fri Jul 26 11:28:23 2013 -0700
Committer: frank <fr...@citrix.com>
Committed: Fri Jul 26 11:29:37 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/c544f34f/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 5451ed8..ca5841b 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/c544f34f/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/c544f34f/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/c544f34f/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/c544f34f/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/c544f34f/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/c544f34f/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) {