update infra apihandler to utilize rest

rather than direct
access

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

3 files changed, 298 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json
new file mode 100644
index 0000000000..ada3cced48
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json
@@ -0,0 +1,54 @@
+{
+  "clientRequestId": "00032ab7-fake-42e5-965d-8ea592502018",
+  "action": "deleteInstance",
+  "requestStatus": "PENDING",
+  "statusMessage": "Vf Module deletion pending.",
+  "progress": 0,
+  "startTime": "2016-12-22T13:29:54.000+0000",
+  "endTime": "2016-12-22T13:30:28.000+0000",
+  "source": "VID",
+  "vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+  "vnfName": null,
+  "vnfType": null,
+  "serviceType": null,
+  "aicNodeClli": null,
+  "tenantId": "6accefef3cb442ff9e644d589fb04107",
+  "provStatus": null,
+  "vnfParams": null,
+  "vnfOutputs": null,
+  "requestBody": "{\"requestDetails\": {\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"test::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"n6\"}}}",
+  "responseBody": null,
+  "lastModifiedBy": "BPMN",
+  "modifyTime": "2016-12-22T13:30:28.000+0000",
+  "requestType": null,
+  "volumeGroupId": null,
+  "volumeGroupName": null,
+  "vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+  "vfModuleName": null,
+  "vfModuleModelName": "test::base::module-0",
+  "aaiServiceId": null,
+  "aicCloudRegion": "n6",
+  "callBackUrl": null,
+  "correlator": null,
+  "serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+  "serviceInstanceName": null,
+  "requestScope": "vfModule",
+  "requestAction": "deleteInstance",
+  "networkId": null,
+  "networkName": null,
+  "networkType": null,
+  "requestorId": null,
+  "configurationId": null,
+  "configurationName": null,
+  "operationalEnvId": null,
+  "operationalEnvName": null,
+  "requestURI": "00032ab7-na18-42e5-965d-8ea592502018",
+  "_links": {
+    "self": {
+      "href": "http://localhost:8087/infraActiveRequests/00032ab7-na18-42e5-965d-8ea592502018"
+    },
+    "infraActiveRequests": {
+      "href": "http://localhost:8087/infraActiveRequests/00032ab7-na18-42e5-965d-8ea592502018"
+    }
+  }
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequestDetails.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequestDetails.json
new file mode 100644
index 0000000000..a601332165
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequestDetails.json
@@ -0,0 +1,54 @@
+{
+  "clientRequestId": "00032ab7-3fb3-42e5-965d-8ea592502016",
+  "action": "deleteInstance",
+  "requestStatus": "COMPLETE",
+  "statusMessage": "Vf Module has been deleted successfully.",
+  "progress": 100,
+  "startTime": "2016-12-22T13:29:54.000+0000",
+  "endTime": "2016-12-22T13:30:28.000+0000",
+  "source": "VID",
+  "vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+  "vnfName": null,
+  "vnfType": null,
+  "serviceType": null,
+  "aicNodeClli": null,
+  "tenantId": "6accefef3cb442ff9e644d589fb04107",
+  "provStatus": null,
+  "vnfParams": null,
+  "vnfOutputs": null,
+  "requestBody": "{\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"test::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"n6\"}}",
+  "responseBody": null,
+  "lastModifiedBy": "BPMN",
+  "modifyTime": "2016-12-22T13:30:28.000+0000",
+  "requestType": null,
+  "volumeGroupId": null,
+  "volumeGroupName": null,
+  "vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+  "vfModuleName": null,
+  "vfModuleModelName": "test::base::module-0",
+  "aaiServiceId": null,
+  "aicCloudRegion": "n6",
+  "callBackUrl": null,
+  "correlator": null,
+  "serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+  "serviceInstanceName": null,
+  "requestScope": "vfModule",
+  "requestAction": "deleteInstance",
+  "networkId": null,
+  "networkName": null,
+  "networkType": null,
+  "requestorId": null,
+  "configurationId": null,
+  "configurationName": null,
+  "operationalEnvId": null,
+  "operationalEnvName": null,
+  "requestURI": "00032ab7-3fb3-42e5-965d-8ea592502017",
+  "_links": {
+    "self": {
+      "href": "http://localhost:8087/infraActiveRequests/00032ab7-3fb3-42e5-965d-8ea592502017"
+    },
+    "infraActiveRequests": {
+      "href": "http://localhost:8087/infraActiveRequests/00032ab7-3fb3-42e5-965d-8ea592502017"
+    }
+  }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json
new file mode 100644
index 0000000000..9e429a0176
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json
@@ -0,0 +1,190 @@
+[
+  {
+    "requestId": "001619d2-a297-4a4b-a9f5-e2823c88458f",
+    "clientRequestId": "001619d2-a297-4a4b-a9f5-e2823c88458f",
+    "action": "CREATE_VF_MODULE",
+    "requestStatus": "COMPLETE",
+    "statusMessage": "COMPLETED",
+    "progress": 100,
+    "startTime": 1467362502000,
+    "endTime": 1493721214000,
+    "source": "PORTAL",
+    "vnfId": null,
+    "vnfName": "test-vscp",
+    "vnfType": "elena_test21",
+    "serviceType": null,
+    "aicNodeClli": null,
+    "tenantId": "381b9ff6c75e4625b7a4182f90fc68d3",
+    "provStatus": null,
+    "vnfParams": null,
+    "vnfOutputs": null,
+    "requestBody": "{\"requestDetails\": {\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"test::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"n6\"}}}",
+    "responseBody": "NONE",
+    "lastModifiedBy": "RDBTEST",
+    "modifyTime": 1467362502000,
+    "requestType": "VNF",
+    "volumeGroupId": null,
+    "volumeGroupName": null,
+    "vfModuleId": null,
+    "vfModuleName": "MODULENAME1",
+    "vfModuleModelName": "moduleModelName",
+    "aaiServiceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+    "aicCloudRegion": "mtn9",
+    "callBackUrl": null,
+    "correlator": null,
+    "serviceInstanceId": null,
+    "serviceInstanceName": null,
+    "requestScope": "vfModule",
+    "requestAction": "createInstance",
+    "networkId": null,
+    "networkName": null,
+    "networkType": null,
+    "requestorId": null,
+    "configurationId": null,
+    "configurationName": null,
+    "operationalEnvId": null,
+    "operationalEnvName": null,
+    "requestURI": "001619d2-a297-4a4b-a9f5-e2823c88458f"
+  },
+  {
+    "requestId": "00032ab7-3fb3-42e5-965d-8ea592502017",
+    "clientRequestId": "00032ab7-3fb3-42e5-965d-8ea592502016",
+    "action": "deleteInstance",
+    "requestStatus": "COMPLETE",
+    "statusMessage": "Vf Module has been deleted successfully.",
+    "progress": 100,
+    "startTime": 1482413394000,
+    "endTime": 1482413428000,
+    "source": "VID",
+    "vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+    "vnfName": null,
+    "vnfType": null,
+    "serviceType": null,
+    "aicNodeClli": null,
+    "tenantId": "6accefef3cb442ff9e644d589fb04107",
+    "provStatus": null,
+    "vnfParams": null,
+    "vnfOutputs": null,
+    "requestBody": "{\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"test::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"n6\"}}",
+    "responseBody": null,
+    "lastModifiedBy": "BPMN",
+    "modifyTime": 1482413428000,
+    "requestType": null,
+    "volumeGroupId": null,
+    "volumeGroupName": null,
+    "vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+    "vfModuleName": null,
+    "vfModuleModelName": "test::base::module-0",
+    "aaiServiceId": null,
+    "aicCloudRegion": "n6",
+    "callBackUrl": null,
+    "correlator": null,
+    "serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+    "serviceInstanceName": null,
+    "requestScope": "vfModule",
+    "requestAction": "deleteInstance",
+    "networkId": null,
+    "networkName": null,
+    "networkType": null,
+    "requestorId": null,
+    "configurationId": null,
+    "configurationName": null,
+    "operationalEnvId": null,
+    "operationalEnvName": null,
+    "requestURI": "00032ab7-3fb3-42e5-965d-8ea592502017"
+  },
+  {
+    "requestId": "00032ab7-na18-42e5-965d-8ea592502018",
+    "clientRequestId": "00032ab7-fake-42e5-965d-8ea592502018",
+    "action": "deleteInstance",
+    "requestStatus": "PENDING",
+    "statusMessage": "Vf Module deletion pending.",
+    "progress": 0,
+    "startTime": 1482413394000,
+    "endTime": 1482413428000,
+    "source": "VID",
+    "vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+    "vnfName": null,
+    "vnfType": null,
+    "serviceType": null,
+    "aicNodeClli": null,
+    "tenantId": "6accefef3cb442ff9e644d589fb04107",
+    "provStatus": null,
+    "vnfParams": null,
+    "vnfOutputs": null,
+    "requestBody": "{\"requestDetails\": {\"modelInfo\":{\"modelType\":\"vfModule\",\"modelName\":\"test::base::module-0\"},\"requestInfo\":{\"source\":\"VID\"},\"cloudConfiguration\":{\"tenantId\":\"6accefef3cb442ff9e644d589fb04107\",\"lcpCloudRegionId\":\"n6\"}}}",
+    "responseBody": null,
+    "lastModifiedBy": "BPMN",
+    "modifyTime": 1482413428000,
+    "requestType": null,
+    "volumeGroupId": null,
+    "volumeGroupName": null,
+    "vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+    "vfModuleName": null,
+    "vfModuleModelName": "test::base::module-0",
+    "aaiServiceId": null,
+    "aicCloudRegion": "n6",
+    "callBackUrl": null,
+    "correlator": null,
+    "serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+    "serviceInstanceName": null,
+    "requestScope": "vfModule",
+    "requestAction": "deleteInstance",
+    "networkId": null,
+    "networkName": null,
+    "networkType": null,
+    "requestorId": null,
+    "configurationId": null,
+    "configurationName": null,
+    "operationalEnvId": null,
+    "operationalEnvName": null,
+    "requestURI": "00032ab7-na18-42e5-965d-8ea592502018"
+  },
+  {
+    "requestId": "5ffbabd6-b793-4377-a1ab-082670fbc7ac",
+    "clientRequestId": "5ffbabd6-b793-4377-a1ab-082670fbc7ac",
+    "action": "deleteInstance",
+    "requestStatus": "UNLOCKED",
+    "statusMessage": "Vf Module deletion pending.",
+    "progress": 0,
+    "startTime": 1482413394000,
+    "endTime": 1482413428000,
+    "source": "VID",
+    "vnfId": "b92f60c8-8de3-46c1-8dc1-e4390ac2b005",
+    "vnfName": null,
+    "vnfType": null,
+    "serviceType": null,
+    "aicNodeClli": null,
+    "tenantId": "6accefef3cb442ff9e644d589fb04107",
+    "provStatus": null,
+    "vnfParams": null,
+    "vnfOutputs": null,
+    "requestBody": "{\"requestDetails\": {\"modelInfo\": {\"modelType\": \"vfModule\",\"modelName\": \"test::base::module-0\",\"modelVersionId\": \"20c4431c-246d-11e7-93ae-92361f002671\",\"modelInvariantId\": \"78ca26d0-246d-11e7-93ae-92361f002671\",\"modelVersion\": \"2\",\"modelCustomizationId\": \"cb82ffd8-252a-11e7-93ae-92361f002671\"},\"cloudConfiguration\": {\"lcpCloudRegionId\": \"n6\",\"tenantId\": \"0422ffb57ba042c0800a29dc85ca70f8\"},\"requestInfo\": {\"instanceName\": \"MSO-DEV-VF-1806BB-v10-base-it2-1\",\"source\": \"VID\",\"suppressRollback\": false,\"requestorId\": \"xxxxxx\"},\"relatedInstanceList\": [{\"relatedInstance\": {\"instanceId\": \"76fa8849-4c98-473f-b431-2590b192a653\",\"modelInfo\": {\"modelType\": \"service\",\"modelName\": \"Infra_v10_Service\",\"modelVersionId\": \"5df8b6de-2083-11e7-93ae-92361f002671\",\"modelInvariantId\": \"9647dfc4-2083-11e7-93ae-92361f002671\",\"modelVersion\": \"1.0\"}}},{\"relatedInstance\": {\"instanceId\": \"d57970e1-5075-48a5-ac5e-75f2d6e10f4c\",\"modelInfo\": {\"modelType\": \"vnf\",\"modelName\": \"v10\",\"modelVersionId\": \"ff2ae348-214a-11e7-93ae-92361f002671\",\"modelInvariantId\": \"2fff5b20-214b-11e7-93ae-92361f002671\",\"modelVersion\": \"1.0\",\"modelCustomizationId\": \"68dc9a92-214c-11e7-93ae-92361f002671\",\"modelCustomizationName\": \"v10 1\"}}}],\"requestParameters\": {\"usePreload\": true,\"userParams\": []}}}",
+    "responseBody": null,
+    "lastModifiedBy": "APIH",
+    "modifyTime": 1532945341000,
+    "requestType": null,
+    "volumeGroupId": null,
+    "volumeGroupName": null,
+    "vfModuleId": "c7d527b1-7a91-49fd-b97d-1c8c0f4a7992",
+    "vfModuleName": null,
+    "vfModuleModelName": "test::base::module-0",
+    "aaiServiceId": null,
+    "aicCloudRegion": "n6",
+    "callBackUrl": null,
+    "correlator": null,
+    "serviceInstanceId": "e3b5744d-2ad1-4cdd-8390-c999a38829bc",
+    "serviceInstanceName": null,
+    "requestScope": "vfModule",
+    "requestAction": "deleteInstance",
+    "networkId": null,
+    "networkName": null,
+    "networkType": null,
+    "requestorId": null,
+    "configurationId": null,
+    "configurationName": null,
+    "operationalEnvId": null,
+    "operationalEnvName": null,
+    "requestURI": "5ffbabd6-b793-4377-a1ab-082670fbc7ac"
+  }
+]