summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStan Bonev (sb5356) <sb5356@att.com>2024-01-10 11:05:12 -0500
committerDan Timoney <dtimoney@att.com>2024-01-10 18:04:19 +0000
commitdadb477abb5bb028d75234b61ae8940dc33cc01b (patch)
tree0f8ca3d77dcfb3d607d13c10eb5b5549a6539922
parentbe5b3329b7c55a8db731eddd39f9e35c0c4ebd68 (diff)
RA: Support for using allocated number in the entity idlondon
Issue-ID: CCSDK-3977 Change-Id: Iaf1275edee3ca8c6593263c7f3f7c4684aae0d97 Signed-off-by: Stan Bonev <sb5356@att.com> (cherry picked from commit e65b8638cb888f66d3c03f5507a804ff07851e0e)
-rw-r--r--adaptors/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/RangeUtil.java11
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);
}