1 files changed, 20 insertions, 10 deletions
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
index 4d9dbda9..95672ea5 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
@@ -718,16 +718,26 @@ public class SdncUebCallback implements INotificationCallback {
 			}
 		}
 		
-		// Ingest Allotted Resource Data - 1707
-		List<NodeTemplate> arNodeTemplatesList = sdcCsarHelper.getAllottedResources();
-
-		for (NodeTemplate nodeTemplate :  arNodeTemplatesList) {
-			
-			try {
-				SdncARModel nodeModel = new SdncARModel (sdcCsarHelper, nodeTemplate, jdbcDataSource);
-				nodeModel.insertAllottedResourceModelData ();
-			} catch (IOException e) {
-				deployStatus = DistributionStatusEnum.DEPLOY_ERROR;
+		// Ingest Allotted Resource Data - 1707 / migrate to getEntity - 1908
+		// Use getEntity to get all VFs in the service filter by metadata Category = Allotted Resource 
+		EntityQuery vfEntityQuery = EntityQuery.newBuilder(SdcTypes.VF).build();
+		TopologyTemplateQuery vfTopologyTemplateQuery = TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE).build();
+		List<IEntityDetails> vfEntities = sdcCsarHelper.getEntity(vfEntityQuery, vfTopologyTemplateQuery, true);
+		if (vfEntities != null) {
+			for (IEntityDetails vfEntity : vfEntities){
+
+				// If this VF has metadata Category: Allotted Resource, insert it into ALLOTTED_RESOURCE_MODEL table
+				String vfCategory = SdncBaseModel.extractValue(sdcCsarHelper, vfEntity.getMetadata(), "category");
+				if (vfCategory.contains("Allotted Resource")) {
+					
+					try {
+						SdncARModel arModel = new SdncARModel (sdcCsarHelper, vfEntity, jdbcDataSource, config);
+						arModel.insertAllottedResourceModelData ();
+						arModel.insertAllottedResourceVfcModelData();
+					} catch (IOException e) {
+						deployStatus = DistributionStatusEnum.DEPLOY_ERROR;
+					}		
+				}		
 			}
 		}