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>

1 files changed, 197 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourcesCreateVnf_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourcesCreateVnf_Response.json
new file mode 100644
index 0000000000..79b2727ffe
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/vnfResourcesCreateVnf_Response.json
@@ -0,0 +1,197 @@
+{
+  "modelUUID": "ff2ae348-214a-11e7-93ae-92361f002672",
+  "modelInvariantUUID": "2fff5b20-214b-11e7-93ae-92361f002671",
+  "modelName": "v10",
+  "modelVersion": "2.0",
+  "toscaNodeType": "VF",
+  "description": "1607 v10 - inherent network1",
+  "orchestrationMode": "HEAT",
+  "aicVersionMin": "",
+  "aicVersionMax": "",
+  "category": null,
+  "subCategory": null,
+  "created": "2017-04-14T16:16:28.000+0000",
+  "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
+  "_embedded": {
+    "vnfResourceCustomizations": [
+      {
+        "description": "1607 v10 - inherent network1",
+        "modelName": "v10",
+        "modelUUID": "ff2ae348-214a-11e7-93ae-92361f002672",
+        "modelInstanceName": "test",
+        "modelCustomizationUUID": "68dc9a92-214c-11e7-93ae-92361f002672",
+        "orchestrationMode": "HEAT",
+        "multiStageDesign": null,
+        "availabilityZoneMaxCount": "0",
+        "vfModuleCustomizations": [
+          {
+            "description": "v10 DEV PCM",
+            "modelName": "test::PCM::module-1",
+            "availabilityZoneCount": "0",
+            "isBase": true,
+            "initialCount": "1",
+            "label": "base",
+            "modelUUID": "test",
+            "modelCustomizationUUID": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
+            "modelInvariantUUID": "f7ce78bb-423b-11e7-93f8-0050569a7968",
+            "maxInstances": "0",
+            "modelVersion": "1",
+            "minInstances": "0",
+            "created": "2016-09-14 18:19:56.0",
+            "_links": {
+              "self": {
+                "href": "http://localhost:8090/vfModuleCustomization/a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
+              },
+              "volumeHeatEnv": {
+                "href": "http://localhost:8090/vfModuleCustomization/a7f1d08e-b02d-11e6-80f5-76304dec7eb7/volumeHeatEnv"
+              },
+              "heatEnvironment": {
+                "href": "http://localhost:8090/vfModuleCustomization/a7f1d08e-b02d-11e6-80f5-76304dec7eb7/heatEnvironment"
+              },
+              "vfModule": {
+                "href": "http://localhost:8090/vfModuleCustomization/a7f1d08e-b02d-11e6-80f5-76304dec7eb7/vfModule"
+              }
+            }
+          },
+          {
+            "description": "v10 DEV PCM",
+            "modelName": "test::PCM::module-1",
+            "availabilityZoneCount": "0",
+            "isBase": false,
+            "initialCount": "0",
+            "label": "PCM",
+            "modelUUID": "066de97e-253e-11e7-93ae-92361f002672",
+            "modelCustomizationUUID": "b4ea86b4-253f-11e7-93ae-92361f002672",
+            "modelInvariantUUID": "64efd51a-2544-11e7-93ae-92361f002671",
+            "maxInstances": "0",
+            "modelVersion": "2",
+            "minInstances": "0",
+            "created": "2016-09-14 18:19:56.0",
+            "_links": {
+              "self": {
+                "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672"
+              },
+              "volumeHeatEnv": {
+                "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/volumeHeatEnv"
+              },
+              "heatEnvironment": {
+                "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/heatEnvironment"
+              },
+              "vfModule": {
+                "href": "http://localhost:8090/vfModuleCustomization/b4ea86b4-253f-11e7-93ae-92361f002672/vfModule"
+              }
+            }
+          },
+          {
+            "description": "v10 DEV Base",
+            "modelName": "test::base::module-0",
+            "availabilityZoneCount": "0",
+            "isBase": true,
+            "initialCount": "1",
+            "label": "base",
+            "modelUUID": "20c4431c-246d-11e7-93ae-92361f002672",
+            "modelCustomizationUUID": "cb82ffd8-252a-11e7-93ae-92361f002672",
+            "modelInvariantUUID": "78ca26d0-246d-11e7-93ae-92361f002671",
+            "maxInstances": "0",
+            "modelVersion": "2",
+            "minInstances": "0",
+            "created": "2016-09-14 18:19:56.0",
+            "_links": {
+              "self": {
+                "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002672"
+              },
+              "volumeHeatEnv": {
+                "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002672/volumeHeatEnv"
+              },
+              "heatEnvironment": {
+                "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002672/heatEnvironment"
+              },
+              "vfModule": {
+                "href": "http://localhost:8090/vfModuleCustomization/cb82ffd8-252a-11e7-93ae-92361f002672/vfModule"
+              }
+            }
+          }
+        ],
+        "modelInvariantUUID": "2fff5b20-214b-11e7-93ae-92361f002671",
+        "maxInstances": "0",
+        "nfRole": "vSAMP",
+        "nfNamingCode": "vSAMP",
+        "toscaNodeType": "VF",
+        "nfType": "vSAMP",
+        "modelVersion": "2.0",
+        "minInstances": "0",
+        "aicVersionMax": "",
+        "nfFunction": "vSAMP",
+        "aicVersionMin": "",
+        "created": "2017-04-14 21:46:28.0",
+        "_links": {
+          "self": {
+            "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002672{?projection}",
+            "templated": true
+          },
+          "vnfResources": {
+            "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002672/vnfResources"
+          },
+          "vfModuleCustomizations": {
+            "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002672/vfModuleCustomizations"
+          },
+          "vnfcInstanceGroupCustomizations": {
+            "href": "http://localhost:8090/vnfResourceCustomization/68dc9a92-214c-11e7-93ae-92361f002672/vnfcInstanceGroupCustomizations"
+          }
+        }
+      },
+      {
+        "description": "1607 v10 - inherent network1",
+        "modelName": "v10",
+        "modelUUID": "ff2ae348-214a-11e7-93ae-92361f002672",
+        "modelInstanceName": "test",
+        "modelCustomizationUUID": "f78914d9-423b-11e7-93f8-0050569a7967",
+        "orchestrationMode": "HEAT",
+        "multiStageDesign": null,
+        "availabilityZoneMaxCount": "0",
+        "vfModuleCustomizations": [],
+        "modelInvariantUUID": "2fff5b20-214b-11e7-93ae-92361f002671",
+        "maxInstances": "0",
+        "nfRole": "vSAMP",
+        "nfNamingCode": "vSAMP",
+        "toscaNodeType": "VF",
+        "nfType": "vSAMP",
+        "modelVersion": "2.0",
+        "minInstances": "0",
+        "aicVersionMax": "",
+        "nfFunction": "vSAMP",
+        "aicVersionMin": "",
+        "created": "2017-04-14 21:46:28.0",
+        "_links": {
+          "self": {
+            "href": "http://localhost:8090/vnfResourceCustomization/f78914d9-423b-11e7-93f8-0050569a7967{?projection}",
+            "templated": true
+          },
+          "vnfResources": {
+            "href": "http://localhost:8090/vnfResourceCustomization/f78914d9-423b-11e7-93f8-0050569a7967/vnfResources"
+          },
+          "vfModuleCustomizations": {
+            "href": "http://localhost:8090/vnfResourceCustomization/f78914d9-423b-11e7-93f8-0050569a7967/vfModuleCustomizations"
+          },
+          "vnfcInstanceGroupCustomizations": {
+            "href": "http://localhost:8090/vnfResourceCustomization/f78914d9-423b-11e7-93f8-0050569a7967/vnfcInstanceGroupCustomizations"
+          }
+        }
+      }
+    ]
+  },
+  "_links": {
+    "self": {
+      "href": "http://localhost:8090/vnfResource/ff2ae348-214a-11e7-93ae-92361f002672"
+    },
+    "vnfResource": {
+      "href": "http://localhost:8090/vnfResource/ff2ae348-214a-11e7-93ae-92361f002672"
+    },
+    "heatTemplates": {
+      "href": "http://localhost:8090/vnfResource/ff2ae348-214a-11e7-93ae-92361f002672/heatTemplates"
+    },
+    "vnfResourceCustomizations": {
+      "href": "http://localhost:8090/vnfResource/ff2ae348-214a-11e7-93ae-92361f002672/vnfResourceCustomizations"
+    }
+  }
+}
\ No newline at end of file