Converted ServiceInstances to catalog db client

- Fixed issues related to created Date Format, enabled required Test
- Fixed issues related to queryParam names, enabled required Test
- Fixed issues related to queryParam names
-  Improving coverage for catalogDbClient by another 10% (its 78% now)
-  Improving coverage for catalogDbClient by another 10%. There is a
failing test which will be explored shortly
-  Improving coverage for catalogDbClient, adding some tests and their
basic asserts
- merging with dev and resolving the compilation issue arising due to it
- Removing some TODO introduced in code for incremental pushes
- Fixing failing unit test cases with the build
- Refactoring done for code change in catalogDBClient
- merged changes with development branch
- Modified unit tests for Catalogdb Client related code
- Modified unit tests for Catalogdb Client related code
- Fixed some of the repository code for retrieving single resource
- Modified unit tests for Catalogdb Client related code
- Modified unit tests for Catalogdb Client related code
- Modified unit tests for Catalogdb Client related code
- Removed @Param from repositories and added -Parameters argument in
maven compile plugin
...

Change-Id: Ieeb7bcc21a573465e485fedfbbe771c8b89db3f8
Issue-ID: SO-925
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

8 files changed, 14 insertions, 11 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeactivateAndCloudDeleteVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeactivateAndCloudDeleteVfModule.json
index 58db9d4f76..3d293d522b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeactivateAndCloudDeleteVfModule.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeactivateAndCloudDeleteVfModule.json
@@ -1,7 +1,9 @@
 {
   "requestDetails": {
       "modelInfo": {
-          "modelType": "vfModule"
+          "modelType": "vfModule",
+          "modelInvariantId":"78ca26d0-246d-11e7-93ae-92361f002671",
+          "modelVersion": "2"
       },
       "cloudConfiguration": {
           "lcpCloudRegionId": "mdt1",
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVfModule.json
index d612dd9704..34c28d3f7c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVfModule.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVfModule.json
@@ -16,8 +16,8 @@
 		},
 		"modelInfo":{
 			"modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968",
-			"modelVersion":"1", 
-			"modelVersionId":"test", 
+			"modelVersion":"2", 
+			"modelVersionId":"78ca26d0-246d-11e7-93ae-92361f002671", 
 			"modelType":"vfModule",
 			"modelName":"serviceModel",
 			"modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstanceNoReqParams.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstanceNoReqParams.json
index cfd19ff0ca..6f4d0f9070 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstanceNoReqParams.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstanceNoReqParams.json
@@ -1,7 +1,8 @@
 {
 	"requestDetails": {
 		"modelInfo": {
-			"modelType": "network"
+			"modelType": "network",
+			"modelName": "CONTRAIL30_GNDIRECT"
 		},
 		"cloudConfiguration": {
 			"lcpCloudRegionId": "mtn6",
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVfModule.json
index 967250a0da..d8de481633 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVfModule.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVfModule.json
@@ -16,8 +16,8 @@
 		},
 		"modelInfo":{
 			"modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968",
-			"modelVersion":"1", 
-			"modelVersionId":"test", 
+			"modelVersion":"2", 
+			"modelVersionId":"78ca26d0-246d-11e7-93ae-92361f002671", 
 			"modelType":"vfModule",
 			"modelName":"serviceModel",
 			"modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ScaleOutRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ScaleOutRequest.json
index ba5a8a92e5..809e8bcc1c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ScaleOutRequest.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ScaleOutRequest.json
@@ -4,7 +4,7 @@
          "modelType":"vfModule",
          "modelInvariantId":"ff5256d2-5a33-55df-13ab-12abad84e7ff",
          "modelVersionId":"fe6478e5-ea33-3346-ac12-ab121484a3fe",
-         "modelCustomizationId":"cb82ffd8-252a-11e7-93ae-92361f002672",
+         "modelCustomizationId":"cb82ffd8-252a-11e7-93ae-92361f002671",
          "modelName":"vSAMP12..base..module-0",
          "modelVersion":"1"
       },
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivate.json
index d675c79f06..90d5cebb6b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivate.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivate.json
@@ -19,7 +19,7 @@
 		"modelInfo":{
 			"modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965",
 			"modelVersion": "1.0",
-			"modelVersionId":"1", 
+			"modelVersionId":"d88da85c-d9e8-4f73-b837-3a72a431622b", 
 			"modelType":"service",
 			"modelName":"serviceModel"
 		},
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVfModule.json
index c3039a59f0..147754657f 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVfModule.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVfModule.json
@@ -17,10 +17,10 @@
 		"modelInfo":{
 			"modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968",
 			"modelVersion":"1", 
-			"modelVersionId":"test", 
+			"modelVersionId":"20c4431c-246d-11e7-93ae-92361f002671", 
 			"modelType":"vfModule",
 			"modelName":"serviceModel",
-			"modelCustomizationId": "b4ea86b4-253f-11e7-93ae-92361f002671"
+			"modelCustomizationId": "cb82ffd8-252a-11e7-93ae-92361f002671"
 		},
 	 	"subscriberInfo": {
       		"globalSubscriberId": "MSO_1610_dev", 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVnf.json
index ec2916f0da..723a709927 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVnf.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVnf.json
@@ -7,7 +7,7 @@
 			"modelName": "vSAMP12..base..module-0",
 			"modelVersion": "1",
 			"modelVersionId": "1",
-			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002674"
 		},
 		"cloudConfiguration": {
 			"lcpCloudRegionId": "mdt1",