Refactor OofHomingV2

Refactor OofHomingV2 Java
to working state and fix IT tests.

Issue-ID: SO-1469
Change-Id: I8647058adf5ed41c5bebebee79f9dbc4d80c2974
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

4 files changed, 277 insertions, 0 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest1Vpn.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest1Vpn.json
new file mode 100644
index 0000000000..99ce7fb2bf
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest1Vpn.json
@@ -0,0 +1,58 @@
+{
+  "requestInfo":{
+    "transactionId":"requestId",
+    "requestId":"requestId",
+    "callbackUrl":"http://localhost:28080/mso/WorkflowMesssage/OofResponse/requestId",
+    "sourceId":"mso",
+    "requestType":"create",
+    "numSolutions":1,
+    "optimizers":[ "placement" ],
+    "timeout":1800
+  },
+  "serviceInfo":{
+    "serviceInstanceId":"testServiceInstanceId1",
+    "serviceName":"testServiceType1",
+    "modelInfo":{
+      "modelInvariantId":"testModelInvariantUUID1",
+      "modelVersionId":"testModelUUID1",
+      "modelName":"testModelName1",
+      "modelVersion":"testModelVersion1"
+    }
+  },
+  "placementInfo":{
+    "requestParameters":{
+      "customerLatitude":"customerLatitude",
+      "customerLongitude":"customerLongitude",
+      "customerName":"testCustomerName"
+    },
+    "subscriberInfo":{
+      "globalSubscriberId":"testCustomerId",
+      "subscriberName":"testCustomerName"
+    },
+    "placementDemands":[
+      {
+        "resourceModuleName":"testProxyInstanceName1",
+        "serviceResourceId":"testProxyId1",
+        "resourceModelInfo":{
+          "modelInvariantId":"testProxyModelInvariantUuid1",
+          "modelVersionId":"testProxyModelUuid1",
+          "modelName":"testProxyModelName1",
+          "modelVersion":"testProxyModelVersion1"
+        }
+      },
+      {
+        "resourceModuleName":"testProxyInstanceName2",
+        "serviceResourceId":"testProxyId2",
+        "resourceModelInfo":{
+          "modelInvariantId":"testProxyModelInvariantUuid2",
+          "modelVersionId":"testProxyModelUuid2",
+          "modelName":"testProxyModelName2",
+          "modelVersion":"testProxyModelVersion2"
+        }
+      }
+    ]
+  },
+  "licenseInfo":{
+    "licenseDemands" : [ ]
+  }
+}
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest1VpnOpt.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest1VpnOpt.json
new file mode 100644
index 0000000000..d149b328df
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest1VpnOpt.json
@@ -0,0 +1,61 @@
+{
+  "requestInfo" : {
+    "transactionId" : "requestId",
+    "requestId" : "requestId",
+    "callbackUrl" : "http://localhost:28080/mso/WorkflowMesssage/OofResponse/requestId",
+    "sourceId" : "mso",
+    "requestType" : "create",
+    "numSolutions" : 1,
+    "optimizers" : [ "placement" ],
+    "timeout" : 1800
+  },
+  "serviceInfo" : {
+    "serviceInstanceId" : "serviceInstanceId",
+    "serviceName" : "serviceName",
+    "modelInfo" : {
+      "modelType" : "modelType-Service",
+      "modelInvariantId" : "modelInvariantId-Service",
+      "modelVersionId" : "modelVersionId-Service",
+      "modelName" : "modelName-Service",
+      "modelVersion" : "modelVersion-Service",
+      "modelCustomizationName" : "modelCustomizationName-Service"
+    }
+  },
+  "placementInfo" : {
+    "requestParameters" : {
+      "customerLatitude" : "customerLatitude",
+      "customerLongitude" : "customerLongitude",
+      "customerName" : "customerName"
+    },
+    "subscriberInfo" : {
+      "globalSubscriberId" : "globalSubscriberId",
+      "subscriberName" : "subscriberName"
+    },
+    "placementDemands" : [ {
+      "serviceResourceId" : "testProxyId1",
+      "resourceModuleName" : "testProxyInstanceName1",
+      "resourceModelInfo" : {
+        "modelName" : "testProxyModelName1",
+        "modelVersionId" : "testProxyModelUuid1",
+        "modelVersion" : "testProxyModelVersion1",
+        "modelInvariantId" : "testProxyModelInvariantUuid1"
+      }
+    }, {
+      "serviceResourceId" : "testProxyId2",
+      "resourceModuleName" : "testProxyInstanceName2",
+      "resourceModelInfo" : {
+        "modelName" : "testProxyModelName2",
+        "modelVersionId" : "testProxyModelUuid2",
+        "modelVersion" : "testProxyModelVersion2",
+        "modelInvariantId" : "testProxyModelInvariantUuid2"
+      },
+      "requiredCandidates" : [ {
+        "identifierType" : "vnfId",
+        "identifiers" : [ "testVnfId" ]
+      } ]
+    } ]
+  },
+  "licenseInfo" : {
+    "licenseDemands" : [ ]
+  }
+}
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest3Ar.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest3Ar.json
new file mode 100644
index 0000000000..9b251aac9a
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest3Ar.json
@@ -0,0 +1,67 @@
+{
+  "requestInfo" : {
+    "transactionId" : "requestId",
+    "requestId" : "requestId",
+    "callbackUrl" : "http://localhost:28080/mso/WorkflowMesssage/OofResponse/requestId",
+    "sourceId" : "mso",
+    "requestType" : "create",
+    "numSolutions" : 1,
+    "optimizers" : [ "placement" ],
+    "timeout" : 1800
+  },
+  "serviceInfo" : {
+    "serviceInstanceId" : "testServiceInstanceId1",
+    "serviceName" : "testServiceType1",
+    "modelInfo" : {
+      "modelInvariantId" : "testModelInvariantUUID1",
+      "modelVersionId" : "testModelUUID1",
+      "modelName" : "testModelName1",
+      "modelVersion" : "testModelVersion1"
+    }
+  },
+  "placementInfo" : {
+    "requestParameters": {
+      "customerLatitude": "customerLatitude",
+      "customerLongitude": "customerLongitude",
+      "customerName": "testCustomerName"
+    },
+    "subscriberInfo": {
+      "globalSubscriberId" : "testCustomerId",
+      "subscriberName" : "testCustomerName"
+    },
+    "placementDemands": [
+      {
+        "serviceResourceId": "testAllottedResourceId1",
+        "resourceModuleName": "testAllottedModelInstanceName1",
+        "resourceModelInfo": {
+          "modelName": "testAllottedModelName1",
+          "modelVersionId": "testAllottedModelUuid1",
+          "modelVersion": "testAllottedModelVersion1",
+          "modelInvariantId": "testAllottedModelInvariantUuid1"
+        }
+      },
+      {
+        "serviceResourceId": "testAllottedResourceId2",
+        "resourceModuleName": "testAllottedModelInstanceName2",
+        "resourceModelInfo": {
+          "modelName": "testAllottedModelName2",
+          "modelVersionId": "testAllottedModelUuid2",
+          "modelVersion": "testAllottedModelVersion2",
+          "modelInvariantId": "testAllottedModelInvariantUuid2"
+        }
+      },
+      {
+        "serviceResourceId": "testAllottedResourceId3",
+        "resourceModuleName": "testAllottedModelInstanceName3",
+        "resourceModelInfo": {
+          "modelName": "testAllottedModelName3",
+          "modelVersionId": "testAllottedModelUuid3",
+          "modelVersion": "testAllottedModelVersion3",
+          "modelInvariantId": "testAllottedModelInvariantUuid3"
+        }
+      } ]
+  },
+  "licenseInfo" : {
+    "licenseDemands" : [ ]
+  }
+}
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest3Vpn.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest3Vpn.json
new file mode 100644
index 0000000000..e3a735df00
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/OofHoming/oofRequest3Vpn.json
@@ -0,0 +1,91 @@
+{
+  "requestInfo" : {
+    "transactionId" : "requestId",
+    "requestId" : "requestId",
+    "callbackUrl" : "http://localhost:28080/mso/WorkflowMesssage/OofResponse/requestId",
+    "sourceId" : "mso",
+    "requestType" : "create",
+    "numSolutions" : 1,
+    "optimizers" : [ "placement" ],
+    "timeout" : 1800
+  },
+  "serviceInfo" : {
+    "serviceInstanceId" : "testServiceInstanceId1",
+    "serviceName" : "testServiceType1",
+    "modelInfo":{
+      "modelInvariantId":"testModelInvariantUUID1",
+      "modelVersionId":"testModelUUID1",
+      "modelName":"testModelName1",
+      "modelVersion":"testModelVersion1"
+    }
+  },
+  "placementInfo" : {
+    "requestParameters" : {
+      "customerLatitude" : "customerLatitude",
+      "customerLongitude" : "customerLongitude",
+      "customerName" : "testCustomerName"
+    },
+    "subscriberInfo" : {
+      "globalSubscriberId" : "testCustomerId",
+      "subscriberName" : "testCustomerName"
+    },
+    "placementDemands" : [ {
+      "resourceModuleName" : "testProxyInstanceName1",
+      "serviceResourceId" : "testProxyId1",
+      "resourceModelInfo" : {
+        "modelInvariantId" : "testProxyModelInvariantUuid1",
+        "modelVersionId" : "testProxyModelUuid1",
+        "modelName" : "testProxyModelName1",
+        "modelVersion" : "testProxyModelVersion1"
+      }
+    }, {
+      "resourceModuleName" : "testProxyInstanceName2",
+      "serviceResourceId" : "testProxyId2",
+      "resourceModelInfo" : {
+        "modelInvariantId" : "testProxyModelInvariantUuid2",
+        "modelVersionId" : "testProxyModelUuid2",
+        "modelName" : "testProxyModelName2",
+        "modelVersion" : "testProxyModelVersion2"
+      }
+    }, {
+      "resourceModuleName" : "testProxyInstanceName1",
+      "serviceResourceId" : "testProxyId1",
+      "resourceModelInfo" : {
+        "modelInvariantId" : "testProxyModelInvariantUuid1",
+        "modelVersionId" : "testProxyModelUuid1",
+        "modelName" : "testProxyModelName1",
+        "modelVersion" : "testProxyModelVersion1"
+      }
+    }, {
+      "resourceModuleName" : "testProxyInstanceName2",
+      "serviceResourceId" : "testProxyId2",
+      "resourceModelInfo" : {
+        "modelInvariantId" : "testProxyModelInvariantUuid2",
+        "modelVersionId" : "testProxyModelUuid2",
+        "modelName" : "testProxyModelName2",
+        "modelVersion" : "testProxyModelVersion2"
+      }
+    }, {
+      "resourceModuleName" : "testProxyInstanceName1",
+      "serviceResourceId" : "testProxyId1",
+      "resourceModelInfo" : {
+        "modelInvariantId" : "testProxyModelInvariantUuid1",
+        "modelVersionId" : "testProxyModelUuid1",
+        "modelName" : "testProxyModelName1",
+        "modelVersion" : "testProxyModelVersion1"
+      }
+    }, {
+      "resourceModuleName" : "testProxyInstanceName2",
+      "serviceResourceId" : "testProxyId2",
+      "resourceModelInfo" : {
+        "modelInvariantId" : "testProxyModelInvariantUuid2",
+        "modelVersionId" : "testProxyModelUuid2",
+        "modelName" : "testProxyModelName2",
+        "modelVersion" : "testProxyModelVersion2"
+      }
+    } ]
+  },
+  "licenseInfo" : {
+    "licenseDemands" : [ ]
+  }
+}