Change mapping of model IDs

Issue-ID: LOG-1014

Change-Id: Ieef2ec4555d28944d98c04bfac10c9b5a0e089d0
Signed-off-by: Norm Traxler <normant@amdocs.com>

3 files changed, 19 insertions, 12 deletions

diff --git a/config/sdncgenericresource.spec b/config/sdncgenericresource.spec
index 518b557..81542a2 100644
--- a/config/sdncgenericresource.spec
+++ b/config/sdncgenericresource.spec
@@ -16,7 +16,8 @@
                 "service-instance-name": "service.name"
               },
               "onap-model-information": {
-                "model-invariant-uuid": "service.invariantUUID"
+                "model-invariant-uuid": "service.modelInvariantUUID",
+                "model-uuid": "service.modelVersionID"
               }
             },
             "vnfs": {
@@ -25,10 +26,11 @@
                   "vnf-data": {
                     "vnf-topology": {
                       "onap-model-information": {
-                        "model-uuid": "vnfList[&4].uuid",
-                        "model-invariant-uuid": "vnfList[&4].invariantUUID"
+                        "model-uuid": "vnfList[&4].modelVersionID",
+                        "model-invariant-uuid": "vnfList[&4].modelInvariantUUID"
                       },
                       "vnf-topology-identifier-structure": {
+                        "vnf-id": "vnfList[&4].uuid",
                         "vnf-type": "vnfList[&4].type",
                         "vnf-name": "vnfList[&4].name"
                       },
@@ -51,11 +53,13 @@
                           "vf-module-data": {
                             "vf-module-topology": {
                               "vf-module-topology-identifier": {
+                                "vf-module-id": "vnfList[&8].vfModuleList[&4].uuid",
                                 "vf-module-name": "vnfList[&8].vfModuleList[&4].name"
                               },
                               "onap-model-information": {
-                                "model-uuid": "vnfList[&8].vfModuleList[&4].uuid",
-                                "model-invariant-uuid": "vnfList[&8].vfModuleList[&4].invariantUUID"
+                                "model-uuid": "vnfList[&8].vfModuleList[&4].modelVersionID",
+                                "model-invariant-uuid": "vnfList[&8].vfModuleList[&4].modelInvariantUUID",
+                                "model-customization-uuid": "vnfList[&8].vfModuleList[&4].modelCustomizationUUID"
                               },
                               "vf-module-assignments": {
                                 "vms": {
@@ -137,7 +141,8 @@
                         "network-technology": "networkList[&4].attributeList[2].value"
                       },
                       "onap-model-information": {
-                        "model-invariant-uuid": "networkList[&4].invariantUUID"
+                        "model-uuid": "networkList[&4].modelVersionID",
+                        "model-invariant-uuid": "networkList[&4].modelInvariantUUID"
                       }
                     }
                   }
diff --git a/pom.xml b/pom.xml
index 39a826a..0c693ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,7 +266,7 @@ limitations under the License.
                                     <locations>
                                         <location>org.onap.pomba.contextbuilder.sdnc.service.rs</location>
                                     </locations>
-                                    <basePath>/{${project.artifactId}</basePath>
+                                    <basePath>/sdnccontextbuilder</basePath>
                                     <info>
                                         <title>SDNC Context Builder API</title>
                                         <version>${project.version}</version>
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 efab905..75ef13a 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
@@ -32,6 +32,8 @@ import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.onap.pomba.common.datatypes.ModelContext;
+
 
 @Api
 @Path("/")
@@ -42,9 +44,9 @@ public interface RestService {
     @Path("service/context")
     @Produces({MediaType.APPLICATION_JSON})
     @ApiOperation(
-            value = "Respond SDNCContext Model Data",
-            notes = "Returns a JSON object which represents the SDNCConetxt model data",
-            response = Response.class
+            value = "Respond SDNC Context Model Data",
+            notes = "Returns a JSON object which represents the SDNC Context model data",
+            response = ModelContext.class
     )
     @ApiResponses(
             value = {
@@ -62,8 +64,8 @@ public interface RestService {
     @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",
+            value = "Respond SDNC Context v1 - v5 Model Data",
+            notes = "Returns a JSON object which represents the SDNC Context V1 model data",
             response = Response.class
     )
     @ApiResponses(