SDNC context builder API Mapping Configuration

Issue-ID: LOG-421

Add code to use the VNF-API on SDNC where required.
This involves using the api-mapping logic to select the VNF-API over the
GNERIC-RESOURCES-API as well as adding the code to extract the
information required by the VNF-API from AAI and adding the code to
parse the VNF-API resonse into ModelContext.

Change-Id: I4447a14d7fa39b2c5d9b655c2b20e651e56d3d77
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

1 files changed, 28 insertions, 5 deletions

diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestService.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestService.java
index ec1581a..efab905 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestService.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestService.java
@@ -22,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -33,12 +34,12 @@ import javax.ws.rs.core.Response;
 
 
 @Api
-@Path("/service")
+@Path("/")
 @Produces({MediaType.APPLICATION_JSON})
 public interface RestService {
 
     @GET
-    @Path("/context")
+    @Path("service/context")
     @Produces({MediaType.APPLICATION_JSON})
     @ApiOperation(
             value = "Respond SDNCContext Model Data",
@@ -52,7 +53,29 @@ public interface RestService {
                     @ApiResponse(code = 404, message = "Service not available"),
                     @ApiResponse(code = 500, message = "Unexpected Runtime error")
                     })
-    public Response getContext(@Context HttpHeaders headers,
-            @QueryParam("serviceInstanceId") String serviceInstanceId
+    public Response getContext(@Context HttpServletRequest request,
+                               @Context HttpHeaders headers,
+                               @QueryParam("serviceInstanceId") String serviceInstanceId
             );
-}
\ No newline at end of file
+
+    @GET
+    @Path("{version:[vV][1-5]}/service/context")
+    @Produces({MediaType.APPLICATION_JSON})
+    @ApiOperation(
+            value = "Respond SDNCContext v1 - v5 Model Data",
+            notes = "Returns a JSON object which represents the SDNCConetxt V1 model data",
+            response = Response.class
+    )
+    @ApiResponses(
+            value = {
+                    @ApiResponse(code = 200, message = "OK"),
+                    @ApiResponse(code = 400, message = "Bad Request"),
+                    @ApiResponse(code = 404, message = "Service not available"),
+                    @ApiResponse(code = 500, message = "Unexpected Runtime error")
+                    })
+    public Response getV1Context(@Context HttpServletRequest request,
+                               @Context HttpHeaders headers,
+                               @QueryParam("serviceInstanceId") String serviceInstanceId
+            );
+
+}