RA: Support for using allocated number in the entity id

Issue-ID: CCSDK-3977
Change-Id: Iaf1275edee3ca8c6593263c7f3f7c4684aae0d97
Signed-off-by: Stan Bonev <sb5356@att.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/adaptors/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/RangeUtil.java b/adaptors/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/RangeUtil.java
index 2e378f1aa..77600b46b 100644
--- a/adaptors/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/RangeUtil.java
+++ b/adaptors/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/RangeUtil.java
@@ -122,8 +122,8 @@ public class RangeUtil {
             rai.resourceKey.assetId = req.assetId;
             rai.resourceKey.resourceName = req.resourceName;
             rai.applicationId = req.applicationId;
-            rai.resourceSetId = req.resourceSetId;
-            rai.resourceUnionId = req.resourceUnionId;
+            rai.resourceSetId = req.resourceSetId = replaceNumber(req.resourceSetId, requestedNumbers);
+            rai.resourceUnionId = req.resourceUnionId = replaceNumber(req.resourceUnionId, requestedNumbers);
             rai.resourceShareGroupList = req.resourceShareGroupList;
             rai.used = requestedNumbers;
 
@@ -142,6 +142,13 @@ public class RangeUtil {
         recalculate(rr);
     }
 
+    private static String replaceNumber(String s, SortedSet<Integer> numbers) {
+        if (s == null || numbers == null || numbers.isEmpty()) {
+            return s;
+        }
+        return s.replaceAll("\\$\\{n\\}", numbers.first().toString());
+    }
+
     private static boolean eq(Object o1, Object o2) {
         return o1 == null ? o2 == null : o1.equals(o2);
     }