SEBA-814 To support Multi-Tcont on TT-workflow, SADIS configuration
is updated.
Change-Id: I48cb3c3894f8e711b74165152d5712c593cc3c03
diff --git a/app/src/main/java/org/opencord/sadis/rest/SadisWebResource.java b/app/src/main/java/org/opencord/sadis/rest/SadisWebResource.java
index 160874a..b2bfad2 100644
--- a/app/src/main/java/org/opencord/sadis/rest/SadisWebResource.java
+++ b/app/src/main/java/org/opencord/sadis/rest/SadisWebResource.java
@@ -24,16 +24,11 @@
import org.opencord.sadis.SubscriberAndDeviceInformation;
import org.onlab.util.ItemNotFoundException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
import javax.ws.rs.GET;
-import javax.ws.rs.POST;
import javax.ws.rs.DELETE;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
-import javax.ws.rs.Consumes;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -46,11 +41,6 @@
private final ArrayNode node = root.putArray("entry");
private static final String SUBSCRIBER_NOT_FOUND = "Subscriber not found";
private static final String BP_NOT_FOUND = "Bandwidth Profile not found";
- private final SadisService sadisService = get(SadisService.class);
- private final BaseInformationService<SubscriberAndDeviceInformation> subService =
- sadisService.getSubscriberInfoService();
- private final BaseInformationService<BandwidthProfileInformation> bpService =
- sadisService.getBandwidthProfileService();
/**
* Get subscriber object.
@@ -64,6 +54,9 @@
@Path("/subscriber/{id}")
@Produces(MediaType.APPLICATION_JSON)
public Response getSubscriber(@PathParam("id") String id) {
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<SubscriberAndDeviceInformation> subService =
+ sadisService.getSubscriberInfoService();
final SubscriberAndDeviceInformation entry = subService.get(id);
if (entry == null) {
throw new ItemNotFoundException(SUBSCRIBER_NOT_FOUND);
@@ -84,6 +77,9 @@
@Path("/cache/subscriber/{id}")
@Produces(MediaType.APPLICATION_JSON)
public Response getSubscriberCache(@PathParam("id") String id) {
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<SubscriberAndDeviceInformation> subService =
+ sadisService.getSubscriberInfoService();
final SubscriberAndDeviceInformation entry = subService.getfromCache(id);
if (entry == null) {
throw new ItemNotFoundException(SUBSCRIBER_NOT_FOUND);
@@ -93,22 +89,6 @@
}
/**
- * Create subscriber object.
- *
- * @return 201 Created
- */
- @POST
- @Path("/subscriber")
- @Consumes(MediaType.APPLICATION_JSON)
- public Response postSubscriber() {
- try {
- return Response.created(new URI("/subsciber/123")).build();
- } catch (URISyntaxException e) {
- return Response.serverError().build();
- }
- }
-
- /**
* Delete subscriber object.
*
* @param id
@@ -118,6 +98,9 @@
@DELETE
@Path("/cache/subscriber/{id}")
public Response deleteSubscriber(@PathParam("id") String id) {
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<SubscriberAndDeviceInformation> subService =
+ sadisService.getSubscriberInfoService();
subService.invalidateId(id);
return Response.noContent().build();
}
@@ -130,6 +113,9 @@
@DELETE
@Path("/cache/subscriber/")
public Response deleteAllSubscribers() {
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<SubscriberAndDeviceInformation> subService =
+ sadisService.getSubscriberInfoService();
subService.invalidateAll();
return Response.noContent().build();
}
@@ -138,6 +124,9 @@
@Path("/bandwidthprofile/{id}")
@Produces(MediaType.APPLICATION_JSON)
public Response getBandwidthProfile(@PathParam("id") String id) {
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<BandwidthProfileInformation> bpService =
+ sadisService.getBandwidthProfileService();
final BandwidthProfileInformation entry = bpService.get(id);
if (entry == null) {
throw new ItemNotFoundException(BP_NOT_FOUND);
@@ -150,6 +139,9 @@
@Path("/cache/bandwidthprofile/{id}")
@Produces(MediaType.APPLICATION_JSON)
public Response getBandwidthProfileCache(@PathParam("id") String id) {
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<BandwidthProfileInformation> bpService =
+ sadisService.getBandwidthProfileService();
final BandwidthProfileInformation entry = bpService.getfromCache(id);
if (entry == null) {
throw new ItemNotFoundException(BP_NOT_FOUND);
@@ -161,13 +153,19 @@
@DELETE
@Path("/cache/bandwidthprofile/{id}")
public Response deleteBandwidthProfile(@PathParam("id") String id) {
- bpService.invalidateAll();
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<BandwidthProfileInformation> bpService =
+ sadisService.getBandwidthProfileService();
+ bpService.invalidateId(id);
return Response.noContent().build();
}
@DELETE
@Path("/cache/bandwidthprofile/")
public Response deleteAllBandwidthProfiles() {
+ SadisService sadisService = get(SadisService.class);
+ BaseInformationService<BandwidthProfileInformation> bpService =
+ sadisService.getBandwidthProfileService();
bpService.invalidateAll();
return Response.noContent().build();
}