Merge "fixed bug in createvnfinfra bpmn"

1 files changed, 14 insertions, 0 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/aai/AAICreateResources.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/aai/AAICreateResources.java
index 93ba0ae5a4..3d05f76b03 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/aai/AAICreateResources.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/aai/AAICreateResources.java
@@ -24,8 +24,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
+import org.onap.aai.domain.yang.v12.GenericVnf;
 import org.openecomp.mso.client.aai.AAIObjectType;
 import org.openecomp.mso.client.aai.AAIResourcesClient;
+import org.openecomp.mso.client.aai.entities.AAIResultWrapper;
 import org.openecomp.mso.client.aai.entities.uri.AAIResourceUri;
 import org.openecomp.mso.client.aai.entities.uri.AAIUriFactory;
 
@@ -81,4 +83,16 @@ public class AAICreateResources {
 		aaiRC.createIfNotExists(serviceInstanceURI, Optional.empty());
 	}
 	
+	public Optional<GenericVnf> getVnfInstance(String vnfId){
+		try{
+			AAIResourceUri vnfURI = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
+			AAIResourcesClient aaiRC = new AAIResourcesClient();
+			AAIResultWrapper aaiResponse = aaiRC.get(vnfURI);
+			Optional<GenericVnf> vnf = aaiResponse.asBean(GenericVnf.class);
+			return vnf;
+		} catch (Exception ex){
+			return Optional.empty();
+		}
+	}
+	
 }