From 74de210359396b1ac880aa0ffa3a38df6574e07d Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Fri, 8 Feb 2013 15:06:11 +0530 Subject: [PATCH] Added name attribute for the VNMC lifecycle commands --- .../api/commands/AddCiscoVnmcResourceCmd.java | 15 ++++++--------- .../api/commands/DeleteCiscoVnmcResourceCmd.java | 4 ++-- .../api/commands/ListCiscoVnmcResourcesCmd.java | 7 +++---- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java index b20eed9676c..381bfa3c3b4 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java @@ -26,7 +26,6 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; - import com.cloud.api.response.CiscoVnmcResourceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -38,12 +37,12 @@ import com.cloud.network.element.CiscoVnmcElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(responseObject=CiscoVnmcResourceResponse.class, description="Adds a Cisco Vnmc Controller") +@APICommand(name="addCiscoVnmcResource", responseObject=CiscoVnmcResourceResponse.class, description="Adds a Cisco Vnmc Controller") public class AddCiscoVnmcResourceCmd extends BaseCmd { private static final Logger s_logger = Logger.getLogger(AddCiscoVnmcResourceCmd.class.getName()); private static final String s_name = "addCiscoVnmcResource"; @PlugService CiscoVnmcElementService _ciscoVnmcElementService; - + ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @@ -51,16 +50,15 @@ public class AddCiscoVnmcResourceCmd extends BaseCmd { @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, required=true, description="the Physical Network ID") private Long physicalNetworkId; - @Parameter(name=ApiConstants.HOST_NAME, type=CommandType.STRING, required = true, description="Hostname of ip address of the Cisco VNMC Controller.") + @Parameter(name=ApiConstants.HOST_NAME, type=CommandType.STRING, required = true, description="Hostname or ip address of the Cisco VNMC Controller.") private String host; @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, required = true, description="Credentials to access the Cisco VNMC Controller API") private String username; - + @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, required = true, description="Credentials to access the Cisco VNMC Controller API") private String password; - - + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -80,7 +78,6 @@ public class AddCiscoVnmcResourceCmd extends BaseCmd { public String getPassword() { return password; } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// @@ -104,7 +101,7 @@ public class AddCiscoVnmcResourceCmd extends BaseCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, runtimeExcp.getMessage()); } } - + @Override public String getCommandName() { return s_name; 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 895a7b37f8a..0d785e1b9a3 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 @@ -35,10 +35,10 @@ import com.cloud.network.element.CiscoVnmcElementService; import com.cloud.user.UserContext; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(responseObject=SuccessResponse.class, description=" delete a Cisco Vnmc Resource") +@APICommand(name="deleteCiscoVnmcResource", responseObject=SuccessResponse.class, description="Deletes a Cisco Vnmc controller") public class DeleteCiscoVnmcResourceCmd extends BaseCmd { private static final Logger s_logger = Logger.getLogger(DeleteCiscoVnmcResourceCmd.class.getName()); - private static final String s_name = "addCiscoVnmcResource"; + private static final String s_name = "deleteCiscoVnmcResource"; @PlugService CiscoVnmcElementService _ciscoVnmcElementService; ///////////////////////////////////////////////////// diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java index 118feb0c84b..8d10e0919bb 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java @@ -30,7 +30,6 @@ import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import org.apache.log4j.Logger; - import com.cloud.api.response.CiscoVnmcResourceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -42,20 +41,20 @@ import com.cloud.network.cisco.CiscoVnmcControllerVO; import com.cloud.network.element.CiscoVnmcElementService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(responseObject=CiscoVnmcResourceResponse.class, description="Lists Cisco VNMC controllers") +@APICommand(name="listCiscoVnmcResources", responseObject=CiscoVnmcResourceResponse.class, description="Lists Cisco VNMC controllers") public class ListCiscoVnmcResourcesCmd extends BaseListCmd { private static final Logger s_logger = Logger.getLogger(ListCiscoVnmcResourcesCmd.class.getName()); private static final String s_name = "listCiscoVnmcResources"; @PlugService CiscoVnmcElementService _ciscoVnmcElementService; - ///////////////////////////////////////////////////// + ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, description="the Physical Network ID") private Long physicalNetworkId; - @Parameter(name=ApiConstants.RESOURCE_ID, type=CommandType.UUID, entityType=CiscoVnmcResourceResponse.class, description="Cisco VNMC resource ID") + @Parameter(name=ApiConstants.RESOURCE_ID, type=CommandType.UUID, entityType=CiscoVnmcResourceResponse.class, description="Cisco VNMC resource ID") private Long ciscoVnmcResourceId; /////////////////////////////////////////////////////