mso is not updating the vip in aai for the vnf

Update JUnits for multiple invocation argument verifications
Implement delete mechanism for network policies and vnf adapter params
in AAI.
Fix a JUnit for getNetworkPolicy().
Implement creation of network policies and setting of
openstack-provided params for vf module in AAI
CreateNetworkPolicies in AAI functionality update
Add the plumbing for create network policy in AAI.
Enable VnfAdapterBB to return fqdn and management ip info

Change-Id: Id34fe088846a52dbafaf3e7c754bebada05f1bf1
Issue-ID: SO-1478
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

7 files changed, 236 insertions, 5 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java
index e2caaf2a67..f47781082d 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAICreateTasks.java
@@ -22,7 +22,9 @@ package org.onap.so.bpmn.infrastructure.aai.tasks;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.TreeSet;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.camunda.bpm.engine.delegate.BpmnError;
@@ -35,6 +37,7 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.InstanceGroup;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.LineOfBusiness;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.NetworkPolicy;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.OwningEntity;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Platform;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Project;
@@ -44,6 +47,9 @@ import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
 import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
 import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
 import org.onap.so.bpmn.servicedecomposition.tasks.ExtractPojosForBB;
+import org.onap.so.client.aai.AAIObjectPlurals;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.client.exception.BBObjectNotFoundException;
 import org.onap.so.client.exception.ExceptionBuilder;
 import org.onap.so.client.orchestration.AAIConfigurationResources;
@@ -69,6 +75,9 @@ public class AAICreateTasks {
 	
 	private static final String networkTypeProvider = "PROVIDER";
 	private static String NETWORK_COLLECTION_NAME = "networkCollectionName";
+	private static String CONTRAIL_NETWORK_POLICY_FQDN_LIST = "contrailNetworkPolicyFqdnList";
+	private static String HEAT_STACK_ID = "heatStackId";
+	private static String NETWORK_POLICY_FQDN_PARAM = "network-policy-fqdn";
 	@Autowired
 	private AAIServiceInstanceResources aaiSIResources;
 	@Autowired
@@ -440,6 +449,38 @@ public class AAICreateTasks {
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
 		}
 	}
+	
+	public void createNetworkPolicies(BuildingBlockExecution execution) {
+		try{			
+			String fqdns = execution.getVariable(CONTRAIL_NETWORK_POLICY_FQDN_LIST);
+			if (fqdns != null && !fqdns.isEmpty()) {
+				String fqdnList[] = fqdns.split(",");
+				int fqdnCount = fqdnList.length;
+				if (fqdnCount > 0) {
+					for (int i=0; i < fqdnCount; i++) {
+						String fqdn = fqdnList[i];
+						AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectPlurals.NETWORK_POLICY);
+						uri.queryParam(NETWORK_POLICY_FQDN_PARAM, fqdn);
+						Optional<org.onap.aai.domain.yang.NetworkPolicy> oNetPolicy = aaiNetworkResources.getNetworkPolicy(uri);
+						if(!oNetPolicy.isPresent()) {								
+							msoLogger.debug("This network policy FQDN is not in AAI yet: " + fqdn);									
+							String networkPolicyId = UUID.randomUUID().toString();
+							msoLogger.debug("Adding network-policy with network-policy-id " + networkPolicyId);
+							NetworkPolicy networkPolicy = new NetworkPolicy();
+							networkPolicy.setNetworkPolicyId(networkPolicyId);
+							networkPolicy.setNetworkPolicyFqdn(fqdn);
+							networkPolicy.setHeatStackId(execution.getVariable(HEAT_STACK_ID));
+									
+							aaiNetworkResources.createNetworkPolicy(networkPolicy);
+						}
+					}
+				}
+			}			
+		} catch (Exception ex) {
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+		}		
+	}
+	
 	/**
 	 * Groups existing vf modules by the model uuid of our new vf module and returns the lowest unused index
 	 * 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIDeleteTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIDeleteTasks.java
index a00806a19c..8f0334e462 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIDeleteTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIDeleteTasks.java
@@ -21,16 +21,23 @@
 package org.onap.so.bpmn.infrastructure.aai.tasks;
 
 
+import java.util.Optional;
+import java.util.UUID;
+
 import org.onap.so.bpmn.common.BuildingBlockExecution;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.CloudRegion;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.Configuration;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.L3Network;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.NetworkPolicy;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
 import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
 import org.onap.so.bpmn.servicedecomposition.tasks.ExtractPojosForBB;
+import org.onap.so.client.aai.AAIObjectPlurals;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.client.exception.ExceptionBuilder;
 import org.onap.so.client.orchestration.AAIConfigurationResources;
 import org.onap.so.client.orchestration.AAINetworkResources;
@@ -38,11 +45,16 @@ import org.onap.so.client.orchestration.AAIServiceInstanceResources;
 import org.onap.so.client.orchestration.AAIVfModuleResources;
 import org.onap.so.client.orchestration.AAIVnfResources;
 import org.onap.so.client.orchestration.AAIVolumeGroupResources;
+import org.onap.so.logger.MsoLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class AAIDeleteTasks {
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, AAIDeleteTasks.class);
+	
+	private static String CONTRAIL_NETWORK_POLICY_FQDN_LIST = "contrailNetworkPolicyFqdnList";
+	private static String NETWORK_POLICY_FQDN_PARAM = "network-policy-fqdn";
 	
 	@Autowired
 	private ExceptionBuilder exceptionUtil;
@@ -145,4 +157,30 @@ public class AAIDeleteTasks {
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
 		}
 	}
+	
+	public void deleteNetworkPolicies(BuildingBlockExecution execution) {
+		try{			
+			String fqdns = execution.getVariable(CONTRAIL_NETWORK_POLICY_FQDN_LIST);
+			if (fqdns != null && !fqdns.isEmpty()) {
+				String fqdnList[] = fqdns.split(",");
+				int fqdnCount = fqdnList.length;
+				if (fqdnCount > 0) {
+					for (int i=0; i < fqdnCount; i++) {
+						String fqdn = fqdnList[i];
+						AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectPlurals.NETWORK_POLICY);
+						uri.queryParam(NETWORK_POLICY_FQDN_PARAM, fqdn);
+						Optional<org.onap.aai.domain.yang.NetworkPolicy> oNetPolicy = aaiNetworkResources.getNetworkPolicy(uri);
+						if(oNetPolicy.isPresent()) {
+							String networkPolicyId = oNetPolicy.get().getNetworkPolicyId();
+							msoLogger.debug("Deleting network-policy with network-policy-id " + networkPolicyId);							
+							
+							aaiNetworkResources.deleteNetworkPolicy(networkPolicyId);
+						}
+					}
+				}
+			}			
+		} catch (Exception ex) {
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+		}		
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java
index ed6379a6a4..5176bee0d6 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasks.java
@@ -449,4 +449,53 @@ public class AAIUpdateTasks {
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
 		}
 	}
+	
+	public void updateIpv4OamAddressVnf(BuildingBlockExecution execution) {
+		try {
+			String ipv4OamAddress = execution.getVariable("oamManagementV4Address");
+			if (ipv4OamAddress != null) {
+				GenericVnf genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+				GenericVnf copiedGenericVnf = genericVnf.shallowCopyId();
+			
+				genericVnf.setIpv4OamAddress(ipv4OamAddress);	
+				copiedGenericVnf.setIpv4OamAddress(ipv4OamAddress);		
+
+				aaiVnfResources.updateObjectVnf(copiedGenericVnf);
+			}
+		} catch(Exception ex) {
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+		}
+	}
+	
+	public void updateManagementV6AddressVnf(BuildingBlockExecution execution) {
+		try {
+			String managementV6Address = execution.getVariable("oamManagementV6Address");
+			if (managementV6Address != null) {
+				GenericVnf genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+				GenericVnf copiedGenericVnf = genericVnf.shallowCopyId();
+			
+				genericVnf.setManagementV6Address(managementV6Address);	
+				copiedGenericVnf.setManagementV6Address(managementV6Address);		
+
+				aaiVnfResources.updateObjectVnf(copiedGenericVnf);
+			}
+		} catch(Exception ex) {
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+		}
+	}
+	
+	public void updateContrailServiceInstanceFqdnVfModule(BuildingBlockExecution execution) {		
+		try {
+			String contrailServiceInstanceFqdn = execution.getVariable("contrailServiceInstanceFqdn");
+			if (contrailServiceInstanceFqdn != null) {
+				VfModule vfModule = extractPojosForBB.extractByKey(execution, ResourceKey.VF_MODULE_ID, execution.getLookupMap().get(ResourceKey.VF_MODULE_ID));
+				GenericVnf vnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+				vfModule.setContrailServiceInstanceFqdn(contrailServiceInstanceFqdn);
+				aaiVfModuleResources.updateContrailServiceInstanceFqdnVfModule(vfModule, vnf);
+			}
+		} catch (Exception ex) {
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+		}
+	}
+	
 }
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnf/tasks/VnfAdapterImpl.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnf/tasks/VnfAdapterImpl.java
index f1a9e955b6..0851dc9d95 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnf/tasks/VnfAdapterImpl.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnf/tasks/VnfAdapterImpl.java
@@ -26,6 +26,7 @@ import org.onap.so.adapters.vnfrest.CreateVolumeGroupResponse;
 import org.onap.so.adapters.vnfrest.DeleteVfModuleResponse;
 import org.onap.so.adapters.vnfrest.DeleteVolumeGroupResponse;
 import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.VfModule;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.VolumeGroup;
@@ -47,10 +48,18 @@ import javax.xml.bind.Unmarshaller;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.sax.SAXSource;
 import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class VnfAdapterImpl {
-	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterCreateTasks.class);
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, VnfAdapterImpl.class);
+	private static final String CONTRAIL_SERVICE_INSTANCE_FQDN = "contrailServiceInstanceFqdn";
+	private static final String OAM_MANAGEMENT_V4_ADDRESS = "oamManagementV4Address";
+	private static final String OAM_MANAGEMENT_V6_ADDRESS = "oamManagementV6Address";
+	private static final String CONTRAIL_NETWORK_POLICY_FQDN_LIST = "contrailNetworkPolicyFqdnList";
 	
 	@Autowired
 	private ExtractPojosForBB extractPojosForBB;
@@ -65,6 +74,10 @@ public class VnfAdapterImpl {
 			execution.setVariable("mso-request-id", gBBInput.getRequestContext().getMsoRequestId());
 			execution.setVariable("mso-service-instance-id", serviceInstance.getServiceInstanceId());
 			execution.setVariable("heatStackId", null);
+			execution.setVariable(CONTRAIL_SERVICE_INSTANCE_FQDN, null);
+			execution.setVariable(OAM_MANAGEMENT_V4_ADDRESS, null);
+			execution.setVariable(OAM_MANAGEMENT_V6_ADDRESS, null);
+			execution.setVariable(CONTRAIL_NETWORK_POLICY_FQDN_LIST, null);			
 		} catch (Exception ex) {
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
 		}
@@ -79,15 +92,36 @@ public class VnfAdapterImpl {
                     VfModule vfModule = extractPojosForBB.extractByKey(execution, ResourceKey.VF_MODULE_ID, execution.getLookupMap().get(ResourceKey.VF_MODULE_ID));
                     String heatStackId = ((CreateVfModuleResponse) vnfRestResponse).getVfModuleStackId();
                     if(!StringUtils.isEmpty(heatStackId)) {
-                        vfModule.setHeatStackId(heatStackId);
+                        vfModule.setHeatStackId(heatStackId);                        
                         execution.setVariable("heatStackId", heatStackId);
                     }
+                    Map<String,String> vfModuleOutputs = ((CreateVfModuleResponse) vnfRestResponse).getVfModuleOutputs();
+                    if (vfModuleOutputs != null) {
+                    	processVfModuleOutputs(execution, vfModuleOutputs);
+                    }
                 } else if(vnfRestResponse instanceof DeleteVfModuleResponse) {
                     VfModule vfModule = extractPojosForBB.extractByKey(execution, ResourceKey.VF_MODULE_ID, execution.getLookupMap().get(ResourceKey.VF_MODULE_ID));
+                    GenericVnf genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
                     Boolean vfModuleDelete = ((DeleteVfModuleResponse) vnfRestResponse).getVfModuleDeleted();
                     if(null!= vfModuleDelete && vfModuleDelete) {
                         vfModule.setHeatStackId(null);
                         execution.setVariable("heatStackId", null);
+                        Map<String,String> vfModuleOutputs = ((DeleteVfModuleResponse) vnfRestResponse).getVfModuleOutputs();
+                        if (vfModuleOutputs != null) {
+                        	processVfModuleOutputs(execution, vfModuleOutputs);
+                        	if (execution.getVariable(OAM_MANAGEMENT_V4_ADDRESS) != null) {
+                        		genericVnf.setIpv4OamAddress("");
+                        		execution.setVariable(OAM_MANAGEMENT_V4_ADDRESS, "");                        		
+                        	}
+                        	if (execution.getVariable(OAM_MANAGEMENT_V6_ADDRESS) != null) {
+                        		genericVnf.setManagementV6Address("");
+                        		execution.setVariable(OAM_MANAGEMENT_V6_ADDRESS, "");                        		
+                        	}
+                        	if (execution.getVariable(CONTRAIL_SERVICE_INSTANCE_FQDN) != null) {
+                        		vfModule.setContrailServiceInstanceFqdn("");
+                        		execution.setVariable(CONTRAIL_SERVICE_INSTANCE_FQDN, "");
+                        	}                        	
+                        }
                     }
                 } else if(vnfRestResponse instanceof CreateVolumeGroupResponse) {
                     VolumeGroup volumeGroup = extractPojosForBB.extractByKey(execution, ResourceKey.VOLUME_GROUP_ID, execution.getLookupMap().get(ResourceKey.VOLUME_GROUP_ID));
@@ -108,7 +142,7 @@ public class VnfAdapterImpl {
                 }
             }
 		} catch (Exception ex) {
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);			
 		}
 	}
 
@@ -133,4 +167,49 @@ public class VnfAdapterImpl {
             throw new MarshallerException("Error parsing VNF Adapter response. " + e.getMessage(), MsoLogger.ErrorCode.SchemaError.getValue(), e);
         }
     }
+    
+    private void processVfModuleOutputs(BuildingBlockExecution execution, Map<String,String> vfModuleOutputs) {
+    	if (vfModuleOutputs == null) {
+    		return;
+    	}
+    	try {
+	    	VfModule vfModule = extractPojosForBB.extractByKey(execution, ResourceKey.VF_MODULE_ID, execution.getLookupMap().get(ResourceKey.VF_MODULE_ID));
+	    	GenericVnf genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID, execution.getLookupMap().get(ResourceKey.GENERIC_VNF_ID));
+	    	List<String> contrailNetworkPolicyFqdnList = new ArrayList<String>();
+	    	Iterator<String> keys = vfModuleOutputs.keySet().iterator();
+	    	while (keys.hasNext()) {
+	    		String key = keys.next();	    		
+	    		if (key.equals("contrail-service-instance-fqdn")) {
+					String contrailServiceInstanceFqdn = vfModuleOutputs.get(key);				
+					msoLogger.debug("Obtained contrailServiceInstanceFqdn: " + contrailServiceInstanceFqdn);
+					vfModule.setContrailServiceInstanceFqdn(contrailServiceInstanceFqdn);
+					execution.setVariable(CONTRAIL_SERVICE_INSTANCE_FQDN, contrailServiceInstanceFqdn);
+				}
+				else if (key.endsWith("contrail_network_policy_fqdn")) {
+					String contrailNetworkPolicyFqdn = vfModuleOutputs.get(key);
+					msoLogger.debug("Obtained contrailNetworkPolicyFqdn: " + contrailNetworkPolicyFqdn);
+					contrailNetworkPolicyFqdnList.add(contrailNetworkPolicyFqdn);
+				}
+				else if (key.equals("oam_management_v4_address")) {
+					String oamManagementV4Address = vfModuleOutputs.get(key);
+					msoLogger.debug("Obtained oamManagementV4Address: " + oamManagementV4Address);
+					genericVnf.setIpv4OamAddress(oamManagementV4Address);
+					execution.setVariable(OAM_MANAGEMENT_V4_ADDRESS, oamManagementV4Address);
+				}
+				else if (key.equals("oam_management_v6_address")) {
+					String oamManagementV6Address = vfModuleOutputs.get(key);
+					msoLogger.debug("Obtained oamManagementV6Address: " + oamManagementV6Address);
+					genericVnf.setManagementV6Address(oamManagementV6Address);
+					execution.setVariable(OAM_MANAGEMENT_V6_ADDRESS, oamManagementV6Address);
+				}
+	    		
+	    		if (!contrailNetworkPolicyFqdnList.isEmpty()) {
+					execution.setVariable(CONTRAIL_NETWORK_POLICY_FQDN_LIST, String.join(",", contrailNetworkPolicyFqdnList));
+				}
+	    	}
+    	} catch (Exception ex) {
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+		}
+    	
+    }
 }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java
index c895566ca5..c8eeaa7a2b 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/aai/mapper/AAIObjectMapper.java
@@ -302,4 +302,8 @@ public class AAIObjectMapper {
 	public org.onap.aai.domain.yang.Subnet mapSubnet (Subnet subnet){
 		return modelMapper.map(subnet,org.onap.aai.domain.yang.Subnet.class);
 	}
+	
+	public org.onap.aai.domain.yang.NetworkPolicy mapNetworkPolicy (NetworkPolicy networkPolicy){
+		return modelMapper.map(networkPolicy,org.onap.aai.domain.yang.NetworkPolicy.class);
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAINetworkResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAINetworkResources.java
index d2bf95a28e..4ca3f2a78d 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAINetworkResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAINetworkResources.java
@@ -45,6 +45,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class AAINetworkResources {
+	
 	@Autowired
 	private InjectionHelper injectionHelper;
 
@@ -171,6 +172,16 @@ public class AAINetworkResources {
 		AAIResourceUri instanceGroupURI = AAIUriFactory.createResourceUri(AAIObjectType.INSTANCE_GROUP, instanceGroup.getId());
 		injectionHelper.getAaiClient().delete(instanceGroupURI);
 	}
-
-
+	
+	public void createNetworkPolicy(org.onap.so.bpmn.servicedecomposition.bbobjects.NetworkPolicy networkPolicy) {
+		NetworkPolicy aaiNetworkPolicy = aaiObjectMapper.mapNetworkPolicy(networkPolicy);
+		String networkPolicyId = networkPolicy.getNetworkPolicyId();
+		AAIResourceUri netUri = AAIUriFactory.createResourceUri(AAIObjectType.NETWORK_POLICY, networkPolicyId);
+		injectionHelper.getAaiClient().create(netUri, aaiNetworkPolicy);
+	}
+	
+	public void deleteNetworkPolicy(String networkPolicyId) {
+		AAIResourceUri networkPolicyURI = AAIUriFactory.createResourceUri(AAIObjectType.NETWORK_POLICY, networkPolicyId);
+		injectionHelper.getAaiClient().delete(networkPolicyURI);
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIVfModuleResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIVfModuleResources.java
index a641d43ba3..ef61319eee 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIVfModuleResources.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/AAIVfModuleResources.java
@@ -76,6 +76,15 @@ public class AAIVfModuleResources {
 		injectionHelper.getAaiClient().update(vfModuleURI, aaiVfModule);
 	}
 	
+	public void updateContrailServiceInstanceFqdnVfModule(VfModule vfModule, GenericVnf vnf) {
+		AAIResourceUri vfModuleURI = AAIUriFactory.createResourceUri(AAIObjectType.VF_MODULE, vnf.getVnfId(), vfModule.getVfModuleId());
+		VfModule copiedVfModule = vfModule.shallowCopyId();
+		
+		copiedVfModule.setContrailServiceInstanceFqdn(vfModule.getContrailServiceInstanceFqdn());
+		org.onap.aai.domain.yang.VfModule aaiVfModule = aaiObjectMapper.mapVfModule(copiedVfModule);
+		injectionHelper.getAaiClient().update(vfModuleURI, aaiVfModule);
+	}
+	
 	public void changeAssignVfModule(VfModule vfModule, GenericVnf vnf) {
 		AAIResourceUri vfModuleURI = AAIUriFactory.createResourceUri(AAIObjectType.VF_MODULE, vnf.getVnfId(), vfModule.getVfModuleId());
 		org.onap.aai.domain.yang.VfModule AAIVfModule = aaiObjectMapper.mapVfModule(vfModule);