etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make UCS api name better

This commit is contained in:
frank 2013-07-26 11:28:23 -07:00
parent 4be18aefc4
commit 697b7c9471
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/tomcatconf/commands.properties.in
View File

@ -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

1
plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
View File

@ -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;
}

2
plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
View File

@ -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);

2
plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
View File

@ -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);

2
plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
View File

@ -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);

2
plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
View File

@ -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);

2
utils/src/com/cloud/utils/xmlobject/XmlObject.java
View File

@ -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) {