Changed to use XOS client to get service and port information
XOS client still gets these information from OpenStack temporarily
until XOS provides these APIs
Change-Id: I1ef9302f719a18a7377221f63b84431c2cdface8
diff --git a/src/main/java/org/onosproject/cordvtn/rest/ServiceDependencyWebResource.java b/src/main/java/org/onosproject/cordvtn/rest/ServiceDependencyWebResource.java
index c4b7c52..f7ddf96 100644
--- a/src/main/java/org/onosproject/cordvtn/rest/ServiceDependencyWebResource.java
+++ b/src/main/java/org/onosproject/cordvtn/rest/ServiceDependencyWebResource.java
@@ -16,8 +16,8 @@
package org.onosproject.cordvtn.rest;
import org.onosproject.cordvtn.api.CordVtnService;
-import org.onosproject.cordvtn.api.CordServiceId;
import org.onosproject.rest.AbstractWebResource;
+import org.onosproject.xosclient.api.VtnServiceId;
import javax.ws.rs.DELETE;
import javax.ws.rs.POST;
@@ -48,8 +48,8 @@
@Produces(MediaType.APPLICATION_JSON)
public Response createServiceDependency(@PathParam("tenantServiceId") String tServiceId,
@PathParam("providerServiceId") String pServiceId) {
- service.createServiceDependency(CordServiceId.of(tServiceId),
- CordServiceId.of(pServiceId),
+ service.createServiceDependency(VtnServiceId.of(tServiceId),
+ VtnServiceId.of(pServiceId),
false);
return Response.status(Response.Status.OK).build();
}
@@ -68,8 +68,8 @@
public Response createServiceDependency(@PathParam("tenantServiceId") String tServiceId,
@PathParam("providerServiceId") String pServiceId,
@PathParam("direction") String direction) {
- service.createServiceDependency(CordServiceId.of(tServiceId),
- CordServiceId.of(pServiceId),
+ service.createServiceDependency(VtnServiceId.of(tServiceId),
+ VtnServiceId.of(pServiceId),
direction.equals(BIDIRECTION));
return Response.status(Response.Status.OK).build();
}
@@ -85,7 +85,7 @@
@Path("{tenantServiceId}/{providerServiceId}")
public Response removeServiceDependency(@PathParam("tenantServiceId") String tServiceId,
@PathParam("providerServiceId") String pServiceId) {
- service.removeServiceDependency(CordServiceId.of(tServiceId), CordServiceId.of(pServiceId));
+ service.removeServiceDependency(VtnServiceId.of(tServiceId), VtnServiceId.of(pServiceId));
return Response.noContent().build();
}
}