Fix OOF serviceResourceId bug

- Works around a bug in OOF
where OOF does not return a serviceResourceId
with homing solutions. SO uses serviceResourceId
to match a homing deman to a homing request.
This patch addes resourceModuleName as another
way to match a demand to a request, as currently
OOF needs this to be unique.

- Changes SO homing processing of key cloudRegionId to
key locationId as this is now the key used for cloudRegionId
in solutions sent back from OOF

Issue-ID: OPTFRA-249
Change-Id: I8e5d9244a227ea4d3d061a758f202144bac270ce
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf
index 808723828a..53cd70c514 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/BuildingBlocks/oofCallback2AR1Vnf
@@ -54,7 +54,7 @@
                         "value": "False"
                     },
                     {
-                        "key": "cloudRegionId",
+                        "key": "locationId",
                         "value": "dfwtx"
                     }
                 ]
@@ -79,7 +79,7 @@
                         "value": "False"
                     },
                     {
-                        "key": "cloudRegionId",
+                        "key": "locationId",
                         "value": "testCloudRegionId2"
                     }
                 ]
@@ -100,7 +100,7 @@
                             "value": "aic"
                         },
                         {
-                            "key": "cloudRegionId",
+                            "key": "locationId",
                             "value": "testCloudRegionId3"
                         },
                         {   "key":"flavors",