Fix OOF Homing Interface

- Update homing request build to send
correct request to OOF
- Use nfFunction field as resourceModuleName
requires updating nfFunction fields
during vcpeRestCust service creation in SDC
- Fix No Solution Error from OOF
- Made subscriber info and cloud info optional as OOF Homing does
not require it
- Update Homing Requests for AR to provide vgMuxInfra
modelInfo instead of vgmuxAR modelInfo as required by OOF

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

2 files changed, 42 insertions, 24 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
index 283f3c6116..1f64fb55f8 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/OofHomingTest.java
@@ -41,6 +41,7 @@ import org.openecomp.mso.bpmn.mock.FileUtil;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -97,7 +98,7 @@ public class OofHomingTest extends WorkflowTest {
         List<AllottedResource> arList = new ArrayList<AllottedResource>();
         AllottedResource ar = new AllottedResource();
         ar.setResourceId("testResourceIdAR");
-        ar.setResourceInstanceName("testARInstanceName");
+        ar.setNfFunction("testARFunctionName");
         ModelInfo arModel = new ModelInfo();
         arModel.setModelCustomizationUuid("testModelCustomizationUuidAR");
         arModel.setModelInvariantUuid("testModelInvariantIdAR");
@@ -108,7 +109,7 @@ public class OofHomingTest extends WorkflowTest {
         ar.setModelInfo(arModel);
         AllottedResource ar2 = new AllottedResource();
         ar2.setResourceId("testResourceIdAR2");
-        ar2.setResourceInstanceName("testAR2InstanceName");
+        ar2.setNfFunction("testAR2FunctionName");
         ModelInfo arModel2 = new ModelInfo();
         arModel2.setModelCustomizationUuid("testModelCustomizationUuidAR2");
         arModel2.setModelInvariantUuid("testModelInvariantIdAR2");
@@ -123,7 +124,7 @@ public class OofHomingTest extends WorkflowTest {
         List<VnfResource> vnfList = new ArrayList<VnfResource>();
         VnfResource vnf = new VnfResource();
         vnf.setResourceId("testResourceIdVNF");
-        vnf.setResourceInstanceName("testVnfInstanceName");
+        vnf.setNfFunction("testVnfFunctionName");
         ArrayList<CloudFlavor> flavors = new ArrayList<>();
         CloudFlavor flavor1 = new CloudFlavor("flavorLabel1xxx", "vimFlavorxxx");
         CloudFlavor flavor2 = new CloudFlavor("flavorLabel2xxx", "vimFlavorxxx");
@@ -478,9 +479,9 @@ public class OofHomingTest extends WorkflowTest {
         //Get Variables
         WorkflowException workflowException = (WorkflowException) getVariableFromHistory(businessKey,
                 "WorkflowException");
-
-        assertEquals("WorkflowException[processKey=Homing,errorCode=400,errorMessage=No solution found " +
-                "for plan 08e1b8cf-144a-4bac-b293-d5e2eedc97e8]", workflowException.toString());
+        Boolean errorMatch = workflowException.toString().contains("WorkflowException[processKey=Homing,errorCode=400,errorMessage=OOF Async Callback " +
+                        "Response contains error: Unable to find any candidate for demand *** Response:");
+        assert(errorMatch);
     }
 
     @Test
@@ -546,7 +547,8 @@ public class OofHomingTest extends WorkflowTest {
         variables.put("customerLocation", customerLocation);
         variables.put("cloudOwner", "amazon");
         variables.put("cloudRegionId", "TNZED");
-        variables.put("isDebugLogEnabled", "true");
+        variables.put("vgMuxInfraModelInvariantId", "testModelInvariantIdAR");
+        variables.put("vgMuxInfraModelId", "testArModelUuid");
         //	variables.put("mso-request-id", "testRequestId");
         variables.put("msoRequestId", "testRequestId");
         variables.put("serviceInstanceId", "testServiceInstanceId123");
@@ -589,6 +591,8 @@ public class OofHomingTest extends WorkflowTest {
         variables.put("customerLocation", customerLocation);
         variables.put("cloudOwner", "amazon");
         variables.put("cloudRegionId", "TNZED");
+        variables.put("vgMuxInfraModelInvariantId", "testModelInvariantIdAR");
+        variables.put("vgMuxInfraModelId", "testArModelUuid");
         variables.put("isDebugLogEnabled", "true");
         variables.put("msoRequestId", "testRequestId");
         variables.put("serviceInstanceId", "testServiceInstanceId123");
@@ -609,6 +613,8 @@ public class OofHomingTest extends WorkflowTest {
         variables.put("customerLocation", customerLocation);
         variables.put("cloudOwner", "amazon");
         variables.put("cloudRegionId", "TNZED");
+        variables.put("vgMuxInfraModelInvariantId", "testModelInvariantIdAR");
+        variables.put("vgMuxInfraModelId", "testArModelUuid");
         variables.put("isDebugLogEnabled", "true");
         //	variables.put("mso-request-id", "testRequestId");
         variables.put("msoRequestId", "testRequestId");
@@ -720,16 +726,20 @@ public class OofHomingTest extends WorkflowTest {
                 "\"timeout\":600},\"placementInfo\":{\"requestParameters\":{\"customerLatitude\":" +
                 "\"32.89748\",\"customerLongitude\":\"-97.040443\",\"customerName\":\"xyz\"},\"subscriberInfo\":" +
                 "{\"globalSubscriberId\":\"SUB12_0322_DS_1201\",\"subscriberName\":\"SUB_12_0322_DS_1201\"," +
-                "\"subscriberCommonSiteId\":\"\"},\"placementDemands\":[{\"resourceModuleName\":\"ALLOTTED_RESOURCE\"" +
+                "\"subscriberCommonSiteId\":\"\"},\"placementDemands\":[{\"resourceModuleName\":\"testARFunctionName\"" +
                 ",\"serviceResourceId\":\"testResourceIdAR\",\"tenantId\":" +
-                "\"\",\"resourceModelInfo\":{\"modelInvariantId\":\"testModelInvariantIdAR\"," +
-                "\"modelVersionId\":\"testARModelUuid\",\"modelName\":\"testModelNameAR\",\"modelType\":" +
-                "\"testModelTypeAR\",\"modelVersion\":\"testModelVersionAR\",\"modelCustomizationName\":\"\"}}," +
-                "{\"resourceModuleName\":\"ALLOTTED_RESOURCE\",\"serviceResourceId\":\"testResourceIdAR2\"," +
-                "\"tenantId\":\"\",\"resourceModelInfo\":{\"modelInvariantId\":\"testModelInvariantIdAR2\"," +
-                "\"modelVersionId\":\"testAr2ModelUuid\",\"modelName\":\"testModelNameAR2\"," +
-                "\"modelType\":\"testModelTypeAR2\",\"modelVersion\":\"testModelVersionAR2\"," +
-                "\"modelCustomizationName\":\"\"}}]},\"serviceInfo\":" +
+                "\"\",\"resourceModelInfo\":{\"modelInvariantId\":\"no-resourceModelInvariantId\"," +
+                "\"modelVersionId\":\"no-resourceModelVersionId\",\"modelName\":\"\",\"modelType\":" +
+                "\"\",\"modelVersion\":\"\",\"modelCustomizationName\":\"\"}}," +
+                "{\"resourceModuleName\":\"testAR2FunctionName\",\"serviceResourceId\":\"testResourceIdAR2\"," +
+                "\"tenantId\":\"\",\"resourceModelInfo\":{\"modelInvariantId\":\"no-resourceModelInvariantId\"," +
+                "\"modelVersionId\":\"no-resourceModelVersionId\",\"modelName\":\"\"," +
+                "\"modelType\":\"\",\"modelVersion\":\"\"," +
+                "\"modelCustomizationName\":\"\"}},{\"resourceModuleName\":\"testVnfFunctionName\",\"serviceResourceId\":\"" +
+                "testResourceIdVNF\",\"tenantId\":\"\",\"resourceModelInfo\":{\"modelInvariantId\"" +
+                ":\"testModelInvariantIdVNF\",\"modelVersionId\":\"testVnfModelUuid\",\"modelName\":\"" +
+                "testModelNameVNF\",\"modelType\":\"testModelTypeVNF\",\"modelVersion\":\"testModelVersionVNF\"" +
+                ",\"modelCustomizationName\":\"\"}}]},\"serviceInfo\":" +
                 "{\"serviceInstanceId\":\"testServiceInstanceId123\"," +
                 "\"serviceName\":\"testServiceName\",\"modelInfo\":{\"modelType\":\"\",\"modelInvariantId\":" +
                 "\"testModelInvariantId\",\"modelVersionId\":\"testModelUuid\",\"modelName\":\"testModelName\"," +
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackNoSolutionFound b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackNoSolutionFound
index 8bb29f0c0a..2024df401b 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackNoSolutionFound
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallbackNoSolutionFound
@@ -1,10 +1,18 @@
 {
-  "solutions": {
-    "placementSolutions": [],
-    "licenseSolutions": []
-  },
-  "transactionId": "08e1b8cf-144a-4bac-b293-d5e2eedc97e8",
-  "requestId": "02c2e322-5839-4c97-9d46-0a5fa6bb642e",
-  "requestStatus": "completed",
-  "statusMessage": "No solution found for plan 08e1b8cf-144a-4bac-b293-d5e2eedc97e8"
+  "plans":[
+    {
+      "name":"356fdb73-cef2-4dda-8865-31fd6733d6e4",
+      "message":"Unable to find any candidate for demand vGW",
+      "links":[
+        [
+          {
+            "rel":"self",
+            "href":"http://172.17.0.6:8091/v1/plans/1c15e194-6df5-43fe-a5ff-42e6093b8ddd"
+          }
+        ]
+      ],
+      "id":"1c15e194-6df5-43fe-a5ff-42e6093b8ddd",
+      "status":"error"
+    }
+  ]
 }
\ No newline at end of file