commit 9ea575f58802c09141b427cf584120d6c43c0559
author Dan Timoney <dtimoney@att.com> Fri Mar 22 20:59:51 2019 +0000
committer Gerrit Code Review <gerrit@onap.org> Fri Mar 22 20:59:51 2019 +0000
tree 328a117a04b8c15d9ff6c153f30eafbce33212e2
parent 1f3c718338364db35ef73f1dedbe5a1679172f78
parent 9be37c03ba6296c07d9910079061542d8160a9fc

Merge "RA: Fix Problems with resource query results"

resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java

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 ab73dab..5779676 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 @@
         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 @@
             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);