summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStan Bonev <sb5356@att.com>2019-03-19 15:19:35 -0400
committerStan Bonev <sb5356@att.com>2019-03-19 15:19:35 -0400
commit9be37c03ba6296c07d9910079061542d8160a9fc (patch)
tree31bd7f5a60ed9a376b30e95a1ef6e50c98ddc521
parentee0ce402da3f81ef339a2f18442fea071425935e (diff)
RA: Fix Problems with resource query results
Change-Id: Ic0fa65bff95ab5bd8ab65b055dcf7ec378e99d91 Issue-ID: CCSDK-1170 Signed-off-by: Stan Bonev <sb5356@att.com>
-rw-r--r--resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java
index ab73dab1..57796768 100644
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java
@@ -221,6 +221,9 @@ public class EndPointAllocatorImpl implements EndPointAllocator {
List<Resource> rlist = resourceManager.queryResources(resourceName, assetIdFilter);
for (Resource r : rlist) {
+ if (r.allocationItems == null || r.allocationItems.isEmpty()) {
+ continue;
+ }
log.info("ResourceName:" + r.resourceKey.resourceName + " assetId:" + r.resourceKey.assetId);
@@ -252,7 +255,7 @@ public class EndPointAllocatorImpl implements EndPointAllocator {
r = resourceManager.getResource(resourceName, assetId);
}
- if (r != null) {
+ if (r != null && r.allocationItems != null && !r.allocationItems.isEmpty()) {
log.info("ResourceName:" + r.resourceKey.resourceName + " assetId:" + r.resourceKey.assetId);
ResourceData rd = getResourceData(r);