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

testing done

Browse Source
This commit is contained in:
Alex Huang 2012-11-27 18:10:44 -08:00
parent 35914d6f6a
commit bdb5be6ee6
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engine/api/src/org/apache/cloudstack/engine/rest/datacenter/entity/api/ZoneRestTO.java
View File

@ -19,13 +19,16 @@
package org.apache.cloudstack.engine.rest.datacenter.entity.api;
import java.net.URI;
import java.util.Iterator;
import java.util.List;
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.service.api.ProvisioningService;
@ -37,18 +40,24 @@ public class ZoneRestTO {
@Inject
protected static ProvisioningService s_provisioningService;
public String id;
public URI uri;
public String name;
public String[] pods;
public URI[] pods;
public ZoneRestTO(UriBuilder ub, ZoneEntity zone, URI uri) {
public ZoneRestTO(UriInfo ui, ZoneEntity zone, URI uri) {
this.id = zone.getUuid();
this.name = zone.getName();
this.uri = uri;
List<String> podIds = zone.listPodIds();
this.pods = new String[podIds.size()];
this.pods = podIds.toArray(new String[podIds.size()]);
this.pods = new URI[podIds.size()];
UriBuilder ub = ui.getAbsolutePathBuilder().path(this.getClass(), "getPod");
Iterator<String> it = podIds.iterator();
for (int i = 0; i < pods.length; i++) {
String pod = it.next();
pods[i] = ub.build(pod);
}
}
public ZoneRestTO() {
@ -56,8 +65,14 @@ public class ZoneRestTO {
@GET
@Path("/pods")
public String[] listPods(@PathParam("zoneid") String zoneId) {
public URI[] listPods(@PathParam("zoneid") String zoneId) {
return this.pods;
}
@GET
@Path("/pod/{podid}")
public PodRestTO getPod(@Context UriInfo ui, @PathParam("podid") String podId) {
return null;
}
}

4
engine/api/src/org/apache/cloudstack/engine/rest/service/api/ProvisioningRestService.java
View File

@ -52,7 +52,7 @@ public class ProvisioningRestService {
public ZoneRestTO getZone(@Context UriInfo ui, @PathParam("zoneid") String id) {
UriBuilder ub = ui.getAbsolutePathBuilder().path(this.getClass(), "getZone");
ZoneEntity entity = _provisioningService.getZone(id);
return new ZoneRestTO(ub, entity, ub.build(entity.getUuid()));
return new ZoneRestTO(ui, entity, ub.build(entity.getUuid()));
}
@GET
@ -64,7 +64,7 @@ public class ProvisioningRestService {
Iterator<ZoneEntity> it = zones.iterator();
for (int i = 0; i < tos.length; i++) {
ZoneEntity entity = it.next();
tos[i] = new ZoneRestTO(ub, entity, ub.build(entity.getUuid()));
tos[i] = new ZoneRestTO(ui, entity, ub.build(entity.getUuid()));
}
return tos;
}