apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring listPods to new API framework.

Browse Source
This commit is contained in:
Kris McQueen 2010-09-01 14:17:00 -07:00
parent fbcb02cd9e
commit 44eaf247b5
3 changed files with 42 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
server/src/com/cloud/api/commands/ListPodsByCmd.java
View File

@ -20,30 +20,22 @@ package com.cloud.api.commands;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.PodResponse;
import com.cloud.dc.HostPodVO;
import com.cloud.server.Criteria;
import com.cloud.serializer.SerializerHelper;
import com.cloud.test.PodZoneConfig;
import com.cloud.utils.Pair;
public class ListPodsByCmd extends BaseCmd {
@Implementation(method="searchForPods")
public class ListPodsByCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListPodsByCmd.class.getName());
private static final String s_name = "listpodsresponse";
private static final List<Pair<Enum, Boolean>> s_properties = new ArrayList<Pair<Enum, Boolean>>();
static {
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.NAME, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.KEYWORD, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.FALSE));
}
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -79,60 +71,37 @@ public class ListPodsByCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
return s_name;
}
public List<Pair<Enum, Boolean>> getProperties() {
return s_properties;
}
@Override
public List<Pair<String, Object>> execute(Map<String, Object> params) {
Long id = (Long)params.get(BaseCmd.Properties.ID.getName());
String name = (String)params.get(BaseCmd.Properties.NAME.getName());
Long zoneId = (Long)params.get(BaseCmd.Properties.ZONE_ID.getName());
String keyword = (String)params.get(BaseCmd.Properties.KEYWORD.getName());
Criteria c = new Criteria();
if (keyword != null) {
c.addCriteria(Criteria.KEYWORD, keyword);
} else {
c.addCriteria(Criteria.ID, id);
c.addCriteria(Criteria.NAME, name);
c.addCriteria(Criteria.DATACENTERID, zoneId);
}
List<HostPodVO> pods = getManagementServer().searchForPods(c);
if (pods == null) {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Unable to find pods for specified search criteria.");
}
List<Pair<String, Object>> podTags = new ArrayList<Pair<String, Object>>();
Object[] podDataTags = new Object[pods.size()];
int i = 0;
@Override @SuppressWarnings("unchecked")
public String getResponse() {
List<HostPodVO> pods = (List<HostPodVO>)getResponseObject();
List<PodResponse> response = new ArrayList<PodResponse>();
for (HostPodVO pod : pods) {
String[] ipRange = new String[2];
if (pod.getDescription() != null && pod.getDescription().length() > 0) {
ipRange = pod.getDescription().split("-");
} else {
ipRange[0] = pod.getDescription();
}
List<Pair<String, Object>> podData = new ArrayList<Pair<String, Object>>();
podData.add(new Pair<String, Object>(BaseCmd.Properties.ID.getName(), pod.getId()));
podData.add(new Pair<String, Object>(BaseCmd.Properties.NAME.getName(), pod.getName()));
podData.add(new Pair<String, Object>(BaseCmd.Properties.ZONE_ID.getName(), pod.getDataCenterId()));
podData.add(new Pair<String, Object>(BaseCmd.Properties.ZONE_NAME.getName(), PodZoneConfig.getZoneName(pod.getDataCenterId())));
podData.add(new Pair<String, Object>(BaseCmd.Properties.CIDR.getName(), pod.getCidrAddress() +"/" + pod.getCidrSize()));
podData.add(new Pair<String, Object>(BaseCmd.Properties.START_IP.getName(), ipRange[0]));
podData.add(new Pair<String, Object>(BaseCmd.Properties.END_IP.getName(), (ipRange.length > 1 && ipRange[1] != null) ? ipRange[1] : ""));
podData.add(new Pair<String, Object>(BaseCmd.Properties.GATEWAY.getName(), pod.getGateway()));
podDataTags[i++] = podData;
String[] ipRange = new String[2];
if (pod.getDescription() != null && pod.getDescription().length() > 0) {
ipRange = pod.getDescription().split("-");
} else {
ipRange[0] = pod.getDescription();
}
PodResponse podResponse = new PodResponse();
podResponse.setId(pod.getId());
podResponse.setName(pod.getName());
podResponse.setZoneId(pod.getDataCenterId());
podResponse.setZoneName(PodZoneConfig.getZoneName(pod.getDataCenterId()));
podResponse.setCidr(pod.getCidrAddress() +"/" + pod.getCidrSize());
podResponse.setStartIp(ipRange[0]);
podResponse.setEndIp(((ipRange.length > 1) && (ipRange[1] != null)) ? ipRange[1] : "");
podResponse.setGateway(pod.getGateway());
response.add(podResponse);
}
Pair<String, Object> podTag = new Pair<String, Object>("pod", podDataTags);
podTags.add(podTag);
return podTags;
return SerializerHelper.toSerializedString(response);
}
}

5
server/src/com/cloud/server/ManagementServer.java
View File

@ -46,6 +46,7 @@ import com.cloud.api.commands.ListHostsCmd;
import com.cloud.api.commands.ListIsosCmd;
import com.cloud.api.commands.ListLoadBalancerRuleInstancesCmd;
import com.cloud.api.commands.ListLoadBalancerRulesCmd;
import com.cloud.api.commands.ListPodsByCmd;
import com.cloud.api.commands.ListTemplatesCmd;
import com.cloud.api.commands.LockAccountCmd;
import com.cloud.api.commands.LockUserCmd;
@ -882,10 +883,10 @@ public interface ManagementServer {
/**
* Searches for Pods by the specified search criteria
* Can search by: pod name and/or zone name
* @param c
* @param cmd
* @return List of Pods
*/
List<HostPodVO> searchForPods(Criteria c);
List<HostPodVO> searchForPods(ListPodsByCmd cmd);
/**
* Searches for Zones by the specified search criteria

13
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -84,6 +84,7 @@ import com.cloud.api.commands.ListHostsCmd;
import com.cloud.api.commands.ListIsosCmd;
import com.cloud.api.commands.ListLoadBalancerRuleInstancesCmd;
import com.cloud.api.commands.ListLoadBalancerRulesCmd;
import com.cloud.api.commands.ListPodsByCmd;
import com.cloud.api.commands.ListTemplatesCmd;
import com.cloud.api.commands.LockAccountCmd;
import com.cloud.api.commands.LockUserCmd;
@ -3948,14 +3949,14 @@ public class ManagementServerImpl implements ManagementServer {
}
@Override
public List<HostPodVO> searchForPods(Criteria c) {
Filter searchFilter = new Filter(HostPodVO.class, c.getOrderBy(), c.getAscending(), c.getOffset(), c.getLimit());
public List<HostPodVO> searchForPods(ListPodsByCmd cmd) {
Filter searchFilter = new Filter(HostPodVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
SearchCriteria<HostPodVO> sc = _hostPodDao.createSearchCriteria();
String podName = (String) c.getCriteria(Criteria.NAME);
Long id = (Long) c.getCriteria(Criteria.ID);
Long zoneId = (Long) c.getCriteria(Criteria.DATACENTERID);
Object keyword = c.getCriteria(Criteria.KEYWORD);
String podName = cmd.getPodName();
Long id = cmd.getId();
Long zoneId = cmd.getZoneId();
Object keyword = cmd.getKeyword();
if (keyword != null) {
SearchCriteria<HostPodVO> ssc = _hostPodDao.createSearchCriteria();