[MSO-8] Additional fixes for the second rebase

DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file
not reloaded properly when it's wrong (JSON error or model hierarchy
mistake) at MSO startup

Change-Id: I2853030b78499e2a761706b643ea210955e72de3
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

[MSO-8] Restore files removed in patch set 2

Those groovy files must be there

Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

124 files changed, 15910 insertions, 18801 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java
index abcea2d..929dd5a 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java
@@ -32,19 +32,19 @@ import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.annotate.JsonRootName;
-
+import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoLogger;
+import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound;
 
 /**
  * JavaBean JSON class for a CloudConfig. This bean maps a JSON-format cloud
  * configuration file to Java. The CloudConfig contains information about
- * Openstack cloud configurations (in particular for the NVP/AIC cloud).
- * It includes:
- * - CloudIdentity objects, representing DCP nodes (Openstack Identity Service)
+ * Openstack cloud configurations. It includes: 
+ * - CloudIdentity objects,representing DCP nodes (Openstack Identity Service) 
  * - CloudSite objects, representing LCP nodes (Openstack Compute & other services)
  *
- * Note that this is only used to access Cloud Configurations loaded from a
- * JSON config file, so there are no explicit property setters.
+ * Note that this is only used to access Cloud Configurations loaded from a JSON
+ * config file, so there are no explicit property setters.
  *
  * This class also contains methods to query cloud sites and/or identity
  * services by ID.
@@ -54,209 +54,246 @@ import org.openecomp.mso.logger.MsoLogger;
 @JsonRootName("cloud_config")
 public class CloudConfig {
 
+    private boolean                    validCloudConfig = false;
     @JsonProperty("identity_services")
-    private Map <String, CloudIdentity> identityServices = new HashMap <String, CloudIdentity> ();
+    private Map<String, CloudIdentity> identityServices = new HashMap<String, CloudIdentity>();
     @JsonProperty("cloud_sites")
-    private Map <String, CloudSite> cloudSites = new HashMap <String, CloudSite> ();
+    private Map<String, CloudSite>     cloudSites       = new HashMap<String, CloudSite>();
 
-    private static ObjectMapper mapper = new ObjectMapper ();
+    private static ObjectMapper        mapper           = new ObjectMapper();
 
-    private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+    private static final MsoLogger     LOGGER           = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
 
-    protected String configFilePath;
+    protected String                   configFilePath;
 
-    protected int refreshTimerInMinutes;
+    protected int                      refreshTimerInMinutes;
 
-    public CloudConfig () {
-    	 mapper.enable (DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
-         mapper.enable (DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+    public CloudConfig() {
+        mapper.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+        mapper.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
     }
 
-	/**
-	 * Get a Map of all IdentityServices that have been loaded.
-	 * @return the Map
-	 */
-    public synchronized Map <String, CloudIdentity> getIdentityServices () {
+    /**
+     * Get a Map of all IdentityServices that have been loaded.
+     * 
+     * @return the Map
+     */
+    public synchronized Map<String, CloudIdentity> getIdentityServices() {
         return identityServices;
     }
 
-	/**
-	 * Get a Map of all CloudSites that have been loaded.
-	 * @return the Map
-	 */
-	public synchronized Map <String, CloudSite> getCloudSites () {
-		return cloudSites;
-	}
-
-	/**
-	 * Get a specific CloudSites, based on an ID.  The ID is first checked against
-	 * the regions, and if no match is found there, then against individual entries
-	 * to try and find one with a CLLI that matches the ID and an AIC version of 2.5.
-	 * @param id the ID to match
-	 * @return a CloudSite, or null of no match found
-	 */
-	public synchronized CloudSite getCloudSite (String id) {
-		if (id != null) {
-			if (cloudSites.containsKey (id)) {
-				return cloudSites.get (id);
-			}
-			// check for id == CLLI now as well
-			return getCloudSiteWithClli(id, "2.5");
-		}
-		return null;
-	}
-
-	/**
-	 * Get a specific CloudSites, based on a CLLI and (optional) version, which will be matched
-	 * against the aic_version field of the CloudSite.
-	 * @param clli the CLLI to match
-	 * @param version the version to match; may be null in which case any version matches
-	 * @return a CloudSite, or null of no match found
-	 */
-	public synchronized CloudSite getCloudSiteWithClli(String clli, String version) {
-		if (clli != null) {
-	        // New with 1610 - find cloud site called "DEFAULT" - return that object, 
-	        // with the name modified to match what they asked for. We're looping thru
-			// the cloud sites anyway - so save off the default one in case we need it.
-			CloudSite defaultCloudSite = null;
-	        for (CloudSite cs : cloudSites.values()) {
-	        	if (cs.getClli() != null && clli.equals(cs.getClli())) {
-	        		if (version == null || version.equals(cs.getAic_version())) {
-	            		return cs;
-	        		}
-	        	} else if (cs.getId().equalsIgnoreCase("default")) {
-	        		// save it off in case we need it
-	        		defaultCloudSite = cs.clone();
-	        	}
-	        }
-	        // If we get here - we didn't find a match - so return the default cloud site
+    /**
+     * Get a Map of all CloudSites that have been loaded.
+     * 
+     * @return the Map
+     */
+    public synchronized Map<String, CloudSite> getCloudSites() {
+        return cloudSites;
+    }
+
+    /**
+     * Get a specific CloudSites, based on an ID. The ID is first checked
+     * against the regions, and if no match is found there, then against
+     * individual entries to try and find one with a CLLI that matches the ID
+     * and an AIC version of 2.5.
+     * 
+     * @param id
+     *            the ID to match
+     * @return a CloudSite, or null of no match found
+     */
+    public synchronized CloudSite getCloudSite(String id) {
+        if (id != null) {
+            if (cloudSites.containsKey(id)) {
+                return cloudSites.get(id);
+            }
+            // check for id == CLLI now as well
+            return getCloudSiteWithClli(id, "2.5");
+        }
+        return null;
+    }
+
+    /**
+     * Get a specific CloudSites, based on a CLLI and (optional) version, which
+     * will be matched against the aic_version field of the CloudSite.
+     * 
+     * @param clli
+     *            the CLLI to match
+     * @param version
+     *            the version to match; may be null in which case any version
+     *            matches
+     * @return a CloudSite, or null of no match found
+     */
+    public synchronized CloudSite getCloudSiteWithClli(String clli, String version) {
+        if (clli != null) {
+            // New with 1610 - find cloud site called "DEFAULT" - return that
+            // object,with the name modified to match what they asked for. We're
+            // looping thru the cloud sites anyway - so save off the default one in case we
+            // need it.
+            CloudSite defaultCloudSite = null;
+            for (CloudSite cs : cloudSites.values()) {
+                if (cs.getClli() != null && clli.equals(cs.getClli())) {
+                    if (version == null || version.equals(cs.getAic_version())) {
+                        return cs;
+                    }
+                } else if (cs.getId().equalsIgnoreCase("default")) {
+                    // save it off in case we need it
+                    defaultCloudSite = cs.clone();
+                }
+            }
+            // If we get here - we didn't find a match - so return the default
+            // cloud site
             if (defaultCloudSite != null) {
                 defaultCloudSite.setRegionId(clli);
                 defaultCloudSite.setId(clli);
             }
-	        return defaultCloudSite;
-		}
+            return defaultCloudSite;
+        }
         return null;
-	}
-
-	/**
-	 * Get a specific CloudIdentity, based on an ID.
-	 * @param id the ID to match
-	 * @return a CloudIdentity, or null of no match found
-	 */
-	public synchronized CloudIdentity getIdentityService (String id) {
-		if (identityServices.containsKey (id)) {
-			return identityServices.get (id);
-		}
-		return null;
-	}
-
-    protected synchronized void reloadPropertiesFile() throws JsonParseException, JsonMappingException, IOException  {
-		this.loadCloudConfig(this.configFilePath, this.refreshTimerInMinutes);
-	}
-
-    protected synchronized void loadCloudConfig (String configFile, int refreshTimer) throws JsonParseException, JsonMappingException, IOException {
- 
-    	FileReader reader=null;
-    	configFilePath=configFile;
-    	this.refreshTimerInMinutes = refreshTimer;
- 
-    	CloudConfig cloudConfig = null;
- 
-    	try {
-    		reader = new FileReader (configFile);
-	        // Parse the JSON input into a CloudConfig
-
-	        cloudConfig = mapper.readValue (reader, CloudConfig.class);
-
-	        this.cloudSites = cloudConfig.cloudSites;
-	        this.identityServices = cloudConfig.identityServices;
-
-	        // Copy Cloud Identity IDs to CloudIdentity objects
-	        for (Entry <String, CloudIdentity> entry : cloudConfig.getIdentityServices ().entrySet ()) {
-	            entry.getValue ().setId (entry.getKey ());
-	        }
-
-	        // Copy Cloud Site IDs to CloudSite objects, and set up internal
-	        // pointers to their corresponding identity service.
-	        for (Entry <String, CloudSite> entry : cloudConfig.getCloudSites ().entrySet ()) {
-	            CloudSite s = entry.getValue ();
-	            s.setId (entry.getKey ());
-	            s.setIdentityService (cloudConfig.getIdentityService (s.getIdentityServiceId ()));
-	        }
-    	} finally {
-    		try {
-				if (reader != null) {
-					reader.close();
-				}
-			} catch (IOException e) {
-				LOGGER.debug("Exception while closing reader for file:" + configFilePath, e);
-			}
-    	}
     }
 
-	public String getConfigFilePath() {
-		return configFilePath;
-	}
-
-	@Override
-	public synchronized CloudConfig clone() {
-		CloudConfig ccCopy = new CloudConfig();
-		for (Entry<String,CloudIdentity> e:identityServices.entrySet()) {
-
-			ccCopy.identityServices.put(e.getKey(), e.getValue().clone());
-		}
-
-		for (Entry<String,CloudSite> e:cloudSites.entrySet()) {
-
-			ccCopy.cloudSites.put(e.getKey(), e.getValue().clone());
-		}
-
-		ccCopy.configFilePath = this.configFilePath;
-
-		ccCopy.refreshTimerInMinutes = this.refreshTimerInMinutes;
-
-		return ccCopy;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((cloudSites == null) ? 0 : cloudSites.hashCode());
-		result = prime * result + ((configFilePath == null) ? 0 : configFilePath.hashCode());
-		result = prime * result + ((identityServices == null) ? 0 : identityServices.hashCode());
-		result = prime * result + refreshTimerInMinutes;
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		CloudConfig other = (CloudConfig) obj;
-		if (cloudSites == null) {
-			if (other.cloudSites != null)
-				return false;
-		} else if (!cloudSites.equals(other.cloudSites))
-			return false;
-		if (configFilePath == null) {
-			if (other.configFilePath != null)
-				return false;
-		} else if (!configFilePath.equals(other.configFilePath))
-			return false;
-		if (identityServices == null) {
-			if (other.identityServices != null)
-				return false;
-		} else if (!identityServices.equals(other.identityServices))
-			return false;
-		if (refreshTimerInMinutes != other.refreshTimerInMinutes)
-			return false;
-		return true;
-	}
-}
+    /**
+     * Get a specific CloudIdentity, based on an ID.
+     * 
+     * @param id
+     *            the ID to match
+     * @return a CloudIdentity, or null of no match found
+     */
+    public synchronized CloudIdentity getIdentityService(String id) {
+        if (identityServices.containsKey(id)) {
+            return identityServices.get(id);
+        }
+        return null;
+    }
+
+    protected synchronized void reloadPropertiesFile() throws JsonParseException, JsonMappingException, IOException, MsoCloudIdentityNotFound {
+        this.loadCloudConfig(this.configFilePath, this.refreshTimerInMinutes);
+    }
+
+    protected synchronized void loadCloudConfig(String configFile, int refreshTimer)
+            throws JsonParseException, JsonMappingException, IOException, MsoCloudIdentityNotFound {
+
+        FileReader reader = null;
+        configFilePath = configFile;
+        this.refreshTimerInMinutes = refreshTimer;
+
+        CloudConfig cloudConfig = null;
+        this.validCloudConfig=false;
+        
+        try {
+            reader = new FileReader(configFile);
+            // Parse the JSON input into a CloudConfig
+
+            cloudConfig = mapper.readValue(reader, CloudConfig.class);
+
+            this.cloudSites = cloudConfig.cloudSites;
+            this.identityServices = cloudConfig.identityServices;
+
+            // Copy Cloud Identity IDs to CloudIdentity objects
+            for (Entry<String, CloudIdentity> entry : cloudConfig.getIdentityServices().entrySet()) {
+                entry.getValue().setId(entry.getKey());
+            }
+
+            // Copy Cloud Site IDs to CloudSite objects, and set up internal
+            // pointers to their corresponding identity service.
+            for (Entry<String, CloudSite> entry : cloudConfig.getCloudSites().entrySet()) {
+                CloudSite s = entry.getValue();
+                s.setId(entry.getKey());
+                CloudIdentity cloudIdentity = cloudConfig.getIdentityService(s.getIdentityServiceId());
+                s.setIdentityService(cloudIdentity);
+                if (cloudIdentity == null) {
+                    throw new MsoCloudIdentityNotFound(s.getId()+" Cloud site refers to a non-existing identity service: "+s.getIdentityServiceId());
+                }
+            }
+            this.validCloudConfig=true;
+            
+        } finally {
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+            } catch (IOException e) {
+                LOGGER.debug("Exception while closing reader for file:" + configFilePath, e);
+            }
+        }
+    }
+
+    public String getConfigFilePath() {
+        return configFilePath;
+    }
+
+    /**
+     * @return the validCouldConfig
+     */
+    public synchronized boolean isValidCloudConfig() {
+        return validCloudConfig;
+    }
+
+    @Override
+    public synchronized CloudConfig clone() {
+        CloudConfig ccCopy = new CloudConfig();
+        for (Entry<String, CloudIdentity> e : identityServices.entrySet()) {
 
+            ccCopy.identityServices.put(e.getKey(), e.getValue().clone());
+        }
+
+        for (Entry<String, CloudSite> e : cloudSites.entrySet()) {
+
+            ccCopy.cloudSites.put(e.getKey(), e.getValue().clone());
+        }
+        ccCopy.configFilePath = this.configFilePath;
+        ccCopy.refreshTimerInMinutes = this.refreshTimerInMinutes;
+        ccCopy.validCloudConfig = this.validCloudConfig;
+        return ccCopy;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((cloudSites == null) ? 0 : cloudSites.hashCode());
+        result = prime * result + ((configFilePath == null) ? 0 : configFilePath.hashCode());
+        result = prime * result + ((identityServices == null) ? 0 : identityServices.hashCode());
+        result = prime * result + refreshTimerInMinutes;
+        result = prime * result + (validCloudConfig ? 1231 : 1237);
+        return result;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        CloudConfig other = (CloudConfig) obj;
+        if (cloudSites == null) {
+            if (other.cloudSites != null)
+                return false;
+        } else if (!cloudSites.equals(other.cloudSites))
+            return false;
+        if (configFilePath == null) {
+            if (other.configFilePath != null)
+                return false;
+        } else if (!configFilePath.equals(other.configFilePath))
+            return false;
+        if (identityServices == null) {
+            if (other.identityServices != null)
+                return false;
+        } else if (!identityServices.equals(other.identityServices))
+            return false;
+        if (refreshTimerInMinutes != other.refreshTimerInMinutes)
+            return false;
+        if (validCloudConfig != other.validCloudConfig)
+            return false;
+        return true;
+    }
+
+  
+}
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
index 6ee6721..688e554 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
@@ -41,6 +41,7 @@ import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 
 import org.openecomp.mso.logger.MsoLogger;
+import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound;
 import org.openecomp.mso.openstack.utils.MsoHeatUtils;
 import org.openecomp.mso.openstack.utils.MsoKeystoneUtils;
 import org.openecomp.mso.openstack.utils.MsoNeutronUtils;
@@ -77,7 +78,7 @@ public class CloudConfigFactory implements Serializable {
         }
     }
 
-    public void initializeCloudConfig (String filePath, int refreshTimer) {
+    public void initializeCloudConfig (String filePath, int refreshTimer) throws MsoCloudIdentityNotFound {
 
         rwl.writeLock ().lock ();
         try {
@@ -94,7 +95,7 @@ public class CloudConfigFactory implements Serializable {
         }
     }
 
-    public void changeMsoPropertiesFilePath (String newMsoPropPath) throws MsoPropertiesException {
+    public void changeMsoPropertiesFilePath (String newMsoPropPath) {
         rwl.writeLock ().lock ();
         try {
             CloudConfigFactory.cloudConfigCache.configFilePath = prefixMsoPropertiesPath + newMsoPropPath;
@@ -109,7 +110,11 @@ public class CloudConfigFactory implements Serializable {
     public CloudConfig getCloudConfig () {
         rwl.readLock ().lock ();
         try {
-            return cloudConfigCache.clone ();
+            if (cloudConfigCache.isValidCloudConfig()) {
+                return cloudConfigCache.clone ();
+            } else {
+                return new CloudConfig();
+            }
         } finally {
             rwl.readLock ().unlock ();
         }
@@ -139,7 +144,10 @@ public class CloudConfigFactory implements Serializable {
             try {
 
                 if (refreshTimer <= 1) {
-                	CloudConfig oldCloudConfig = cloudConfigCache.clone();
+                    CloudConfig oldCloudConfig = null;
+                    if (cloudConfigCache.isValidCloudConfig()) {
+                        oldCloudConfig = cloudConfigCache.clone();
+                    }
                     cloudConfigCache.reloadPropertiesFile ();
                     refreshTimer = cloudConfigCache.refreshTimerInMinutes;
                     if (!cloudConfigCache.equals(oldCloudConfig)) {
@@ -173,19 +181,22 @@ public class CloudConfigFactory implements Serializable {
     @Produces("text/plain")
     public Response showCloudConfig () {
         CloudConfig cloudConfig = this.getCloudConfig ();
-
-        StringBuffer response = new StringBuffer ();
-        response.append ("Cloud Sites:\n");
-        for (CloudSite site : cloudConfig.getCloudSites ().values ()) {
-            response.append (site.toString () + "\n");
-        }
-
-        response.append ("\n\nCloud Identity Services:\n");
-        for (CloudIdentity identity : cloudConfig.getIdentityServices ().values ()) {
-            response.append (identity.toString () + "\n");
+        if (cloudConfig != null) {
+            StringBuffer response = new StringBuffer ();
+            response.append ("Cloud Sites:\n");
+            for (CloudSite site : cloudConfig.getCloudSites ().values ()) {
+                response.append (site.toString () + "\n");
+            }
+    
+            response.append ("\n\nCloud Identity Services:\n");
+            for (CloudIdentity identity : cloudConfig.getIdentityServices ().values ()) {
+                response.append (identity.toString () + "\n");
+            }
+    
+            return Response.status (200).entity (response).build ();
+        } else {
+            return Response.status (500).entity ("Cloud Config has not been loaded properly, this could be due to a bad JSON structure (Check the logs for additional details)").build ();
         }
-
-        return Response.status (200).entity (response).build ();
     }
 
     @GET
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/exceptions/MsoCloudIdentityNotFound.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/exceptions/MsoCloudIdentityNotFound.java
new file mode 100644
index 0000000..b1fb92d
--- /dev/null
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/exceptions/MsoCloudIdentityNotFound.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.openstack.exceptions;
+
+
+/**
+ * Cloud site not found exception.
+ */
+public class MsoCloudIdentityNotFound extends MsoException {
+
+    /**
+     * Serialization id.
+     */
+    private static final long serialVersionUID = 2583769056266415665L;
+
+    /**
+     * Default constructor (needed for BPEL/JAXB)
+     */
+    public MsoCloudIdentityNotFound () {
+        super("Cloud Identity not found");
+        super.category=MsoExceptionCategory.USERDATA;
+    }
+
+    /**
+     * Constructor to create a new MsoOpenstackException instance
+     * @param cloudSite the cloud site
+     */
+    public MsoCloudIdentityNotFound (String cloudIdentity) {
+        // Set the detailed error as the Exception 'message'
+        super("Cloud Identity [" + cloudIdentity + "] not found");
+        super.category=MsoExceptionCategory.USERDATA;
+    }
+
+    @Override
+    public String toString () {
+        return getMessage();
+    }
+}
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java
index 6be668c..03771e7 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java
@@ -24,13 +24,17 @@ package org.openecomp.mso.adapter_utils.tests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import org.junit.BeforeClass;
+
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import java.util.Map;
 import org.openecomp.mso.cloud.CloudConfig;
 import org.openecomp.mso.cloud.CloudConfigFactory;
 import org.openecomp.mso.cloud.CloudIdentity;
 import org.openecomp.mso.cloud.CloudSite;
+import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound;
+
 
 
 /**
@@ -50,9 +54,10 @@ public class CloudConfigTest {
 	/**
     * This method is called before any test occurs.
     * It creates a fake tree from scratch
+	 * @throws MsoCloudIdentityNotFound 
     */
-   @BeforeClass
-   public static final void prepare () {
+   @Before
+   public final void prepare () throws MsoCloudIdentityNotFound {
 	   ClassLoader classLoader = CloudConfigTest.class.getClassLoader();
 	   String config = classLoader.getResource("cloud_config.json").toString().substring(5);
 
@@ -168,5 +173,35 @@ public class CloudConfigTest {
 	   CloudIdentity identity2  = con.getIdentityService("Test");
 	   assertNull(identity2);
    }
+   
+   @Test (expected = MsoCloudIdentityNotFound.class)
+   public final void testLoadWithWrongFile () throws MsoCloudIdentityNotFound {
+       ClassLoader classLoader = CloudConfigTest.class.getClassLoader();
+       String config = classLoader.getResource("cloud_config_bad.json").toString().substring(5);
+
+       cloudConfigFactory.initializeCloudConfig(config,1);
+   }
+   
+   @Test
+   public final void testReloadWithWrongFile () {
+       ClassLoader classLoader = CloudConfigTest.class.getClassLoader();
+       String config = classLoader.getResource("cloud_config_bad.json").toString().substring(5);
+
+       try {
+           cloudConfigFactory.initializeCloudConfig(config,1);
+           Assert.fail("MsoCloudIdentityNotFound was expected");
+       } catch (MsoCloudIdentityNotFound e) {
+           
+       }
+       Assert.assertTrue("Should be an empty CloudConfig", cloudConfigFactory.getCloudConfig().getCloudSites().isEmpty());
+       Assert.assertTrue("Should be an empty CloudConfig", cloudConfigFactory.getCloudConfig().getIdentityServices().isEmpty());
+       
+       // Now reload the right config
+       config = classLoader.getResource("cloud_config.json").toString().substring(5);
+       cloudConfigFactory.changeMsoPropertiesFilePath(config);
+       cloudConfigFactory.reloadCloudConfig();
+       Assert.assertTrue("Flag valid Config should be true now that the cloud_config is correct", cloudConfigFactory.getCloudConfig().isValidCloudConfig());
+
+   }
 
 }
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java
index 3427e42..b620ddc 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import org.openecomp.mso.cloud.CloudConfigFactory;
 import org.openecomp.mso.openstack.exceptions.MsoAdapterException;
+import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound;
 import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;
 import org.openecomp.mso.openstack.exceptions.MsoException;
 import org.openecomp.mso.openstack.exceptions.MsoIOException;
@@ -49,7 +50,7 @@ public class MsoHeatUtilsTest extends MsoCommonUtils {
 	public static MsoHeatUtils msoHeatUtils;
 
 	@BeforeClass
-	public static final void loadClasses() {
+	public static final void loadClasses() throws MsoCloudIdentityNotFound {
 		ClassLoader classLoader = CloudConfigTest.class.getClassLoader();
 		String config = classLoader.getResource("cloud_config.json").toString().substring(5);
 		cloudConfigFactory.initializeCloudConfig(config, 1);
diff --git a/adapters/mso-adapter-utils/src/test/resources/cloud_config_bad.json b/adapters/mso-adapter-utils/src/test/resources/cloud_config_bad.json
new file mode 100644
index 0000000..186b6c3
--- /dev/null
+++ b/adapters/mso-adapter-utils/src/test/resources/cloud_config_bad.json
@@ -0,0 +1,31 @@
+{ "cloud_config": {
+	"identity_services":
+	{
+		"MT_KEYSTONE":
+		{
+			"identity_url": "http://localhost:5000/v2.0",
+			"mso_id": "john",
+			"mso_pass": "FD205490A48D48475607C36B9AD902BF",
+			"admin_tenant": "admin",
+			"member_role": "_member_",
+			"tenant_metadata": false,
+			"identity_server_type": "KEYSTONE",
+			"identity_authentication_type": "RACKSPACE_APIKEY"
+		}
+	},
+	"cloud_sites":
+	{
+		"MT":
+		{
+			"region_id": "regionOne",
+			"clli": "MT",
+			"aic_version": "2.5",
+			"identity_service_id": "MT_KEYSTONE_NOT_EXISTING"
+		}
+	}
+}
+}
+
+
+
+
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java
index c873c92..55e6192 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java
@@ -78,9 +78,9 @@ public class SDNCAdapterRestImpl {
 		String operation = "";
 	    try {
 
-	    	reqId = headers.getRequestHeader("att-mso-request-id").get(0);
-	    	action = headers.getRequestHeader("att-mso-request-action").get(0);
-	    	operation = headers.getRequestHeader("att-mso-request-operation").get(0);
+	    	reqId = headers.getRequestHeader("mso-request-id").get(0);
+	    	action = headers.getRequestHeader("mso-request-action").get(0);
+	    	operation = headers.getRequestHeader("mso-request-operation").get(0);
 
 	    	MsoLogger.setLogContext(reqId, "");
 
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java
index c4ed50a..1f8e211 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java
@@ -82,8 +82,8 @@ public class SDNCAdapterRest {
 	@Produces({MediaType.APPLICATION_JSON})
 	public Response service(
 			SDNCServiceRequest request,
-			@HeaderParam(value="att-mso-request-id") String msoRequestId,
-			@HeaderParam(value="att-mso-service-instance-id") String msoServiceInstanceId) {
+			@HeaderParam(value="mso-request-id") String msoRequestId,
+			@HeaderParam(value="mso-service-instance-id") String msoServiceInstanceId) {
 
 		MsoLogger.setLogContext(msoRequestId, msoServiceInstanceId);
 
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
index e2ed1a3..5f28cb4 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
@@ -68,11 +68,11 @@ public class VfResourceInstaller implements IVfResourceInstaller {
 	@Override
 	public boolean isResourceAlreadyDeployed(VfResourceStructure vfResourceStruct)
 			throws ArtifactInstallerException {
-
+	
 		boolean status = false;
 		VfResourceStructure vfResourceStructure = (VfResourceStructure)vfResourceStruct;
 
-        try(CatalogDatabase db = new CatalogDatabase()) {
+        	try(CatalogDatabase db = new CatalogDatabase()) {
 
 			String resourceType = vfResourceStruct.getResourceInstance().getResourceType();
 			String category = vfResourceStruct.getResourceInstance().getCategory();
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtil.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtil.groovy
index 95a577c..b50bf68 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtil.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtil.groovy
@@ -27,17 +27,19 @@ import org.openecomp.mso.rest.RESTClient
 import org.openecomp.mso.rest.RESTConfig

 

 class AaiUtil {

-	

+

 	public MsoUtils utils = new MsoUtils()

-	public static final String AAI_NAMESPACE_STRING = 'http://org.openecomp.aai.inventory/'

+	public static final String AAI_NAMESPACE_STRING_KEY = 'URN_mso_workflow_global_default_aai_namespace'

 	public static final String DEFAULT_VERSION_KEY = 'URN_mso_workflow_global_default_aai_version'

-	

+

+	private String aaiNamespace = null;

+	 

 	private AbstractServiceTaskProcessor taskProcessor

 

 	public AaiUtil(AbstractServiceTaskProcessor taskProcessor) {

 		this.taskProcessor = taskProcessor

 	}

-	

+

 	public String getNetworkGenericVnfEndpoint(Execution execution) {

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		String endpoint = execution.getVariable("URN_aai_endpoint")

@@ -52,7 +54,7 @@ class AaiUtil {
 		taskProcessor.logDebug('AaiUtil.getNetworkGenericVnfUri() - AAI URI: ' + uri, isDebugLogEnabled)

 		return uri

 	}

-		

+

 	public String getNetworkVpnBindingUri(Execution execution) {

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		def uri = getUri(execution, 'vpn_binding')

@@ -73,7 +75,7 @@ class AaiUtil {
 		taskProcessor.logDebug('AaiUtil.getNetworkTableReferencesUri() - AAI URI: ' + uri, isDebugLogEnabled)

 		return uri

 	}

-	

+

 	public String getNetworkVceUri(Execution execution) {

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		def uri = getUri(execution, 'vce')

@@ -110,7 +112,7 @@ class AaiUtil {
 		taskProcessor.logDebug('AaiUtil.getCloudInfrastructureCloudRegionEndpoint() - AAI endpoint: ' + endpoint + uri, isDebugLogEnabled)

 		return endpoint + uri

 	}

-	

+

 	public String getCloudInfrastructureCloudRegionUri(Execution execution) {

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		def uri = getUri(execution, 'cloud_region')

@@ -131,7 +133,7 @@ class AaiUtil {
 		taskProcessor.logDebug('AaiUtil.getSearchNodesQueryUri() - AAI URI: ' + uri, isDebugLogEnabled)

 		return uri

 	}

-	

+

 	public String getSearchNodesQueryEndpoint(Execution execution) {

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		String endpoint = execution.getVariable("URN_aai_endpoint")

@@ -139,7 +141,7 @@ class AaiUtil {
 		taskProcessor.logDebug('AaiUtil.getSearchNodesQueryEndpoint() - AAI endpoint: ' + endpoint + uri, isDebugLogEnabled)

 		return endpoint + uri

 	}

-	

+

 	public String getSearchGenericQueryUri(Execution execution) {

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		def uri = getUri(execution, 'generic_query')

@@ -151,37 +153,39 @@ class AaiUtil {
 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 

 		resourceName = resourceName.replaceAll('-', '_')

-		

+

 		def versionWithResourceKey = "URN_mso_workflow_default_aai_${resourceName}_version"

 		def versionWithProcessKey = "URN_mso_workflow_custom_${processKey}_aai_version"

 

 		def version = execution.getVariable(versionWithProcessKey)

 		if (version) {

 			taskProcessor.logDebug("AaiUtil.getVersion() - using flow specific ${versionWithProcessKey}=${version}", isDebugLogEnabled)

-			return version 

+			return version

 		}

-		

+

 		version = execution.getVariable(versionWithResourceKey)

 		if (version) {

 			taskProcessor.logDebug("AaiUtil.getVersion() - using resource specific ${versionWithResourceKey}=${version}", isDebugLogEnabled)

 			return version

 		}

-		

+

 		version = execution.getVariable(DEFAULT_VERSION_KEY)

 		if (version) {

 			taskProcessor.logDebug("AaiUtil.getVersion() - using default version ${DEFAULT_VERSION_KEY}=${version}", isDebugLogEnabled)

 			return version

 		}

-		

+

 		(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, "Internal Error: One of the following should be defined in MSO URN properties file: ${versionWithResourceKey}, ${versionWithProcessKey}, ${DEFAULT_VERSION_KEY}")

 	}

-	

+

 	public String getUri(Execution execution, resourceName) {

 

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		def processKey = taskProcessor.getMainProcessKey(execution)

-		

 		resourceName = resourceName.replaceAll('-', '_')

+

+		//set namespace

+		setNamespace(execution)

 		

 		// Check for flow+resource specific first

 		def key = "URN_mso_workflow_${processKey}_aai_${resourceName}_uri"

@@ -190,7 +194,7 @@ class AaiUtil {
 			taskProcessor.logDebug("AaiUtil.getUri() - using flow+resource specific key: ${key}=${uri}", isDebugLogEnabled)

 			return uri

 		}

-		

+

 		// Check for versioned key

 		def version = getVersion(execution, resourceName, processKey)

 		key = "URN_mso_workflow_default_aai_v${version}_${resourceName}_uri"

@@ -204,17 +208,80 @@ class AaiUtil {
 		(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + key + ' not defined in the MSO URN properties file')

 	}

 

+	public String setNamespace(Execution execution) {

+		def key = AAI_NAMESPACE_STRING_KEY

+		aaiNamespace = execution.getVariable(key)

+		if (aaiNamespace == null ) {

+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + key + ' not defined in the MSO URN properties file')

+		}

+	}

+	

+	/**

+	 * This method can be used for getting the building namespace out of uri.

+	 *  NOTE: A getUri() method needs to be invoked first.

+	 *        Alternative method is the getNamespaceFromUri(Execution execution, String uri)

+	 * return namespace (plus version from uri)

+	 *

+	 * @param url

+	 *

+	 * @return namespace

+	 */

+	

 	public String getNamespaceFromUri(String uri) {

-		String namespace = AAI_NAMESPACE_STRING

+		 if (aaiNamespace == null) {

+			throw new Exception('Internal Error: AAI Namespace has not been set yet. A getUri() method needs to be invoked first.')

+		}

+		String namespace = aaiNamespace

 		if(uri!=null){

-			return namespace + uri.substring(uri.indexOf("v"),  uri.indexOf("v")+2)

+			String version = getVersionFromUri(uri)

+			return namespace + "v"+version

 		}else{

 			return namespace

 		}

 	}

 

-

+	/**

+	 * This method can be used for building namespace with aai version out of uri.

+	 *   NOTE: 2 arguments: Execution execution & String uri

+	 * @param execution

+	 * @param url

+	 *

+	 * @return namespace

+	 */

+	public String getNamespaceFromUri(Execution execution, String uri) {

+	   String namespace = execution.getVariable(AAI_NAMESPACE_STRING_KEY)

+	   if (namespace == null ) {

+		   (new ExceptionUtil()).buildAndThrowWorkflowException(execution, 9999, 'Internal Error: AAI URI entry for ' + AAI_NAMESPACE_STRING_KEY + ' not defined in the MSO URN properties file')

+	   }

+	   if(uri!=null){

+		   String version = getVersionFromUri(uri)

+		   return namespace + "v"+version

+	   }else{

+		   return namespace

+	   }

+   }

+	

+	/**

+	 * This is used to extract the version from uri.

+	 *

+	 * @param uri

+	 *

+	 * @return version

+	 */

+	private String getVersionFromUri(String uri) {

+		def version = ""

+		def savedVersion = ""

+		for (int x=2; x<6; x++) {

+			version = uri.substring(uri.indexOf("v")+1,  uri.indexOf("v")+x)

+			if (!Character.isDigit(version.charAt(version.size()-1))) {

+				break

+			}

+			savedVersion = version

+		}

+		return savedVersion

+	}

 	

+

 	/**

 	 * This reusable method can be used for making AAI Get Calls. The url should

 	 * be passed as a parameter along with the execution.  The method will

@@ -232,16 +299,16 @@ class AaiUtil {
 			String uuid = UUID.randomUUID()

 			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

 			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-					

+			

 			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

 

 			RESTConfig config = new RESTConfig(url);

 			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");

-

+			

 			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

 				client.addAuthorizationHeader(basicAuthCred)

 			}

-

+			

 			APIResponse apiResponse = client.get()

 			return apiResponse

 

@@ -252,6 +319,7 @@ class AaiUtil {
 		taskProcessor.logDebug( "======== COMPLETED Execute AAI Get Process ======== ", isDebugEnabled)

 	}

 

+

 	/**

 	 * This reusable method can be used for making AAI httpPut Calls. The url should

 	 * be passed as a parameter along with the execution and payload.  The method will

@@ -287,7 +355,7 @@ class AaiUtil {
 		}

 		taskProcessor.logDebug( "======== Completed Execute AAI Put Process ======== ", isDebugEnabled)

 	}

-	

+

 	/**

 	 * This reusable method can be used for making AAI httpPatch Calls. The url should

 	 * be passed as a parameter along with the execution and payload.  The method will

@@ -345,7 +413,7 @@ class AaiUtil {
 			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

 

 			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

-			

+

 			RESTConfig config = new RESTConfig(url);

 			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");

 			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

@@ -379,8 +447,9 @@ class AaiUtil {
 		try{

 			String uuid = UUID.randomUUID()

 			taskProcessor.logDebug( "Generated uuid is: " + uuid, isDebugEnabled)

+

 			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

-			

+

 			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

 			RESTConfig config = new RESTConfig(url);

 			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml").addAuthorizationHeader(authHeader);

@@ -398,11 +467,11 @@ class AaiUtil {
 		}

 		taskProcessor.logDebug( "======== Completed Execute AAI Delete Process ======== ", isDebugEnabled)

 	}

-	

+

 	/**

-	 * This reusable method can be used for making AAI Post Calls. The url should

-	 * be passed as a parameter along with the execution.  The method will

-	 * return an APIResponse.

+	 * This reusable method can be used for making AAI Post Calls. The url

+	 * and payload should be passed as a parameters along with the execution.

+	 * The method will return an APIResponse.

 	 *

 	 * @param execution

 	 * @param url

@@ -421,6 +490,7 @@ class AaiUtil {
 			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

 			RESTConfig config = new RESTConfig(url);

 			RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/xml");

+			

 			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

 				client.addAuthorizationHeader(basicAuthCred)

 			}

@@ -435,7 +505,49 @@ class AaiUtil {
 		taskProcessor.logDebug( "======== Completed Execute AAI Post Process ======== ", isDebugEnabled)

 	}

 

-	/** Utilitty to get the Cloud Region from AAI

+	/**

+	 * This reusable method can be used for making AAI Post Calls. The url

+	 * and payload should be passed as a parameters along with the execution.

+	 * The method will return an APIResponse.

+	 *

+	 * @param execution

+	 * @param url

+	 * @param payload

+	 * @param authenticationHeader - addAuthenticationHeader value

+	 * @param headerName - name of header you want to add, i.e. addHeader(headerName, headerValue)

+	 * @param headerValue - the header's value, i.e. addHeader(headerName, headerValue)

+	 *

+	 * @return APIResponse

+	 */

+	public APIResponse executeAAIPostCall(Execution execution, String url, String payload, String authenticationHeaderValue, String headerName, String headerValue){

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		taskProcessor.logDebug( " ======== Started Execute AAI Post Process ======== ", isDebugEnabled)

+		try{

+			taskProcessor.logDebug( "URL to be used is: " + url, isDebugEnabled)

+

+			String basicAuthCred = utils.getBasicAuth(execution.getVariable("URN_aai_auth"),execution.getVariable("URN_mso_msoKey"))

+			

+			RESTConfig config = new RESTConfig(url);

+			RESTClient client = new RESTClient(config).addAuthorizationHeader(authenticationHeaderValue).addHeader(headerName, headerValue)

+			if (basicAuthCred != null && !"".equals(basicAuthCred)) {

+				client.addAuthorizationHeader(basicAuthCred)

+			}

+			APIResponse apiResponse = client.httpPost(payload)

+

+			return apiResponse

+

+		}catch(Exception e){

+			taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Post Call. Exception is: \n" + e, isDebugEnabled)

+			return e

+		}

+		taskProcessor.logDebug( "======== Completed Execute AAI Post Process ======== ", isDebugEnabled)

+	}

+

+

+	

+

+

+	/* Utility to get the Cloud Region from AAI

 	 * Returns String cloud region id, (ie, cloud-region-id)

 	 * @param execution

 	 * @param url  - url for AAI get cloud region

@@ -479,7 +591,7 @@ class AaiUtil {
 				  return "ERROR"

 			 }

 		  } else { // not 200

-		      if (returnCode == "404") {

+			  if (returnCode == "404") {

 				 if (backend == "PO") {

 					  regionId = inputCloudRegion

 				 } else  {  // backend not "PO"

@@ -487,10 +599,10 @@ class AaiUtil {
 				 }

 				 taskProcessor.utils.log("DEBUG", "Cloud Region value for code='404' of " + backend + " is: " + regionId, isDebugEnabled)

 				  return regionId

-		      } else {

-			      taskProcessor.utils.log("ERROR", "Call AAI Cloud Region is NOT Successful.", isDebugEnabled)

-			      return "ERROR"

-		      }

+			  } else {

+				  taskProcessor.utils.log("ERROR", "Call AAI Cloud Region is NOT Successful.", isDebugEnabled)

+				  return "ERROR"

+			  }

 		  }

 		}catch(Exception e) {

 		   taskProcessor.utils.log("ERROR", "Exception occured while getting the Cloud Reqion. Exception is: \n" + e, isDebugEnabled)

@@ -511,19 +623,18 @@ class AaiUtil {
 		return ret

 	}

 

-	

 	/**

-	 * Get the lowest unused VF Module index from AAI response for a given module type. The criteria for 

+	 * Get the lowest unused VF Module index from AAI response for a given module type. The criteria for

 	 * determining module type is specified by "key" parameter (for example, "persona-model-id"),

 	 * the value for filtering is specified in "value" parameter

-	 * 

+	 *

 	 * @param execution

 	 * @param aaiVnfResponse

 	 * @param key

 	 * @param value

 	 *

 	 * @return moduleIndex

-	 * 

+	 *

 	 */

 	public int getLowestUnusedVfModuleIndexFromAAIVnfResponse(Execution execution, String aaiVnfResponse, String key, String value) {

 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

@@ -531,7 +642,7 @@ class AaiUtil {
 			String vfModulesText = taskProcessor.utils.getNodeXml(aaiVnfResponse, "vf-modules")

 			if (vfModulesText == null || vfModulesText.isEmpty()) {

 				taskProcessor.utils.log("DEBUG", "There are no VF modules in this VNF yet", isDebugEnabled)

-				return 0				

+				return 0

 			}

 			else {

 				def xmlVfModules= new XmlSlurper().parseText(vfModulesText)

@@ -548,15 +659,14 @@ class AaiUtil {
 						matchingVfModules = matchingVfModules + taskProcessor.utils.removeXmlPreamble(vfModuleXml)

 					}

 				}

-				matchingVfModules = matchingVfModules + "</vfModules>"				

+				matchingVfModules = matchingVfModules + "</vfModules>"

 				taskProcessor.utils.log("DEBUG", "Matching VF Modules: " + matchingVfModules, isDebugEnabled)

 				String lowestUnusedIndex = taskProcessor.utils.getLowestUnusedIndex(matchingVfModules)

 				return Integer.parseInt(lowestUnusedIndex)

-			}			

+			}

 		}

 		else {

 			return 0

 		}

 	}

-

 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
index d7aa979..e86f77c 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy
@@ -697,6 +697,10 @@ public abstract class AbstractServiceTaskProcessor implements ServiceTaskProcess
 

 	/**

 	 * Constructs a workflow message callback URL for the specified message type and correlator.

+	 * This type of callback URL is used when a workflow wants an MSO adapter (like the SDNC

+	 * adapter) to call it back.  In other words, this is for callbacks internal to the MSO

+	 * complex.  Use <code>createWorkflowMessageAdapterCallbackURL</code> if the callback

+	 * will come from outside the MSO complex.

 	 * @param messageType the message type (e.g. SDNCAResponse or VNFAResponse)

 	 * @param correlator the correlator value (e.g. a request ID)

 	 */

@@ -717,4 +721,30 @@ public abstract class AbstractServiceTaskProcessor implements ServiceTaskProcess
 			'/' + UriUtils.encodePathSegment(messageType, 'UTF-8') +

 			'/' + UriUtils.encodePathSegment(correlator, 'UTF-8')

 	}

+	

+	/**

+	 *

+	 * Constructs a workflow message callback URL for the specified message type and correlator.

+	 * This type of callback URL is used when a workflow wants a system outside the MSO complex

+	 * to call it back through the Workflow Message Adapter.

+	 * @param messageType the message type (e.g. SNIROResponse)

+	 * @param correlator the correlator value (e.g. a request ID)

+	 */

+	public String createWorkflowMessageAdapterCallbackURL(Execution execution, String messageType, String correlator) {

+		String endpoint = (String) execution.getVariable('URN_mso_adapters_workflow_message_endpoint')

+

+		if (endpoint == null || endpoint.isEmpty()) {

+			ExceptionUtil exceptionUtil = new ExceptionUtil()

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000,

+				'mso:adapters:workflow:message:endpoint URN mapping is not set')

+		}

+

+		while (endpoint.endsWith('/')) {

+			endpoint = endpoint.substring(0, endpoint.length()-1)

+		}

+

+		return endpoint +

+			'/' + UriUtils.encodePathSegment(messageType, 'UTF-8') +

+			'/' + UriUtils.encodePathSegment(correlator, 'UTF-8')

+	}

 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AllottedResourceUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AllottedResourceUtils.groovy
new file mode 100644
index 0000000..540fe03
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AllottedResourceUtils.groovy
@@ -0,0 +1,312 @@
+package org.openecomp.mso.bpmn.common.scripts

+

+import org.apache.commons.lang3.StringEscapeUtils;

+import org.camunda.bpm.engine.delegate.BpmnError

+import org.camunda.bpm.engine.runtime.Execution;

+import org.openecomp.mso.bpmn.core.WorkflowException

+import org.openecomp.mso.rest.APIResponse;

+

+class AllottedResourceUtils {

+	

+	private AbstractServiceTaskProcessor taskProcessor

+	ExceptionUtil exceptionUtil = new ExceptionUtil()

+	MsoUtils utils;

+

+	public AllottedResourceUtils(AbstractServiceTaskProcessor taskProcessor) {

+		this.taskProcessor = taskProcessor

+		this.utils = taskProcessor.utils

+	}

+

+	/*Used on Create - called from DoCreate

+	* Using Consuming ServiceInstanceId get related Allotted Resources Orchestration status from AAI

+	* 1) get related AR links for CSI 2) get AR from AR links

+	* return: null -> AR Not found

+	* return: " " -> AR found with empty orchStatus

+	* return: orchStatus - > AR found with this orchStatus

+	* setsVariable aaiARGetResponse

+	*/

+	public String getAROrchStatus (Execution execution) {

+

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG"," ***** getAROrchStatus *****", isDebugEnabled)

+		String msg = ""

+		String serviceInstanceId = execution.getVariable("serviceInstanceId")

+		String arType = execution.getVariable("allottedResourceType")

+		String arRole = execution.getVariable("allottedResourceRole")

+		String siXml = execution.getVariable("CSI_service")

+		String ar = null

+		String orchStatus = null

+		XmlParser xmlParser = new XmlParser()

+		utils.log("DEBUG","getAROrchStatus siXml:" + siXml, isDebugEnabled)

+		try {

+			if (!isBlank(siXml)) {

+				def groovy.util.Node siNode = xmlParser.parseText(siXml)

+				def groovy.util.Node relationshipList = utils.getChildNode(siNode, 'relationship-list')

+				if (relationshipList != null) {

+					def groovy.util.NodeList relationships = utils.getIdenticalChildren(relationshipList, 'relationship')

+					for (groovy.util.Node relationship in relationships) {

+						def groovy.util.Node relatedTo = utils.getChildNode(relationship, 'related-to')

+						if ((relatedTo != null) && (relatedTo.text().equals('allotted-resource'))) {

+							utils.log("DEBUG","getARORchStatus AR found", isDebugEnabled)

+							def groovy.util.Node relatedLink = utils.getChildNode(relationship, 'related-link')

+							if (relatedLink != null){

+								ar = getARbyLink(execution, relatedLink.text(), arRole)

+								if (!isBlank(ar))

+								{

+									orchStatus = execution.getVariable("aaiAROrchStatus")

+									break

+								}

+							}

+						}

+					}

+				}

+			}

+		}catch(Exception e){

+			utils.log("DEBUG", " Error encountered in getAROrchStatus" + e.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in getAROrchStatus" + e.getMessage())

+		}

+		utils.log("DEBUG"," *****Exit getAROrchStatus **** OrchStatus:" + orchStatus, isDebugEnabled)

+		return orchStatus

+	}

+

+	// get Allotted Resource by AllottedResourceId

+	// used on Delete - called from doDeleteAR

+	// setsVariable aaiARGetResponse

+	public String getARbyId (Execution execution, String allottedResourceId) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " ***** getARbyId ***** ", isDebugEnabled)

+		String arLink = getARLinkbyId(execution, allottedResourceId)

+		String ar = null

+		if (!isBlank(arLink))

+		{

+			ar = getARbyLink(execution, arLink, "")

+		}

+		utils.log("DEBUG", " ***** Exit GetARbyId ***** AR:" + ar, isDebugEnabled)

+		return ar;

+	}

+

+	// get Allotted Resource Link by AllottedResourceId using Nodes Query

+	// used on Delete - called from getARbyId

+	public String getARLinkbyId (Execution execution, String allottedResourceId) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " ***** getARLinkbyId ***** ", isDebugEnabled)

+		String arLink = null

+		try {

+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

+			String aaiNQUri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)

+			String aaiEndpoint = execution.getVariable("URN_aai_endpoint")

+			String aaiUrl = "${aaiNQUri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"

+

+			utils.log("DEBUG", "getARLinkbyId url: \n" + aaiUrl, isDebugEnabled)

+

+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, aaiUrl)

+			int responseCode = response.getStatusCode()

+			utils.log("DEBUG", "  GET AR response code is: " + responseCode, isDebugEnabled)

+

+			String aaiResponse = response.getResponseBodyAsString()

+			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

+			utils.log("DEBUG", "GET AR:" + aaiResponse, isDebugEnabled)

+			if(responseCode == 200 || responseCode == 202){

+				utils.log("DEBUG", "GET AR Received a Good Response Code", isDebugEnabled)

+				if(utils.nodeExists(aaiResponse, "result-data")){

+					utils.log("DEBUG", "Query for AllottedResource Url Response Does Contain Data" , isDebugEnabled)

+					arLink = utils.getNodeText1(aaiResponse, "resource-link")

+				}else{

+					utils.log("DEBUG", "GET AR Response Does NOT Contain Data" , isDebugEnabled)

+				}

+			}else if(responseCode == 404){

+				utils.log("DEBUG", "GET AR received a Not Found (404) Response", isDebugEnabled)

+			}

+			else{

+				utils.log("DEBUG", "  GET AR received a Bad Response: \n" + aaiResponse, isDebugEnabled)

+				buildAAIErrorResponse(execution, aaiResponse, "Error retrieving AR from AAI")

+			}

+		}catch(Exception e){

+			utils.log("DEBUG", " Error encountered within GetAaiAR" + e.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in GetARbyId" + e.getMessage())

+		}

+		utils.log("DEBUG", " ***** Exit GetARLinkbyId ***** Link:" + arLink, isDebugEnabled)

+		return arLink

+	}

+

+	// get Allotted resource using Link

+	// used on Create called from getARORchStatus

+	// used on Delete called from getARbyId

+	// setsVariable aaiARPath - used for Patch in create

+	public String getARbyLink (Execution execution, String link, String role) {

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " ***** getARbyLink ***** ", isDebugEnabled)

+		String ar = null

+		String arUrl = null

+		try {

+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

+			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

+			String arEndpoint = ""

+

+			if(!isBlank(link)) {

+				utils.log("DEBUG", "Incoming AR Resource Link is: " + link, isDebugEnabled)

+				String[] split = link.split("/aai/")

+				arEndpoint = "/aai/" + split[1]

+			}

+

+			arUrl = "${aai_endpoint}" + arEndpoint

+		

+			utils.log("DEBUG", "GET AR Aai Path is: \n" + arUrl, isDebugEnabled)

+

+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, arUrl)

+			int responseCode = response.getStatusCode()

+			utils.log("DEBUG", "  GET AR response code is: " + responseCode, isDebugEnabled)

+

+			String aaiResponse = response.getResponseBodyAsString()

+			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

+			utils.log("DEBUG", "GET AR:" + aaiResponse, isDebugEnabled)

+			if(responseCode == 200 || responseCode == 202){

+				utils.log("DEBUG", "GET AR Received a Good Response Code", isDebugEnabled)

+				if(utils.nodeExists(aaiResponse, "allotted-resource")){

+					if (!isBlank(role))

+					{

+						if (utils.nodeExists(aaiResponse, "role") && role.equals(utils.getNodeText1(aaiResponse, "role"))) {

+							ar = aaiResponse

+						}else{

+							utils.log("DEBUG", "AAI AR does not match input role:" + role, isDebugEnabled)

+						}

+					}

+					else

+					{

+						ar = aaiResponse

+					}

+				}

+				else

+				{

+					utils.log("DEBUG", "GET AR Does NOT Contain Data" , isDebugEnabled)

+				}

+			}else if(responseCode == 404){

+				utils.log("DEBUG", "GET AR received a Not Found (404) Response", isDebugEnabled)

+			}

+			else{

+				utils.log("DEBUG", "  GET AR received a Bad Response: \n" + aaiResponse, isDebugEnabled)

+				buildAAIErrorResponse(execution, aaiResponse, "Error retrieving AR from AAI")

+			}

+		}catch(Exception e){

+			utils.log("DEBUG", " Error encountered within GetAaiAR" + e.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error in GetAaiAR" + e.getMessage())

+		}

+		if (!isBlank(ar))

+		{

+			execution.setVariable("aaiARGetResponse", ar)

+			execution.setVariable("aaiARPath", arUrl)

+			

+			String resourceVersion = null

+			if (utils.nodeExists(ar, "resource-version")) {

+				resourceVersion = utils.getNodeText1(ar, "resource-version")

+				execution.setVariable("aaiARResourceVersion", resourceVersion)

+			}

+			

+			String orchStatus = null

+			if (utils.nodeExists(ar, "orchestration-status")) {

+				orchStatus= utils.getNodeText1(ar, "orchestration-status")

+			}

+			else

+			{

+				orchStatus = " "

+			}

+			execution.setVariable("aaiAROrchStatus", orchStatus)

+		}

+		utils.log("DEBUG", " ***** Exit GetARbyLink ***** AR:" + ar, isDebugEnabled)

+		return ar

+	}

+

+	public void updateAROrchStatus(Execution execution, String status, String aaiARPath){

+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** updaAROrchStatus *** ", isDebugEnabled)

+		try{

+

+			String updateReq =	"""

+				{

+				"orchestration-status": "Created""

+				}

+				"""

+

+			utils.log("DEBUG", 'AAI AR URI: ' + aaiARPath, isDebugEnabled)

+

+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

+			APIResponse apiResponse = aaiUriUtil.executeAAIPatchCall(execution, aaiARPath, updateReq)

+			def aaiResponse = StringEscapeUtils.unescapeXml(apiResponse.getResponseBodyAsString())

+			def responseCode = apiResponse.getStatusCode()

+

+			utils.logAudit("AAI Response Code: " + responseCode)

+			utils.logAudit("AAI Response: " + aaiResponse)

+			if(responseCode == 200){

+				utils.log("DEBUG", "UpdateAR Good REST Response is: " + "\n" + aaiResponse, isDebugEnabled)

+			}else{

+				utils.log("DEBUG", "UpdateAROrchStatus Bad REST Response!", isDebugEnabled)

+				buildAAIErrorResponse(execution, aaiResponse, "Error updating AR OrchStatus in AAI")

+			}

+

+		}catch(BpmnError b){

+			utils.log("DEBUG", "Rethrowing MSOWorkflowException ", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("ERROR", "Exception in updateAR. Exception is:\n" + e.getMessage(), isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, 'Internal Error in updateAROrchStatus.' + e.getMessage())

+		}

+		utils.log("DEBUG", " *** Exit updateAROrchStatus *** ", isDebugEnabled)

+	}

+	

+	//Sets Variable "wasDeleted"

+	public void deleteAR(Execution execution, String aaiARPath){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** deleteAR *** aaiARPath:" + aaiARPath, isDebugEnabled)

+		try {

+			AaiUtil aaiUriUtil = new AaiUtil(taskProcessor)

+			APIResponse response = aaiUriUtil.executeAAIDeleteCall(execution, aaiARPath)

+			int responseCode = response.getStatusCode()

+			execution.setVariable("deleteARResponseCode", responseCode)

+			

+			utils.log("DEBUG", "  Delete AR response code:" + responseCode, isDebugEnabled)

+

+			String aaiResponse = response.getResponseBodyAsString()

+			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

+			execution.setVariable("aaiARDeleteResponse", aaiResponse)

+

+			utils.log("DEBUG", "Delete AR Response:" + aaiResponse)

+			//Process Response

+			if(responseCode == 204){

+				utils.log("DEBUG", "  Delete AR Received a Good Response", isDebugEnabled)

+				execution.setVariable("wasDeleted", "true")

+			}else if(responseCode == 404){

+				utils.log("DEBUG", "  Delete AR Received a Not Found (404) Response", isDebugEnabled)

+			}else if(responseCode == 412){

+				utils.log("DEBUG", "Delete AR Received a Resource Version Mismatch Error: \n" + aaiResponse, isDebugEnabled)

+				exceptionUtil.buildAndThrowWorkflowException(execution, 412, "DeleteAR Received a resource-version Mismatch Error Response from AAI")

+			}else{

+				utils.log("DEBUG", "Delete AR Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

+				buildAAIErrorResponse(execution, aaiResponse, "Error deleting AR in AAI")

+				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

+			}

+		}catch(BpmnError b){

+			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

+			throw b

+		}catch(Exception e){

+			utils.log("DEBUG", " Error encountered in deleteAR!" + e, isDebugEnabled)

+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured During Delete AR")

+		}

+		utils.log("DEBUG", " *** Exit deleteAR *** ", isDebugEnabled)

+	}

+

+	public void buildAAIErrorResponse(Execution execution, String response, String errorMessage){

+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

+		utils.log("DEBUG", " *** BuildAAIErrorResponse*** ", isDebugEnabled)

+

+		if((response != null) && (response.contains("Fault") || response.contains("RESTFault"))){

+			WorkflowException workflowException = exceptionUtil.MapAAIExceptionToWorkflowException(response, execution)

+			execution.setVariable("WorkflowException", workflowException)

+		}else{

+			exceptionUtil.buildWorkflowException(execution, 500, errorMessage)

+		}

+

+		utils.log("DEBUG", " *** Exit BuildAAIErrorResponse Process*** ", isDebugEnabled)

+		throw new BpmnError("MSOWorkflowException")

+	}

+

+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModule.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModule.groovy
index 986111c..9cf22aa 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModule.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateAAIVfModule.groovy
@@ -159,7 +159,7 @@ public class CreateAAIVfModule extends AbstractServiceTaskProcessor{
 		AaiUtil aaiUriUtil = new AaiUtil(this)

 		def aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

 		logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

-		String aaiNamespace = aaiUriUtil.getNamespaceFromUri(aai_uri)

+		String aaiNamespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)

 		logDebug('AAI namespace is: ' + aaiNamespace, isDebugEnabled)

 		

 		execution.setVariable("CAAIVfMod_aaiNamespace","${aaiNamespace}")		

@@ -258,8 +258,8 @@ public class CreateAAIVfModule extends AbstractServiceTaskProcessor{
 								<vnf-type>${execution.getVariable("CAAIVfMod_vnfType")}</vnf-type>

 								<service-id>${execution.getVariable("CAAIVfMod_serviceId")}</service-id>

 								<orchestration-status>active</orchestration-status>

-								<persona-model-id>${execution.getVariable("CAAIVfMod_vnfPersonaId")}</persona-model-id>

-								<persona-model-version>${execution.getVariable("CAAIVfMod_vnfPersonaVer")}</persona-model-version>

+								<model-invariant-id>${execution.getVariable("CAAIVfMod_vnfPersonaId")}</model-invariant-id>

+								<model-version-id>${execution.getVariable("CAAIVfMod_vnfPersonaVer")}</model-version-id>

 							</generic-vnf>""" as String

 		execution.setVariable("CAAIVfMod_createGenericVnfPayload", payload)

 

@@ -305,8 +305,19 @@ public class CreateAAIVfModule extends AbstractServiceTaskProcessor{
 			def aaiVnfResponse = execution.getVariable("CAAIVfMod_queryGenericVnfResponse")

 			AaiUtil aaiUtil = new AaiUtil(this)

 			def personaModelId = execution.getVariable("CAAIVfMod_personaId")

+			

+			// Check if the response includes model-invariant-id or persona-model-id

+			// note: getRequiredNodeText() throws an exception if the field is missing

+			// need to retun a null for the subsequent "either/or" logic to work properly

+//			def modelInvariantId = getRequiredNodeText(execution, aaiVnfResponse,'model-invariant-id')

+			def modelInvariantId = getNodeText(aaiVnfResponse,'model-invariant-id', null)

+			def fieldToCheck = 'model-invariant-id'

+			if (!modelInvariantId) {

+				fieldToCheck = 'persona-model-id'

+			}

+			

 			moduleIndex = aaiUtil.getLowestUnusedVfModuleIndexFromAAIVnfResponse(execution, aaiVnfResponse, 

-				"persona-model-id", personaModelId)

+				fieldToCheck, personaModelId)

 		}

 		def moduleIndexString = String.valueOf(moduleIndex)

 

@@ -324,11 +335,11 @@ public class CreateAAIVfModule extends AbstractServiceTaskProcessor{
 		String payload = """<vf-module xmlns="${execution.getVariable("CAAIVfMod_aaiNamespace")}">

 								<vf-module-id>${newModuleId}</vf-module-id>

 								<vf-module-name>${execution.getVariable("CAAIVfMod_moduleName")}</vf-module-name>

-								<persona-model-id>${execution.getVariable("CAAIVfMod_personaId")}</persona-model-id>

-								<persona-model-version>${execution.getVariable("CAAIVfMod_personaVer")}</persona-model-version>

-								<persona-model-customization-id>${execution.getVariable("CAAIVfMod_modelCustomizationId")}</persona-model-customization-id>

+								<model-invariant-id>${execution.getVariable("CAAIVfMod_personaId")}</model-invariant-id>

+								<model-version-id>${execution.getVariable("CAAIVfMod_personaVer")}</model-version-id>

+								<model-customization-id>${execution.getVariable("CAAIVfMod_modelCustomizationId")}</model-customization-id>

 								<is-base-vf-module>${isBaseModule}</is-base-vf-module>

-								<orchestration-status>pending-create</orchestration-status>

+								<orchestration-status>PendingCreate</orchestration-status>

 								<module-index>${moduleIndex}</module-index>

 								</vf-module>""" as String

 		execution.setVariable("CAAIVfMod_createVfModulePayload", payload)

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateGenericVNFUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateGenericVNFUtils.groovy
deleted file mode 100644
index 887eb74..0000000
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CreateGenericVNFUtils.groovy
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.mso.bpmn.common.scripts
-
-import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.rest.APIResponse;
-
-import org.camunda.bpm.engine.runtime.Execution;
-import org.camunda.bpm.engine.delegate.BpmnError
-
-/**
- * Please describe the CreateGenericVNFUtils.groovy class
- *
- */
-class CreateGenericVNFUtils{
-
-	String Prefix="CRTGVNF_"
-
-	def utils=new MsoUtils()
-
-	private AbstractServiceTaskProcessor taskProcessor
-	
-	public CreateGenericVNFUtils(AbstractServiceTaskProcessor taskProcessor) {
-		this.taskProcessor = taskProcessor
-	}
-
-	/**
-	 * This method is executed during the Initialization task of the process.
-	 *
-	 * @param execution
-	 *
-	 */
-
-	public APIResponse queryAAI(Execution execution, String path){
-
-	def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-	execution.setVariable("prefix", Prefix)
-	utils.log("DEBUG", " ======== STARTED queryAAI Process ======== ", isDebugEnabled)
-
-	def uuid = execution.getVariable("CRTGVNF_uuid")
-	utils.log("DEBUG", "UUID is: " + uuid, isDebugEnabled)
-
-	//Setting request path
-	String queryAAIRequestPath = execution.getVariable("URN_aai_endpoint")+path
-//	execution.setVariable("CRTGVNF_queryAAIRequestPath", queryAAIRequestPath)
-	utils.log("DEBUG", "QueryAAIRequest Path is: " + "\n" + queryAAIRequestPath, isDebugEnabled)
-
-	try {
-		AaiUtil aaiUtil = new AaiUtil(taskProcessor)
-		return aaiUtil.executeAAIGetCall(execution, queryAAIRequestPath)
-	}catch(Exception e){
-		utils.log("ERROR", "Exception Occured Processing queryAAI. Exception is:\n" + e, isDebugEnabled)
-		execution.setVariable("CRTGVNF_dataValidationFlag", false)
-		execution.setVariable("CRTGVNF_ErrorResponse", "Error Occured during queryAAI Method:\n" + e.getMessage())
-	}
-	utils.log("DEBUG", "======== COMPLETED queryAAI Process ======== ", isDebugEnabled)
-}
-
-	public String buildSDNCRequest(Execution execution, String svcInstId, String action){
-
-		String uuid = execution.getVariable('testReqId') // for junits
-		if(uuid==null){
-			uuid = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
-		}
-		def callbackURL = execution.getVariable("CRTGVNF_sdncCallbackUrl")
-		def requestId = execution.getVariable("CRTGVNF_requestId")
-		def serviceType = execution.getVariable("CRTGVNF_serviceType")
-		def vnfType = execution.getVariable("CRTGVNF_vnfType")
-		def vnfName = execution.getVariable("CRTGVNF_vnfName")
-		def tenantId = execution.getVariable("CRTGVNF_tenantId")
-		def source = execution.getVariable("CRTGVNF_source")
-		String vnfId = svcInstId
-		String sdncVNFParamsXml = ""
-
-		if(execution.getVariable("CRTGVNF_vnfParamsExistFlag") == true){
-			sdncVNFParamsXml = buildSDNCParamsXml(execution)
-		}else{
-			sdncVNFParamsXml = ""
-		}
-
-		String sdncRequest =
-		"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	   <sdncadapter:RequestHeader>
-				<sdncadapter:RequestId>${uuid}</sdncadapter:RequestId>
-				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
-				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
-				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
-				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
-		</sdncadapter:RequestHeader>
-	<sdncadapterworkflow:SDNCRequestData>
-		<request-information>
-			<request-id>${requestId}</request-id>
-			<request-action>VNFActivateRequest</request-action>
-			<source>${source}</source>
-		</request-information>
-		<service-information>
-			<service-type>${serviceType}</service-type>
-			<service-instance-id>${vnfId}</service-instance-id>
-			<subscriber-name>notsurewecare</subscriber-name>
-		</service-information>
-		<vnf-request-information>
-			<vnf-id>${vnfId}</vnf-id>
-			<vnf-type>${vnfType}</vnf-type>
-			<vnf-name>${vnfName}</vnf-name>
-			<tenant>${tenantId}</tenant>
-${sdncVNFParamsXml}
-		</vnf-request-information>
-	</sdncadapterworkflow:SDNCRequestData>
-	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
-
-	return sdncRequest
-
-	}
-
-	public String buildSDNCParamsXml(Execution execution){
-
-		String params = ""
-		StringBuilder sb = new StringBuilder()
-		Map<String, String> paramsMap = execution.getVariable("CRTGVNF_vnfParamsMap")
-
-		for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
-			String paramsXml
-			String key = entry.getKey();
-			if(key.endsWith("_network")){
-				String requestKey = key.substring(0, key.indexOf("_network"))
-				String requestValue = entry.getValue()
-				paramsXml =
-"""<vnf-networks>
-	<network-role>{ functx:substring-before-match(data($param/@name), '_network') }</network-role>
-	<network-name>{ $param/text() }</network-name>
-</vnf-networks>"""
-			}else{
-			paramsXml = ""
-			}
-			params = sb.append(paramsXml)
-		}
-		return params
-	}
-	
-}
-
-
-
-
-
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy
index fba5cbe..53678ec 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenerateVfModuleName.groovy
@@ -120,7 +120,11 @@ public class GenerateVfModuleName extends AbstractServiceTaskProcessor{
 							String matchingVfModules = "<vfModules>"

 							for (i in 0..vfModulesSize-1) {

 								def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

-								def personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "persona-model-id")

+								def personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "model-invariant-id")

+								if (!personaModelIdFromAAI) {

+									// check old attribute name

+								   personaModelIdFromAAI = utils.getNodeText(vfModuleXml, "persona-model-id")								  

+								}

 								if (personaModelIdFromAAI != null && personaModelIdFromAAI.equals(personaModelId)) {

 									matchingVfModules = matchingVfModules + utils.removeXmlPreamble(vfModuleXml)

 								}							

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteVnf.groovy
index 1bd4383..344bba2 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericDeleteVnf.groovy
@@ -67,7 +67,6 @@ import org.springframework.web.util.UriUtils
  *

  *

  * Out Mapping Variables:

- *   @param - GENDV_vnf

  *   @param - GENDV_SuccessIndicator

  *   @param - GENDV_FoundIndicator

  *   @param - WorkflowException

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy
index 70ce1ba..2e65339 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetService.groovy
@@ -64,6 +64,13 @@ import org.springframework.web.util.UriUtils
  * Variable Mapping Below:

  *

  * In Mapping Variables:

+ *   For Allotted-Resource:

+ *     @param - GENGS_allottedResourceId

+ *     @param - GENGS_type

+ *     @param (Optional) - GENGS_serviceInstanceId

+ *     @param (Optional) - GENGS_serviceType

+ *     @param (Optional) - GENGS_globalCustomerId

+ *

  *   For Service-Instance:

  *     @param - GENGS_serviceInstanceId or @param - GENGS_serviceInstanceName

  *     @param - GENGS_type

@@ -82,6 +89,7 @@ import org.springframework.web.util.UriUtils
  *    @param - WorkflowException

  *

  *

+ * @author cb645j

  */

 class GenericGetService extends AbstractServiceTaskProcessor{

 

@@ -94,20 +102,24 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 	 * variables the calling flow provided.

 	 *

 	 * @param - execution

+	 *

+	 * @author cb645j

 	 */

 	public void preProcessRequest(Execution execution) {

 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

 		execution.setVariable("prefix",Prefix)

 		utils.log("DEBUG", " *** STARTED GenericGetService PreProcessRequest Process*** ", isDebugEnabled)

 

-		execution.setVariable("GENGS_obtainServiceInstanceUrl", false)

+		execution.setVariable("GENGS_obtainObjectsUrl", false)

 		execution.setVariable("GENGS_obtainServiceInstanceUrlByName", false)

 		execution.setVariable("GENGS_SuccessIndicator", false)

 		execution.setVariable("GENGS_FoundIndicator", false)

+		execution.setVariable("GENGS_resourceLink", null)

 		execution.setVariable("GENGS_siResourceLink", null)

 

 		try{

 			// Get Variables

+			String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

 			String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

 			String serviceInstanceName = execution.getVariable("GENGS_serviceInstanceName")

 			String serviceType = execution.getVariable("GENGS_serviceType")

@@ -116,7 +128,21 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 

 			if(type != null){

 				utils.log("DEBUG", "Incoming GENGS_type is: " + type, isDebugEnabled)

-				if(type.equalsIgnoreCase("service-instance")){

+				if(type.equalsIgnoreCase("allotted-resource")){

+					if(isBlank(allottedResourceId)){

+						utils.log("DEBUG", "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.", isDebugEnabled)

+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming allottedResourceId is null. Allotted Resource Id is required to Get an allotted-resource.")

+					}else{

+						utils.log("DEBUG", "Incoming Allotted Resource Id is: " + allottedResourceId, isDebugEnabled)

+						if(isBlank(globalCustomerId) || isBlank(serviceType) || isBlank(serviceInstanceId)){

+							execution.setVariable("GENGS_obtainObjectsUrl", true)

+						}else{

+							utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

+							utils.log("DEBUG", "Incoming Service Type is: " + serviceType, isDebugEnabled)

+							utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

+						}

+					}

+				}else if(type.equalsIgnoreCase("service-instance")){

 					if(isBlank(serviceInstanceId) && isBlank(serviceInstanceName)){

 						utils.log("DEBUG", "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.", isDebugEnabled)

 						exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.")

@@ -124,7 +150,7 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 						utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

 						utils.log("DEBUG", "Incoming Service Instance Name is: " + serviceInstanceName, isDebugEnabled)

 						if(isBlank(globalCustomerId) || isBlank(serviceType)){

-							execution.setVariable("GENGS_obtainServiceInstanceUrl", true)

+							execution.setVariable("GENGS_obtainObjectsUrl", true)

 							if(isBlank(serviceInstanceId)){

 								execution.setVariable("GENGS_obtainServiceInstanceUrlByName", true)

 							}

@@ -170,49 +196,64 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 		execution.setVariable("prefix",Prefix)

 		utils.log("DEBUG", " *** STARTED GenericGetService ObtainServiceInstanceUrlById Process*** ", isDebugEnabled)

 		try {

-			String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

-			utils.log("DEBUG", " Querying Node for Service-Instance URL by using Service-Instance Id: " + serviceInstanceId, isDebugEnabled)

-

 			AaiUtil aaiUriUtil = new AaiUtil(this)

 			String aai_uri = aaiUriUtil.getSearchNodesQueryEndpoint(execution)

 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

-			

-			utils.logAudit("GenericGetService AAI Endpoint: " + aai_endpoint)

-			String path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-id:EQUALS:${serviceInstanceId}"

+

+			String type = execution.getVariable("GENGS_type")

+			String path = ""

+			if(type.equalsIgnoreCase("service-instance")){

+				String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

+				utils.log("DEBUG", " Querying Node for Service-Instance URL by using Service-Instance Id: " + serviceInstanceId, isDebugEnabled)

+				path = "${aai_uri}?search-node-type=service-instance&filter=service-instance-id:EQUALS:${serviceInstanceId}"

+				utils.logAudit("Service Instance Node Query Url is: " + path)

+				utils.log("DEBUG", "Service Instance Node Query Url is: " + path, isDebugEnabled)

+			}else if(type.equalsIgnoreCase("allotted-resource")){

+				String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

+				utils.log("DEBUG", " Querying Node for Service-Instance URL by using Allotted Resource Id: " + allottedResourceId, isDebugEnabled)

+				path = "${aai_uri}?search-node-type=allotted-resource&filter=id:EQUALS:${allottedResourceId}"

+				utils.logAudit("Allotted Resource Node Query Url is: " + path)

+				utils.log("DEBUG", "Allotted Resource Node Query Url is: " + path, isDebugEnabled)

+			}

 

 			//String url = "${aai_endpoint}${path}"  host name needs to be removed from property

 			String url = "${path}"

-			execution.setVariable("GENGS_obtainSIUrlPath", url)

+			execution.setVariable("GENGS_genericQueryPath", url)

 

 			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, url)

 			int responseCode = response.getStatusCode()

-			execution.setVariable("GENGS_obtainSIUrlResponseCode", responseCode)

+			execution.setVariable("GENGS_genericQueryResponseCode", responseCode)

 			utils.log("DEBUG", "  GET Service Instance response code is: " + responseCode, isDebugEnabled)

 			utils.logAudit("GenericGetService AAI GET Response Code: " + responseCode)

 

 			String aaiResponse = response.getResponseBodyAsString()

+			execution.setVariable("GENGS_obtainSIUrlResponseBeforeUnescaping", aaiResponse)

+			utils.log("DEBUG", "GenericGetService AAI Response before unescaping: " + aaiResponse, isDebugEnabled)

 			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

-			execution.setVariable("GENGS_obtainSIUrlResponse", aaiResponse)

+			execution.setVariable("GENGS_genericQueryResponse", aaiResponse)

 			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

+			utils.log("DEBUG", "GenericGetService AAI Response: " + aaiResponse, isDebugEnabled)

+

 			//Process Response

 			if(responseCode == 200){

-				utils.log("DEBUG", "  Query for Service Instance Url Received a Good Response Code", isDebugEnabled)

+				utils.log("DEBUG", "Generic Query Received a Good Response Code", isDebugEnabled)

 				execution.setVariable("GENGS_SuccessIndicator", true)

 				if(utils.nodeExists(aaiResponse, "result-data")){

-					utils.log("DEBUG", "Query for Service Instance Url Response Does Contain Data" , isDebugEnabled)

+					utils.log("DEBUG", "Generic Query Response Does Contain Data" , isDebugEnabled)

 					execution.setVariable("GENGS_FoundIndicator", true)

 					String resourceLink = utils.getNodeText1(aaiResponse, "resource-link")

+					execution.setVariable("GENGS_resourceLink", resourceLink)

 					execution.setVariable("GENGS_siResourceLink", resourceLink)

 				}else{

-					utils.log("DEBUG", "Query for Service Instance Url Response Does NOT Contains Data" , isDebugEnabled)

+					utils.log("DEBUG", "Generic Query Response Does NOT Contains Data" , isDebugEnabled)

 					execution.setVariable("WorkflowResponse", "  ") //for junits

 				}

 			}else if(responseCode == 404){

-				utils.log("DEBUG", "  Query for Service Instance Received a Not Found (404) Response", isDebugEnabled)

+				utils.log("DEBUG", "Generic Query Received a Not Found (404) Response", isDebugEnabled)

 				execution.setVariable("GENGS_SuccessIndicator", true)

 				execution.setVariable("WorkflowResponse", "  ") //for junits

 			}else{

-				utils.log("DEBUG", "Query for Service Instance Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

+				utils.log("DEBUG", "Generic Query Received a BAD REST Response: \n" + aaiResponse, isDebugEnabled)

 				exceptionUtil.MapAAIExceptionToWorkflowExceptionGeneric(execution, aaiResponse, responseCode)

 				throw new BpmnError("MSOWorkflowException")

 			}

@@ -255,11 +296,11 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 			execution.setVariable("GENGS_obtainSIUrlResponseCode", responseCode)

 			utils.log("DEBUG", "  GET Service Instance response code is: " + responseCode, isDebugEnabled)

 			utils.logAudit("GenericGetService AAI Response Code: " + responseCode)

-			

+

 			String aaiResponse = response.getResponseBodyAsString()

 			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

 			execution.setVariable("GENGS_obtainSIUrlResponse", aaiResponse)

-			utils.logAudit("GenericGetService AAI Response: " + aaiResponse) 

+			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

 			//Process Response

 			if(responseCode == 200){

 				utils.log("DEBUG", "  Query for Service Instance Url Received a Good Response Code", isDebugEnabled)

@@ -268,6 +309,7 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 					utils.log("DEBUG", "Query for Service Instance Url Response Does Contain Data" , isDebugEnabled)

 					execution.setVariable("GENGS_FoundIndicator", true)

 					String resourceLink = utils.getNodeText1(aaiResponse, "resource-link")

+					execution.setVariable("GENGS_resourceLink", resourceLink)

 					execution.setVariable("GENGS_siResourceLink", resourceLink)

 				}else{

 					utils.log("DEBUG", "Query for Service Instance Url Response Does NOT Contains Data" , isDebugEnabled)

@@ -308,10 +350,10 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 			AaiUtil aaiUriUtil = new AaiUtil(this)

 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")

 			String serviceEndpoint = ""

-			

+

 			utils.logAudit("GenericGetService getServiceObject AAI Endpoint: " + aai_endpoint)

 			if(type.equalsIgnoreCase("service-instance")){

-				String siResourceLink = execution.getVariable("GENGS_siResourceLink")

+				String siResourceLink = execution.getVariable("GENGS_resourceLink")

 				if(isBlank(siResourceLink)){

 					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

 					utils.log("DEBUG", " Incoming GENGS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

@@ -324,7 +366,27 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 					logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

 					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8")

 				}else{

-					utils.log("DEBUG", "Incoming Service Instance Resource Link is: " + siResourceLink, isDebugEnabled)

+					utils.log("DEBUG", "Incoming Service Instance Url is: " + siResourceLink, isDebugEnabled)

+					String[] split = siResourceLink.split("/aai/")

+					serviceEndpoint = "/aai/" + split[1]

+				}

+			}else if(type.equalsIgnoreCase("allotted-resource")){

+				String siResourceLink = execution.getVariable("GENGS_resourceLink")

+				if(isBlank(siResourceLink)){

+					String allottedResourceId = execution.getVariable("GENGS_allottedResourceId")

+					utils.log("DEBUG", " Incoming GENGS_allottedResourceId is: " + allottedResourceId, isDebugEnabled)

+					String serviceInstanceId = execution.getVariable("GENGS_serviceInstanceId")

+					utils.log("DEBUG", " Incoming GENGS_serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)

+					String serviceType = execution.getVariable("GENGS_serviceType")

+					utils.log("DEBUG", " Incoming GENGS_serviceType is: " + serviceType, isDebugEnabled)

+					String globalCustomerId = execution.getVariable("GENGS_globalCustomerId")

+					utils.log("DEBUG", "Incoming Global Customer Id is: " + globalCustomerId, isDebugEnabled)

+

+					String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)

+					logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)

+					serviceEndpoint = "${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8") + "/service-subscriptions/service-subscription/" + UriUtils.encode(serviceType,"UTF-8") + "/service-instances/service-instance/" + UriUtils.encode(serviceInstanceId,"UTF-8") +  "/allotted-resources/allotted-resource/" + UriUtils.encode(allottedResourceId,"UTF-8")

+				}else{

+					utils.log("DEBUG", "Incoming Allotted-Resource Url is: " + siResourceLink, isDebugEnabled)

 					String[] split = siResourceLink.split("/aai/")

 					serviceEndpoint = "/aai/" + split[1]

 				}

@@ -345,12 +407,11 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 			execution.setVariable("GENGS_getServiceResponseCode", responseCode)

 			utils.log("DEBUG", "  GET Service response code is: " + responseCode, isDebugEnabled)

 			utils.logAudit("GenericGetService AAI Response Code: " + responseCode)

-			

+

 			String aaiResponse = response.getResponseBodyAsString()

 			aaiResponse = StringEscapeUtils.unescapeXml(aaiResponse)

 			execution.setVariable("GENGS_getServiceResponse", aaiResponse)

 			utils.logAudit("GenericGetService AAI Response: " + aaiResponse)

-			

 			//Process Response

 			if(responseCode == 200 || responseCode == 202){

 				utils.log("DEBUG", "GET Service Received a Good Response Code", isDebugEnabled)

@@ -382,4 +443,4 @@ class GenericGetService extends AbstractServiceTaskProcessor{
 		utils.log("DEBUG", " *** COMPLETED GenericGetService GetServiceObject Process*** ", isDebugEnabled)

 	}

 

-}

+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetVnf.groovy
index df9a97c..bc787df 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericGetVnf.groovy
@@ -20,7 +20,7 @@
 

 package org.openecomp.mso.bpmn.common.scripts

 

-import static org.apache.commons.lang3.StringUtils.*

+import static org.openecomp.mso.bpmn.common.scripts.GenericUtils.*;

 

 import org.apache.commons.lang3.*

 import org.camunda.bpm.engine.delegate.BpmnError

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutService.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutService.groovy
index 9609103..9f7d57f 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutService.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericPutService.groovy
@@ -49,6 +49,7 @@ import org.springframework.web.util.UriUtils
  *
  *
  * Incoming Required Variables:
+ * @param - GENPS_requestId
  * @param - GENPS_type - Required field. This will be required field populated as service-instance or service-subscription
  * @param - GENPS_globalSubscriberId - Required field
  * @param - GENPS_serviceType - Required Field
@@ -58,8 +59,7 @@ import org.springframework.web.util.UriUtils
  * @param - GENPS_allottedResourceId - Conditional Field. Required for allotted-resource.
  * @param - GENPS_tunnelXconnectId - Conditional Field. Required for tunnel-xconnect.
  *
- * @param - GENPS_requestId to trace the request id
- * @param - GENPS_serviceResourceVersion optional needs to be provided only in case of update for both service-instance and service subscription. The calling flows
+ * @param - GENPS_serviceResourceVersion - Conditional Field. Needs to be provided only in case of update for both service-instance and service subscription. The calling flows
  *          should check if a service-instance or servic-subscription exists by calling the subflow GenericGetService. if it exists then resourceversion should be
  *          obtained from aai and sent as an input parameter.
  *
@@ -183,7 +183,7 @@ class GenericPutService extends AbstractServiceTaskProcessor{
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
 			logDebug('AAI URI is: ' + aai_uri, isDebugEnabled)
-			String namespace = aaiUriUtil.getNamespaceFromUri(aai_uri)
+			String namespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 			logDebug('AAI namespace is: ' + namespace, isDebugEnabled)
 
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy
new file mode 100644
index 0000000..3397aa9
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/GenericUtils.groovy
@@ -0,0 +1,20 @@
+package org.openecomp.mso.bpmn.common.scripts

+

+import org.apache.commons.lang3.StringUtils;

+

+class GenericUtils extends StringUtils{

+

+	@Override

+	public static boolean isBlank(final CharSequence cs) {

+		int strLen;

+		if (cs == null || (strLen = cs.length()) == 0 || cs.equals("null"))  {

+			return true;

+		}

+		for (int i = 0; i < strLen; i++) {

+			if (Character.isWhitespace(cs.charAt(i)) == false) {

+				return false;

+			}

+		}

+		return true;

+	}

+}

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
index f870e30..4ca0370 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
@@ -932,7 +932,7 @@ class SDNCAdapterUtils {
 		if (modelVersionId == null) {

 			modelVersionId = ""

 		}

-		String modelCustomizationUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelCustomizationId")

+		String modelCustomizationUuid = jsonUtil.getJsonValue(jsonModelInfo, "modelCustomizationUuid")

 		String modelCustomizationString = ""

 		if (modelCustomizationUuid != null) {

 			modelCustomizationString = "<model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>"

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIGenericVnf.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
index 4838a67..0c48338 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
@@ -28,7 +28,7 @@ import org.springframework.web.util.UriUtils
 

 

 public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {

-	

+

 	private XmlParser xmlParser = new XmlParser()

 	ExceptionUtil exceptionUtil = new ExceptionUtil()

 

@@ -44,12 +44,13 @@ public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
 		execution.setVariable('UAAIGenVnf_personaModelVersion', null)

 		execution.setVariable("UAAIGenVnf_ipv4OamAddress", null)

 		execution.setVariable('UAAIGenVnf_managementV6Address', null)

+		execution.setVariable('UAAIGenVnf_orchestrationStatus', null)

 		execution.setVariable('UAAIGenVnf_getGenericVnfResponseCode' ,null)

 		execution.setVariable('UAAIGenVnf_getGenericVnfResponse', '')

 		execution.setVariable('UAAIGenVnf_updateGenericVnfResponseCode', null)

 		execution.setVariable('UAAIGenVnf_updateGenericVnfResponse', '')

 	}

-	

+

 	/**

 	 * Check for missing elements in the received request.

 	 *

@@ -90,6 +91,11 @@ public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
 			if (managementV6Address != null && !managementV6Address.isEmpty()) {

 				execution.setVariable('UAAIGenVnf_managementV6Address', managementV6Address)

 			}

+			

+			def orchestrationStatus = getNodeTextForce(xml, 'orchestration-status')

+			if (orchestrationStatus != null && !orchestrationStatus.isEmpty()) {

+				execution.setVariable('UAAIGenVnf_orchestrationStatus', orchestrationStatus)

+			}

 

 			logDebug('Exited ' + method, isDebugLogEnabled)

 		} catch (BpmnError e) {

@@ -99,7 +105,7 @@ public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
 			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())

 		}

 	}

-	

+

 	/**

 	 * Using the received vnfId, query AAI to get the corresponding Generic VNF.

 	 * A 200 response is expected with the VF Module in the response body.

@@ -182,7 +188,11 @@ public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
 			if (newPersonaModelId != null || newPersonaModelVersion != null) {

 

 				// Confirm "new" persona-model-id is same as "current" persona-model-id

-				def Node currPersonaModelIdNode = utils.getChildNode(genericVnfNode, 'persona-model-id')

+				def Node currPersonaModelIdNode = utils.getChildNode(genericVnfNode, 'model-invariant-id')

+				if (currPersonaModelIdNode == null) {

+					// check the old attribute name

+					currPersonaModelIdNode = utils.getChildNode(genericVnfNode, 'persona-model-id')

+				}

 				def String currPersonaModelId = ''

 				if (currPersonaModelIdNode != null) {

 					currPersonaModelId = currPersonaModelIdNode.text()

@@ -194,7 +204,7 @@ public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
 				}

 

 				// Construct payload

-				personaModelVersionEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'persona-model-version')

+				personaModelVersionEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'model-version-id')

 			}

 

 			// Handle ipv4-oam-address

@@ -212,11 +222,20 @@ public class UpdateAAIGenericVnf extends AbstractServiceTaskProcessor {
 				// Construct payload

 				managementV6AddressEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'management-v6-address')

 			}

+			

+			// Handle orchestration-status

+			def String orchestrationStatus = execution.getVariable('UAAIGenVnf_orchestrationStatus')

+			def String orchestrationStatusEntry = ""

+			if (orchestrationStatus != null) {

+				// Construct payload

+				orchestrationStatusEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'orchestration-status')

+			}

 

 			def payload = """

 					{	${personaModelVersionEntry}

 						${ipv4OamAddressEntry}

-						${managementV6AddressEntry}						

+						${managementV6AddressEntry}

+						${orchestrationStatusEntry}

 						"vnf-id": "${vnfId}"					

 					}

 			"""

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIVfModule.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIVfModule.groovy
index 7283a3e..1f9db12 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIVfModule.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/UpdateAAIVfModule.groovy
@@ -133,7 +133,7 @@ public class UpdateAAIVfModule extends AbstractServiceTaskProcessor {
 	}

 

 	/**

-	 * Construct and send a PUT request to AAI to update the VF Module.

+	 * Construct and send a PATCH request to AAI to update the VF Module.

 	 *

 	 * @param execution The flow's execution instance.

 	 */

@@ -176,7 +176,11 @@ public class UpdateAAIVfModule extends AbstractServiceTaskProcessor {
 				doPersonaModelVersion = false

 			} else {

 				// Confirm "new" persona-model-id is same as "current" persona-model-id

-				def String currPersonaModelId = utils.getChildNodeText(vfModuleNode, 'persona-model-id')

+				def String currPersonaModelId = utils.getChildNodeText(vfModuleNode, 'model-invariant-id')

+				if (currPersonaModelId == null) {

+					// check the old attribute name

+					currPersonaModelId = utils.getChildNodeText(vfModuleNode, 'model-version-id')

+				}

 				if (currPersonaModelId == null) {

 					currPersonaModelId = ''

 				}

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModuleBase.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModuleBase.groovy
index d48ae8f..7a97d5c 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModuleBase.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VfModuleBase.groovy
@@ -40,7 +40,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 	

 	/**

 	 * Get the XmlParser.

-	 *

+	 * 

 	 * @return the XmlParser.

 	 */

 	protected XmlParser getXmlParser() {

@@ -50,7 +50,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 	/**

 	 * Find the VF Module with specified ID in the specified Generic VF.  If no such

 	 * VF Module is found, null is returned.

-	 *

+	 * 

 	 * @param genericVnf The Generic VNF in which to search for the specified VF Moduel.

 	 * @param vfModuleId The ID of the VF Module for which to search.

 	 * @return a VFModule object for the found VF Module or null if no VF Module is found.

@@ -77,7 +77,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 	 * element to a corresponding list of 'vnf-networks' specifications (typically used when

 	 * invoking the VNF Rest Adpater). Each element in '*-params' whose name attribute ends

 	 * with '_network' is used to create an 'vnf-networks' element.

-	 *

+	 * 

 	 * @param paramsNode A Node representing a '*-params' element.

 	 * @return a String of 'vnf-networks' elements, one for each 'param' element whose name

 	 * attribute ends with '_network'.

@@ -189,7 +189,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 	

 	/**

 	 * Extract the Tenant Id from the Volume Group information returned by AAI.

-	 *

+	 * 

 	 * @param volumeGroupXml Volume Group XML returned by AAI.

 	 * @return the Tenant Id extracted from the Volume Group information. 'null' is returned if

 	 * the Tenant Id is missing or could not otherwise be extracted.

@@ -233,7 +233,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 	 */

 	  

 	 

-	 protected String buildVfModuleParams(String vnfParams, String sdncGetResponse, String vnfId, String vnfName,

+	 protected String buildVfModuleParams(Map<String, String> vnfParamsMap, String sdncGetResponse, String vnfId, String vnfName,

 			String vfModuleId, String vfModuleName, String vfModuleIndex) {

 			

 			//Get SDNC Response Data

@@ -251,36 +251,19 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 			oldVnfId = utils.removeXmlNamespaces(oldVnfId)

 			serviceData = serviceData.replace(oldVnfId, "")

 			def vnfId1 = utils.getNodeText1(serviceData, "vnf-id")

-			String vfModuleIndexParam = ""

+			

+			Map<String, String> paramsMap = new HashMap<String, String>()

 			

 			if (vfModuleIndex != null) {

-				vfModuleIndexParam = """<entry>

-						<key>vf_module_index</key>

-						<value>${vfModuleIndex}</value>

-					</entry>"""

+				paramsMap.put("vf_module_index", "${vfModuleIndex}")

 			}

 

 			// Add-on data

-			String vnfInfo =

-				"""<entry>

-						<key>vnf_id</key>

-						<value>${vnfId}</value>

-					</entry>

-					<entry>

-						<key>vnf_name</key>

-						<value>${vnfName}</value>

-					</entry>

-					<entry>

-						<key>vf_module_id</key>

-						<value>${vfModuleId}</value>

-					</entry>

-					<entry>

-						<key>vf_module_name</key>

-						<value>${vfModuleName}</value>

-					</entry>

-					${vfModuleIndexParam}"""

-

-			utils.logAudit("vnfInfo: " + vnfInfo)

+			paramsMap.put("vnf_id", "${vnfId}")

+			paramsMap.put("vnf_name", "${vnfName}")

+			paramsMap.put("vf_module_id", "${vfModuleId}")

+			paramsMap.put("vf_module_name", "${vfModuleName}")

+			

 			InputSource source = new InputSource(new StringReader(data));

 			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

 			docFactory.setNamespaceAware(true)

@@ -289,8 +272,6 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 

 

 			// Availability Zones Data

-			String aZones = ""

-			StringBuilder sbAZone = new StringBuilder()

 			

 			NodeList aZonesList = responseXml.getElementsByTagNameNS("*", "availability-zones")

 			String aZonePosition = "0"

@@ -300,28 +281,14 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 					Element eElement = (Element) node

 					String aZoneValue = utils.getElementText(eElement, "availability-zone")

 					aZonePosition = z.toString()

-					String aZoneXml =

-							"""<entry>

-						<key>availability_zone_${aZonePosition}</key>

-						<value>${aZoneValue}</value>

-				</entry>"""

-					aZones = sbAZone.append(aZoneXml)

+					paramsMap.put("availability_zone_${aZonePosition}", "${aZoneValue}")

 				}

 			}

 

 			// VNF Networks Data

-			String vnfNetworkNetId = ""

-			String vnfNetworkNetName = ""

-			String vnfNetworkSubNetId = ""

-			String vnfNetworkV6SubNetId = ""

-			String vnfNetworkNetFqdn = ""

-			String vnfNetworksSriovVlanFilters = ""

+			

 			StringBuilder sbNet = new StringBuilder()

-			StringBuilder sbNet2 = new StringBuilder()

-			StringBuilder sbNet3 = new StringBuilder()

-			StringBuilder sbNet4 = new StringBuilder()

-			StringBuilder sbNet5 = new StringBuilder()

-			StringBuilder sbNet6 = new StringBuilder()

+			

 			NodeList vnfNetworkList = responseXml.getElementsByTagNameNS("*", "vnf-networks")

 			for (int x = 0; x < vnfNetworkList.getLength(); x++) {

 				Node node = vnfNetworkList.item(x)

@@ -333,36 +300,11 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 					String vnfNetworkSubNetIdValue = utils.getElementText(eElement, "subnet-id")

 					String vnfNetworkV6SubNetIdValue = utils.getElementText(eElement, "ipv6-subnet-id")

 					String vnfNetworkNetFqdnValue = utils.getElementText(eElement, "contrail-network-fqdn")

-					String vnfNetworkNetIdXml =

-							"""<entry>

-								<key>${vnfNetworkKey}_net_id</key>

-								<value>${vnfNetworkNeutronIdValue}</value>

-							</entry>"""

-					vnfNetworkNetId = sbNet.append(vnfNetworkNetIdXml)

-					String vnfNetworkNetNameXml =

-							"""<entry>

-						<key>${vnfNetworkKey}_net_name</key>

-						<value>${vnfNetworkNetNameValue}</value>

-				</entry>"""

-					vnfNetworkNetName = sbNet2.append(vnfNetworkNetNameXml)

-					String vnfNetworkSubNetIdXml =

-							"""<entry>

-						<key>${vnfNetworkKey}_subnet_id</key>

-						<value>${vnfNetworkSubNetIdValue}</value>

-				</entry>"""

-					vnfNetworkSubNetId = sbNet3.append(vnfNetworkSubNetIdXml)

-					String vnfNetworkV6SubNetIdXml =

-							"""<entry>

-						<key>${vnfNetworkKey}_v6_subnet_id</key>

-						<value>${vnfNetworkV6SubNetIdValue}</value>

-				</entry>"""

-					vnfNetworkV6SubNetId = sbNet5.append(vnfNetworkV6SubNetIdXml)

-					String vnfNetworkNetFqdnXml =

-							"""<entry>

-						<key>${vnfNetworkKey}_net_fqdn</key>

-						<value>${vnfNetworkNetFqdnValue}</value>

-				</entry>"""

-					vnfNetworkNetFqdn = sbNet4.append(vnfNetworkNetFqdnXml)

+					paramsMap.put("${vnfNetworkKey}_net_id", "${vnfNetworkNeutronIdValue}")

+					paramsMap.put("${vnfNetworkKey}_net_name", "${vnfNetworkNetNameValue}")

+					paramsMap.put("${vnfNetworkKey}_subnet_id", "${vnfNetworkSubNetIdValue}")

+					paramsMap.put("${vnfNetworkKey}_v6_subnet_id", "${vnfNetworkV6SubNetIdValue}")

+					paramsMap.put("${vnfNetworkKey}_net_fqdn", "${vnfNetworkNetFqdnValue}")

 					

 					NodeList sriovVlanFilterList = eElement.getElementsByTagNameNS("*","sriov-vlan-filter-list")

 					StringBuffer sriovFilterBuf = new StringBuffer()

@@ -381,23 +323,13 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 						}

 					}

 					if (!values.isEmpty()) {

-							String vnfNetworkSriovVlanFilterXml =

-									"""<entry>

-								<key>${vnfNetworkKey}_ATT_VF_VLAN_FILTER</key>

-								<value>${values}</value>

-							</entry>"""

-							vnfNetworksSriovVlanFilters = sbNet6.append(vnfNetworkSriovVlanFilterXml)

+							paramsMap.put("${vnfNetworkKey}_ATT_VF_VLAN_FILTER", "${values}")

 						}

 					}

 			}

 

 			// VNF-VMS Data

-			String vnfVMS = ""

-			String vnfVMSPositions = ""

-			String vmNetworks = ""

-			String vmNetworksPositions = ""

-			String vmNetworksPositionsV6 = ""

-			String interfaceRoutePrefixes = ""

+			

 			def key

 			def value

 			def networkKey

@@ -407,11 +339,6 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 			def floatingIPV6Key

 			def floatingIPV6KeyValue

 			StringBuilder sb = new StringBuilder()

-			StringBuilder sbPositions = new StringBuilder()

-			StringBuilder sbVmNetworks = new StringBuilder()

-			StringBuilder sbNetworksPositions = new StringBuilder()

-			StringBuilder sbInterfaceRoutePrefixes = new StringBuilder()

-			StringBuilder sbNetworksPositionsV6 = new StringBuilder()

 

 			NodeList vmsList = responseXml.getElementsByTagNameNS("*","vnf-vms")

 			for (int x = 0; x < vmsList.getLength(); x++) {

@@ -436,12 +363,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 								values = sb1.append(value);

 							}

 							position = i.toString()

-							String vnfPositionXml =

-									"""<entry>

-								<key>${key}_name_${position}</key>

-								<value>${value}</value>

-							</entry>"""

-							vnfVMSPositions = sbPositions.append(vnfPositionXml)

+							paramsMap.put("${key}_name_${position}", "${value}")

 						}

 					}

 					for(int n = 0; n < vmNetworksList.getLength(); n++){

@@ -459,19 +381,13 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 							networkKey = utils.getElementText(eElementNetworkKey, "network-role")

 							floatingIPKey = key + '_' + networkKey + '_floating_ip'

 							floatingIPKeyValue = utils.getElementText(eElementNetworkKey, "floating-ip")

-							if(!floatingIPKeyValue.isEmpty()){								

-								floatingIpKeyValueStr = """<entry>

-								<key>$floatingIPKey</key>

-								<value>$floatingIPKeyValue</value>

-							</entry>"""

+							if(!floatingIPKeyValue.isEmpty()){

+								paramsMap.put("$floatingIPKey", "$floatingIPKeyValue")

 							}

 							floatingIPV6Key = key + '_' + networkKey + '_floating_v6_ip'

 							floatingIPV6KeyValue = utils.getElementText(eElementNetworkKey, "floating-ip-v6")

-							if(!floatingIPV6KeyValue.isEmpty()){								

-								floatingIpV6KeyValueStr = """<entry>

-								<key>$floatingIPV6Key</key>

-								<value>$floatingIPV6KeyValue</value>

-							</entry>"""

+							if(!floatingIPV6KeyValue.isEmpty()){

+								paramsMap.put("$floatingIPV6Key", "$floatingIPV6KeyValue")

 							}

 							NodeList networkIpsList = eElementNetworkKey.getElementsByTagNameNS("*","network-ips")

 							for(int a = 0; a < networkIpsList.getLength(); a++){

@@ -486,50 +402,34 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 										ipAddressValues = sb2.append(ipAddressValue);

 									}

 									networkPosition = a.toString()

-									String vmNetworksPositionsXml =

-											"""<entry>

-										<key>${key}_${networkKey}_ip_${networkPosition}</key>

-										<value>${ipAddressValue}</value>

-									</entry>"""

-									vmNetworksPositions = sbNetworksPositions.append(vmNetworksPositionsXml)

+									paramsMap.put("${key}_${networkKey}_ip_${networkPosition}", "${ipAddressValue}")

 								}

 							}

-							vmNetworksPositions = sbNetworksPositions.append(floatingIpKeyValueStr).append(floatingIpV6KeyValueStr)

-						

-							String vmNetworksXml =

-									"""<entry>

-								<key>${key}_${networkKey}_ips</key>

-								<value>${ipAddressValues}</value>

-							</entry>"""

-							vmNetworks = sbVmNetworks.append(vmNetworksXml)

+							

+							paramsMap.put("${key}_${networkKey}_ips", "${ipAddressValues}")

 							

 							NodeList interfaceRoutePrefixesList = eElementNetworkKey.getElementsByTagNameNS("*","interface-route-prefixes")

 							String interfaceRoutePrefixValues = sb3.append("[")

 							

-							for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){								

-								Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)								

+							for(int a = 0; a < interfaceRoutePrefixesList.getLength(); a++){

+								Node interfaceRoutePrefix = interfaceRoutePrefixesList.item(a)

 								if (interfaceRoutePrefix.getNodeType() == Node.ELEMENT_NODE) {

 									Element eElementInterfaceRoutePrefix = (Element) interfaceRoutePrefix

 									String interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix-cidr")

 									if (interfaceRoutePrefixValue == null || interfaceRoutePrefixValue.isEmpty()) {

 										interfaceRoutePrefixValue = utils.getElementText(eElementInterfaceRoutePrefix, "interface-route-prefix")

 									}

-									if (a != interfaceRoutePrefixesList.getLength() - 1) {									

+									if (a != interfaceRoutePrefixesList.getLength() - 1) {

 										interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ",")

 									}

 									else {

 										interfaceRoutePrefixValues = sb3.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}")

-									}									

+									}

 								}

 							}

 							interfaceRoutePrefixValues = sb3.append("]")

 							if (interfaceRoutePrefixesList.getLength() > 0) {

-								String interfaceRoutePrefixesXml = 

-												"""<entry>

-											<key>${key}_${networkKey}_route_prefixes</key>

-											<value>${interfaceRoutePrefixValues}</value>

-										</entry>"""					

-								interfaceRoutePrefixes = sbInterfaceRoutePrefixes.append(interfaceRoutePrefixesXml)

+								paramsMap.put("${key}_${networkKey}_route_prefixes", "${interfaceRoutePrefixValues}")

 							}

 							

 							NodeList networkIpsV6List = eElementNetworkKey.getElementsByTagNameNS("*","network-ips-v6")

@@ -545,28 +445,13 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 										ipV6AddressValues = sb4.append(ipV6AddressValue);

 									}

 									networkPosition = a.toString()

-									String vmNetworksPositionsV6Xml =

-											"""<entry>

-										<key>${key}_${networkKey}_v6_ip_${networkPosition}</key>

-										<value>${ipV6AddressValue}</value>

-									</entry>"""

-									vmNetworksPositionsV6 = sbNetworksPositionsV6.append(vmNetworksPositionsV6Xml)

+									paramsMap.put("${key}_${networkKey}_v6_ip_${networkPosition}", "${ipV6AddressValue}")

 								}

 							}

-							String vmNetworksV6Xml =

-									"""<entry>

-								<key>${key}_${networkKey}_v6_ips</key>

-								<value>${ipV6AddressValues}</value>

-							</entry>"""

-							vmNetworks = sbVmNetworks.append(vmNetworksV6Xml)

+							paramsMap.put("${key}_${networkKey}_v6_ips", "${ipV6AddressValues}")

 						}

 					}

-					String vnfXml =

-							"""<entry>

-				<key>${key}_names</key>

-				<value>${values}</value>

-					</entry>"""

-					vnfVMS = sb.append(vnfXml)

+					paramsMap.put("${key}_names", "${values}")

 				}

 			}

 		//SDNC Response Params

@@ -575,7 +460,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 			String vnfParamsChildNodes = utils.getChildNodes(data, "vnf-parameters")

 			if(vnfParamsChildNodes == null || vnfParamsChildNodes.length() < 1){

 				// No SDNC params

-			}else{				

+			}else{

 				NodeList paramsList = responseXml.getElementsByTagNameNS("*", "vnf-parameters")

 				for (int z = 0; z < paramsList.getLength(); z++) {

 					Node node = paramsList.item(z)

@@ -583,34 +468,35 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 					String vnfParameterName = utils.getElementText(eElement, "vnf-parameter-name")

 					if (!sdncResponseParamsToSkip.contains(vnfParameterName)) {

 						String vnfParameterValue = utils.getElementText(eElement, "vnf-parameter-value")

-						String paraEntry =

-						"""<entry>

-							<key>${vnfParameterName}</key>

-							<value>${vnfParameterValue}</value>

-						</entry>"""

-						sdncResponseParams = sb.append(paraEntry)

+						paramsMap.put("${vnfParameterName}", "${vnfParameterValue}")

 					}

 				}

 			}

+			

+		// Parameters received from the request should overwrite any parameters received from SDNC

+		if (vnfParamsMap != null) {

+			for (Map.Entry<String, String> entry : vnfParamsMap.entrySet()) {

+				String vnfKey = entry.getKey()

+				String vnfValue = entry.getValue()

+				paramsMap.put("$vnfKey", "$vnfValue")

+			}

+		}

+		

+		StringBuilder sbParams = new StringBuilder()

+		def vfModuleParams = ""

+		for (Map.Entry<String, String> entry : paramsMap.entrySet()) {

+			String paramsXml

+			String paramName = entry.getKey()

+			String paramValue = entry.getValue()

+			paramsXml =

+					"""<entry>

+						<key>${paramName}</key>

+						<value>${paramValue}</value>

+					</entry>

+					"""

 

-

-		def vfModuleParams = """

-		${vnfInfo}

-		${aZones}

-		${vnfNetworkNetId}

-		${vnfNetworkNetName}

-		${vnfNetworkSubNetId}

-		${vnfNetworkV6SubNetId}

-		${vnfNetworkNetFqdn}

-		${vnfNetworksSriovVlanFilters}

-        ${vnfVMS}

-        ${vnfVMSPositions}

-		${vmNetworks}

-		${vmNetworksPositions}

-		${vmNetworksPositionsV6}

-		${interfaceRoutePrefixes}

-		${vnfParams}

-		${sdncResponseParams}"""

+			vfModuleParams = sbParams.append(paramsXml)

+		}

 		

 		return vfModuleParams

 		

@@ -618,7 +504,7 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor {
 	

 

 	/*

-	 * VBNG specific method that parses VNF parameters passed in on the

+	 * VBNG specific method that parses VNF parameters passed in on the 

 	 * incoming requests and SDNC parameters returned from SDNC get response

 	 * and puts them into the format expected by VNF adapter.

 	 * @param vnfParamsMap -  map of VNF parameters passed in the request body

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
new file mode 100644
index 0000000..214ae28
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
@@ -0,0 +1,352 @@
+package org.openecomp.mso.bpmn.common.workflow.service;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.camunda.bpm.BpmPlatform;

+import org.camunda.bpm.engine.MismatchingMessageCorrelationException;

+import org.camunda.bpm.engine.ProcessEngineServices;

+import org.camunda.bpm.engine.RuntimeService;

+import org.camunda.bpm.engine.runtime.Execution;

+import org.camunda.bpm.engine.runtime.MessageCorrelationResult;

+import org.openecomp.mso.bpmn.core.PropertyConfiguration;

+import org.openecomp.mso.logger.MessageEnum;

+import org.openecomp.mso.logger.MsoLogger;

+

+/**

+ * Abstract base class for callback services.

+ */

+public abstract class AbstractCallbackService {

+	public static final long DEFAULT_TIMEOUT_SECONDS = 60;

+	public static final long FAST_POLL_DUR_SECONDS = 5;

+	public static final long FAST_POLL_INT_MS = 100;

+	public static final long SLOW_POLL_INT_MS = 1000;

+	

+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

+

+	protected volatile ProcessEngineServices pes4junit = null;

+	

+	/**

+	 * Parameterized callback handler.

+	 */

+	protected CallbackResult handleCallback(String method, Object message,

+			String messageEventName, String messageVariable,

+			String correlationVariable, String correlationValue,

+			String logMarker) {

+

+		return handleCallback(method, message, messageEventName, messageVariable,

+			correlationVariable, correlationValue, logMarker, null);

+	}

+

+	/**

+	 * Parameterized callback handler.

+	 */

+	protected CallbackResult handleCallback(String method, Object message,

+			String messageEventName, String messageVariable,

+			String correlationVariable, String correlationValue,

+			String logMarker, Map<String, Object> injectedVariables) {

+

+		long startTime = System.currentTimeMillis();

+

+		LOGGER.debug(logMarker + " " + method + " received message: "

+			+ (message == null ? "" : System.lineSeparator()) + message);

+

+		try {

+			Map<String, Object> variables = new HashMap<String, Object>();

+

+			if (injectedVariables != null) {

+				variables.putAll(injectedVariables);

+			}

+

+			variables.put(correlationVariable, correlationValue);

+			variables.put(messageVariable, message == null ? null : message.toString());

+

+			boolean ok = correlate(messageEventName, correlationVariable,

+				correlationValue, variables, logMarker);

+

+			if (!ok) {

+				String msg = "No process is waiting for " + messageEventName

+					+ " with " + correlationVariable + " = '" + correlationValue + "'";

+				logCallbackError(method, startTime, msg);

+				return new CallbackError(msg);

+			}

+

+			logCallbackSuccess(method, startTime);

+			return new CallbackSuccess();

+		} catch (Exception e) {

+			String msg = "Caught " + e.getClass().getSimpleName()

+				+ " processing " + messageEventName + " with " + correlationVariable

+				+ " = '" + correlationValue + "'";

+			logCallbackError(method, startTime, msg);

+			return new CallbackError(msg);

+		}

+	}

+	

+	/**

+	 * Performs message correlation.  Waits a limited amount of time for

+	 * a process to become ready for correlation.  The return value indicates

+	 * whether or not a process was found to receive the message.  Due to the

+	 * synchronous nature of message injection in Camunda, by the time this

+	 * method returns, one of 3 things will have happened: (1) the process

+	 * received the message and ended, (2) the process received the message

+	 * and reached an activity that suspended, or (3) an exception occurred

+	 * during correlation or while the process was executing.  Correlation

+	 * exceptions are handled differently from process execution exceptions.

+	 * Correlation exceptions are thrown so the client knows something went

+	 * wrong with the delivery of the message.  Process execution exceptions

+	 * are logged but not thrown.

+	 * @param messageEventName the message event name

+	 * @param correlationVariable the process variable used as the correlator

+	 * @param correlationValue the correlation value

+	 * @param variables variables to inject into the process

+	 * @param logMarker a marker for debug logging

+	 * @return true if a process could be found, false if not

+	 * @throws Exception for correlation errors

+	 */

+	protected boolean correlate(String messageEventName, String correlationVariable,

+			String correlationValue, Map<String, Object> variables, String logMarker)

+			throws Exception {

+

+		LOGGER.debug(logMarker + " Attempting to find process waiting"

+			+ " for " + messageEventName + " with " + correlationVariable

+			+ " = '" + correlationValue + "'");

+

+		RuntimeService runtimeService =

+			getProcessEngineServices().getRuntimeService();

+

+		Map<String, String> properties =

+			PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");

+

+		long timeout = DEFAULT_TIMEOUT_SECONDS;

+

+		// The code is here in case we ever need to change the default.

+		String s = properties.get("mso.correlation.timeout");

+		if (s != null) {

+			try {

+				timeout = Long.parseLong(s);

+			} catch (NumberFormatException e) {

+				// Ignore

+			}

+		}

+

+		long now = System.currentTimeMillis();

+		long fastPollEndTime = now + (FAST_POLL_DUR_SECONDS * 1000);

+		long endTime = now + (timeout * 1000);

+		long sleep = FAST_POLL_INT_MS;

+

+		List<Execution> waitingProcesses = null;

+		Exception queryException = null;

+		int queryCount = 0;

+		int queryFailCount = 0;

+

+		while (true) {

+			try {

+				++queryCount;

+				waitingProcesses = runtimeService.createExecutionQuery()

+					.messageEventSubscriptionName(messageEventName)

+					.processVariableValueEquals(correlationVariable, correlationValue)

+					.list();

+			} catch (Exception e) {

+				++queryFailCount;

+				queryException = e;

+			}

+

+			if (waitingProcesses != null && waitingProcesses.size() > 0) {

+				break;

+			}

+

+			if (now > endTime - sleep) {

+				break;

+			}

+

+			Thread.sleep(sleep);

+			now = System.currentTimeMillis();

+

+			if (now > fastPollEndTime) {

+				sleep = SLOW_POLL_INT_MS;

+			}

+		}

+

+		if (waitingProcesses == null) {

+			waitingProcesses = new ArrayList<Execution>(0);

+		}

+

+		int count = waitingProcesses.size();

+

+		List<ExecInfo> execInfoList = new ArrayList<ExecInfo>(count);

+		for (Execution execution : waitingProcesses) {

+			execInfoList.add(new ExecInfo(execution));

+		}

+

+		LOGGER.debug(logMarker + " Found " + count + " process(es) waiting"

+			+ " for " + messageEventName + " with " + correlationVariable

+			+ " = '" + correlationValue + "': " + execInfoList);

+

+		if (count == 0) {

+			if (queryFailCount > 0) {

+				String msg = queryFailCount + "/" + queryCount

+					+ " execution queries failed attempting to correlate "

+					+ messageEventName + " with " + correlationVariable

+					+ " = '" + correlationValue + "'; last exception was:"

+					+ queryException;

+				LOGGER.debug(msg);

+				LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

+					MsoLogger.ErrorCode.UnknownError, msg, queryException);

+			}

+

+			return false;

+		}

+

+		if (count > 1) {

+			// Only one process should be waiting. Throw an exception back to the client.

+			throw new MismatchingMessageCorrelationException(messageEventName,

+				"more than 1 process is waiting with " + correlationVariable

+				+ " = '" + correlationValue + "'");

+		}

+		

+		// We prototyped an asynchronous solution, i.e. resuming the process

+		// flow in a separate thread, but this affected too many existing tests,

+		// and we went back to the synchronous solution. The synchronous solution

+		// has some troublesome characteristics though.  For example, the

+		// resumed flow may send request #2 to a remote system before MSO has

+		// acknowledged the notification associated with request #1.  

+

+		try {

+			LOGGER.debug(logMarker + " Running " + execInfoList.get(0) + " to receive "

+				+ messageEventName + " with " + correlationVariable + " = '"

+				+ correlationValue + "'");

+

+			@SuppressWarnings("unused")

+			MessageCorrelationResult result = runtimeService

+				.createMessageCorrelation(messageEventName)

+				.setVariables(variables)

+				.processInstanceVariableEquals(correlationVariable, correlationValue)

+				.correlateWithResult();

+

+		} catch (MismatchingMessageCorrelationException e) {

+			// A correlation exception occurred even after we identified

+			// one waiting process.  Throw it back to the client.

+			throw e;

+		} catch (Exception e) {

+			// This must be an exception from the flow itself.  Log it, but don't

+			// report it back to the client.

+			String msg = "Caught " + e.getClass().getSimpleName() + " running "

+				+ execInfoList.get(0) + " after receiving " + messageEventName

+				+ " with " + correlationVariable + " = '" + correlationValue

+				+ "': " + e;

+			LOGGER.debug(msg);

+			LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(),

+				MsoLogger.ErrorCode.UnknownError, msg, e);

+		}

+

+		return true;

+	}

+	

+	/**

+	 * Records audit and metric events in the log for a callback success.

+	 * @param method the method name

+	 * @param startTime the request start time

+	 */

+	protected void logCallbackSuccess(String method, long startTime) {

+		LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE,

+			MsoLogger.ResponseCode.Suc, "Completed " + method);

+

+		LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE,

+			MsoLogger.ResponseCode.Suc, "Completed " + method,

+			"BPMN", MsoLogger.getServiceName(), null);

+	}

+

+	/**

+	 * Records error, audit and metric events in the log for a callback

+	 * internal error.

+	 * @param method the method name

+	 * @param startTime the request start time

+	 * @param msg the error message

+	 */

+	protected void logCallbackError(String method, long startTime, String msg) {

+		logCallbackError(method, startTime, msg, null);

+	}

+

+	/**

+	 * Records error, audit and metric events in the log for a callback

+	 * internal error.

+	 * @param method the method name

+	 * @param startTime the request start time

+	 * @param msg the error message

+	 * @param e the exception

+	 */

+	protected void logCallbackError(String method, long startTime, String msg, Exception e) {

+		if (e == null) {

+			LOGGER.error(MessageEnum.BPMN_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

+				MsoLogger.ErrorCode.UnknownError, msg);

+		} else {

+			LOGGER.error(MessageEnum.BPMN_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

+				MsoLogger.ErrorCode.UnknownError, msg, e);

+		}

+

+		LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE,

+			MsoLogger.ResponseCode.InternalError, "Completed " + method);

+

+		LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE,

+			MsoLogger.ResponseCode.InternalError, "Completed " + method,

+			"BPMN", MsoLogger.getServiceName(), null);

+	}

+	

+	/**

+	 * Abstract callback result object.

+	 */

+	protected abstract class CallbackResult {

+	}

+

+	/**

+	 * Indicates that callback handling was successful.

+	 */

+	protected class CallbackSuccess extends CallbackResult {

+	}

+

+	/**

+	 * Indicates that callback handling failed.

+	 */

+	protected class CallbackError extends CallbackResult {

+		private final String errorMessage;

+

+		public CallbackError(String errorMessage) {

+			this.errorMessage = errorMessage;

+		}

+

+		/**

+		 * Gets the error message.

+		 */

+		public String getErrorMessage() {

+			return errorMessage;

+		}

+	}

+

+	private static class ExecInfo {

+		private final Execution execution;

+

+		public ExecInfo(Execution execution) {

+			this.execution = execution;

+		}

+	

+		@Override

+		public String toString() {

+			return "Process[" + execution.getProcessInstanceId()

+				+ ":" + execution.getId() + "]";

+		}

+	}

+	

+	protected ProcessEngineServices getProcessEngineServices() {

+		if (pes4junit == null) {

+			return BpmPlatform.getDefaultProcessEngine();

+		} else {

+			return pes4junit;

+		}

+	}

+

+	public void setProcessEngineServices4junit(ProcessEngineServices pes) {

+		pes4junit = pes;

+	}

+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
index 4585d62..16fa515 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
@@ -41,240 +41,53 @@ import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCCallbackAdapterPortType;
 import org.openecomp.mso.bpmn.core.PropertyConfiguration;

 import org.openecomp.mso.logger.MessageEnum;

 import org.openecomp.mso.logger.MsoLogger;

+

 /**

- * @version 1.0

- *  

+ * Implementation of SDNCAdapterCallbackService.

  */

 @WebService(serviceName="SDNCAdapterCallbackService", targetNamespace="http://org.openecomp/workflow/sdnc/adapter/schema/v1")

-public class SDNCAdapterCallbackServiceImpl implements SDNCCallbackAdapterPortType {

-

-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

-	private final int DEFAULT_RETRY_ATTEMPTS = 60;

-	private final int DEFAULT_SLEEP_TIME = 500;

+public class SDNCAdapterCallbackServiceImpl extends AbstractCallbackService implements SDNCCallbackAdapterPortType {

 

 	private final String logMarker = "[SDNC-CALLBACK]";

 

 	@Context WebServiceContext wsContext;

 

-	private volatile ProcessEngineServices pes4junit = null;

-

 	@WebMethod(operationName = "SDNCAdapterCallback")

     @WebResult(name = "SDNCAdapterResponse", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterCallbackResponse")

     public SDNCAdapterResponse sdncAdapterCallback(

             @WebParam(name = "SDNCAdapterCallbackRequest", targetNamespace = "http://org.openecomp/workflow/sdnc/adapter/schema/v1", partName = "SDNCAdapterCallbackRequest")

             SDNCAdapterCallbackRequest sdncAdapterCallbackRequest) {

 

-		//Callback URL to use http://localhost:28080/mso/SDNCAdapterCallbackService

-		ProcessEngineServices pes = getProcessEngineServices();

-		RuntimeService runtimeService = pes.getRuntimeService();

-		String receivedRequestId = sdncAdapterCallbackRequest.getCallbackHeader().getRequestId();

-		MsoLogger.setServiceName("MSO." + "sdncAdapter");

-		MsoLogger.setLogContext(receivedRequestId, "N/A");

-		msoLogger.debug(logMarker + "Received callback response:" + sdncAdapterCallbackRequest.toString());

-		SDNCAdapterResponse sdncAdapterResponse;

-		long startTime = System.currentTimeMillis();

-

-		/*Correlating the response with the running instance*/

-

-		// NOTE: the following loop is a workaround for problems we've had

-		// with reliability of the runtime service.  It seems that queries

-		// sometimes return results, and sometimes they don't.  This might

-		// be a problem in mysql only.  We aren't sure if it affects camunda

-		// on oracle or mariadb.  The workaround is to repeat the request

-		// a number of times until it succeeds.  If it doesn't succeed after

-		// 60 tries, then we give up.

-

-		int maxAttempts = DEFAULT_RETRY_ATTEMPTS;

-		int attempt = 1;

-		int sleepTime = DEFAULT_SLEEP_TIME;

+		String method = "sdncAdapterCallback";

+		Object message = sdncAdapterCallbackRequest;

+		String messageEventName = "sdncAdapterCallbackRequest";

+		String messageVariable = "sdncAdapterCallbackRequest";

+		String correlationVariable = "SDNCA_requestId";

+		String correlationValue = sdncAdapterCallbackRequest.getCallbackHeader().getRequestId();

 

-		Map<String,String> bpmnProperties = getMSOBPMNURNProperties();

-		if (bpmnProperties != null) {

-			try {

-				maxAttempts = Integer.parseInt(bpmnProperties.get("mso.callbackRetryAttempts"));

-				msoLogger.debug(logMarker + "mso.callbackRetryAttempts=" + maxAttempts);

-				sleepTime = Integer.parseInt(bpmnProperties.get("mso.callbackRetrySleepTime"));

-				msoLogger.debug(logMarker + "mso.callbackRetrySleepTime:" + sleepTime);

-			} catch (Exception ex) {

-				

-			msoLogger.debug (logMarker 						

-						+ "Error parsing mso.callbackRetrySleepTime/mso.callbackRetryAttempts:" 

-						+ sleepTime + ":" 

-						+ maxAttempts);

-				

-			}

-		}

-

-		/* Check to make sure the process instance is reay for correlation*/

-		try{

-			isReadyforCorrelation(runtimeService, receivedRequestId, maxAttempts, sleepTime );

-		}catch(Exception e){

-			String msg =

-				"SDNC Adapter Callback Service received a SDNC Adapter Callback Request with RequestId '"

-						+ receivedRequestId

-						+ "' but that RequestId doesn't exist or has timed out waiting for the callback";

-			sdncAdapterResponse = new SDNCAdapterExceptionResponse(e);

-			

-			msoLogger.error (MessageEnum.BPMN_SDNC_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

-					MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg, e);

-			

-			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 

-					+ "Completed the execution of MSO SDNCAdapterCallbackService." );

-			

-			msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-					logMarker + "Completed the execution of MSO SDNCAdapterCallbackService.", "BPMN", 

-					MsoLogger.getServiceName(), "sdncAdapterCallback");

-			

-			return sdncAdapterResponse;

-		}

+		MsoLogger.setServiceName("MSO." + method);

+		MsoLogger.setLogContext(correlationValue, "N/A");

 

-		msoLogger.debug(logMarker + "*** Received MSO sdncAdapterCallbackService ******");

-		

-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Call to MSO sdncAdapterCallbackService");		

-		

-		msoLogger.debug(logMarker + "Callback response string:\n"  + sdncAdapterCallbackRequest.toString());

+		CallbackResult result = handleCallback(method, message, messageEventName,

+			messageVariable, correlationVariable, correlationValue, logMarker);

 

-		String reqId = receivedRequestId;

-		Map<String,Object> variables = new HashMap<String,Object>();

-		variables.put("SDNCA_requestId", reqId );

-		variables.put("sdncAdapterCallbackRequest", sdncAdapterCallbackRequest.toString());

-		while (true) {

-			try {

-				// sdncAdapterCallbackRequest is the message event name (defined in the bpmn process)

-				runtimeService.createMessageCorrelation("sdncAdapterCallbackRequest")

-					.setVariables(variables)

-					.processInstanceVariableEquals("SDNCA_requestId", reqId).correlate();

-				sdncAdapterResponse = new SDNCAdapterResponse();

-				msoLogger.debug(logMarker + "***** Completed processing of MSO sdncAdapterCallbackService ******");

-				

-				msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 

-						+ "Completed the execution of MSO SDNCAdapterCallbackService.");

-				

-				msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-						logMarker + "Completed the execution of MSO SDNCAdapterCallbackService.", "BPMN", 

-						MsoLogger.getServiceName(), "sdncAdapterCallback");

-				

-				return sdncAdapterResponse;

-			} catch(MismatchingMessageCorrelationException e) {

-				msoLogger.debug(logMarker + "[CORM]correlation id mismatch (attempt " + attempt + "/" + maxAttempts + ")");

-				if (attempt == maxAttempts) {

-					// Couldn't correlate requestId to any active flow

-					//MsoLogger logger = MsoLogger.getMsoLogger("SDNCAdapterCallbackService");

-					String msg =

-						"SDNC Adapter Callback Service received a SDNC Adapter Callback Request with RequestId '"

-								+ receivedRequestId

-								+ "' but that RequestId could not be correlated to any active process - ignoring the Request";

-					sdncAdapterResponse = new SDNCAdapterExceptionResponse(e);

-					

-					msoLogger.error (MessageEnum.BPMN_SDNC_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

-							MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg, e);

-					

-					msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 

-							+ "Completed the execution of MSO SDNCAdapterCallbackService." );

-					

-					msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-							logMarker + "Completed the execution of MSO SDNCAdapterCallbackService.", "BPMN", 

-							MsoLogger.getServiceName(), "sdncAdapterCallback");

-					

-					return sdncAdapterResponse;

-				}

-

-				try {

-					Thread.sleep(sleepTime);

-				} catch (InterruptedException e2) {

-					String msg =

-						"SDNC Adapter Callback Service received a SDNC Adapter Callback Request with RequestId '"

-								+ receivedRequestId

-								+ "' but correlation was interrupted";

-					sdncAdapterResponse = new SDNCAdapterExceptionResponse(e);

-					

-					msoLogger.error (MessageEnum.BPMN_SDNC_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

-							MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg, e);

-					

-					msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 

-							+ "Completed the execution of MSO SDNCAdapterCallbackService.");

-					

-					msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 

-							logMarker + "Completed the execution of MSO SDNCAdapterCallbackService.", "BPMN", 

-							MsoLogger.getServiceName(), "sdncAdapterCallback");

-					

-					return sdncAdapterResponse;

-				}

-			}

-

-			attempt++;

-		}

-	}

-

-

-	private Map<String,String> getMSOBPMNURNProperties() {

-		PropertyConfiguration propertyConfiguration = PropertyConfiguration.getInstance();

-		Map<String,String> props = propertyConfiguration.getProperties("mso.bpmn.urn.properties");

-		return props;

-	}

-

-	private void isReadyforCorrelation(RuntimeService runtimeService,

-			String receivedRequestId, int retries, int sleepTime){

-		ExecutionQuery waitingInstances = null;

-		long waitingInstancesCount = 0;

-

-		//Workaround for performance testing, explicit wait for a second for the transactions to be committed

-		//Also check to make sure the process didn't timeout before trying to correlate

-		

-		do{

-		  waitingInstances = runtimeService.createExecutionQuery() //

-					.messageEventSubscriptionName("sdncAdapterCallbackRequest")

-					.processVariableValueEquals("SDNCA_requestId", receivedRequestId);

-		  waitingInstancesCount = waitingInstances.count();

-		  retries--;

-		  msoLogger.debug(logMarker + "waitingInstancesCount: " + waitingInstancesCount);

-		  try {

-				Thread.sleep(sleepTime);

-			  } catch (InterruptedException e) {

-				

-				msoLogger.error (MessageEnum.BPMN_SDNC_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 

-						MsoLogger.ErrorCode.UnknownError, logMarker, e);

-				

-			  }

-		}while (waitingInstancesCount==0 && retries > 0); 

-		if(waitingInstancesCount > 0){

-			msoLogger.debug(logMarker + "waitingInstancesCount before timeout check: " + waitingInstancesCount);

-			waitingInstancesCount = waitingInstances.processVariableValueEquals("asynchronousResponseTimeout", false).count();

-			msoLogger.debug(logMarker + "waitingInstancesCount after timeout check: " + waitingInstancesCount);

-			if(waitingInstancesCount<=0){

-				msoLogger.debug(logMarker + "detected timeout on flow to correlate");

-				throw new IllegalStateException("process timed out");

-			}

-		}else{

-			//flow may have already ended, so can't check timeout variable. Throw exception?

-			msoLogger.debug(logMarker + "no flow to correlate to");

-			throw new IllegalStateException("no flow to correlate to");

-		}

-	}

-

-	private ProcessEngineServices getProcessEngineServices() {

-		if (pes4junit == null) {

-			return BpmPlatform.getDefaultProcessEngine();

+		if (result instanceof CallbackError) {

+			return new SDNCAdapterErrorResponse(((CallbackError)result).getErrorMessage());

 		} else {

-			return pes4junit;

+			return new SDNCAdapterResponse();

 		}

 	}

 

-	@WebMethod(exclude=true)

-	public void setProcessEngineServices4junit(ProcessEngineServices pes) {

-		pes4junit = pes;

-	}

-

-	public class SDNCAdapterExceptionResponse extends SDNCAdapterResponse {

-		private Exception ex;

+	// This subclass allows unit tests to extract the error

+	public class SDNCAdapterErrorResponse extends SDNCAdapterResponse {

+		private String error;

 

-		public SDNCAdapterExceptionResponse(Exception ex) {

-			super();

-			this.ex = ex;

+		public SDNCAdapterErrorResponse(String error) {

+			this.error = error;

 		}

 

-		public Exception getException() {

-			return ex;

+		public String getError() {

+			return error;

 		}

 	}

-}

+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/VnfAdapterNotifyServiceImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/VnfAdapterNotifyServiceImpl.java
index 4577172..0faf5fe 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/VnfAdapterNotifyServiceImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/VnfAdapterNotifyServiceImpl.java
@@ -1,536 +1,249 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.common.workflow.service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.ws.rs.core.Context;
-import javax.xml.ws.Action;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.WebServiceContext;
-
-import org.camunda.bpm.BpmPlatform;
-import org.camunda.bpm.engine.MismatchingMessageCorrelationException;
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.RuntimeService;
-import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification;
-import org.openecomp.mso.bpmn.common.adapter.vnf.DeleteVnfNotification;
-import org.openecomp.mso.bpmn.common.adapter.vnf.MsoExceptionCategory;
-import org.openecomp.mso.bpmn.common.adapter.vnf.QueryVnfNotification;
-import org.openecomp.mso.bpmn.common.adapter.vnf.RollbackVnfNotification;
-import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification;
-import org.openecomp.mso.bpmn.common.adapter.vnf.VnfAdapterNotify;
-import org.openecomp.mso.bpmn.common.adapter.vnf.VnfRollback;
-import org.openecomp.mso.bpmn.common.adapter.vnf.VnfStatus;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
-
-/**
- * This is the service class for VnfAdapterNotify
- * TODO: Add addition VnfAdapterNotify Methods for remaining VnfAdapterNotify operations.
- */
-
-@WebService(serviceName = "vnfAdapterNotify", targetNamespace = "http://org.openecomp.mso/vnfNotify")
-public class VnfAdapterNotifyServiceImpl implements VnfAdapterNotify{
-
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.bpmn.common.workflow.service;

+

+import javax.jws.Oneway;

+import javax.jws.WebMethod;

+import javax.jws.WebParam;

+import javax.jws.WebService;

+import javax.ws.rs.core.Context;

+import javax.xml.ws.Action;

+import javax.xml.ws.RequestWrapper;

+import javax.xml.ws.WebServiceContext;

+

+import org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification;

+import org.openecomp.mso.bpmn.common.adapter.vnf.DeleteVnfNotification;

+import org.openecomp.mso.bpmn.common.adapter.vnf.MsoExceptionCategory;

+import org.openecomp.mso.bpmn.common.adapter.vnf.QueryVnfNotification;

+import org.openecomp.mso.bpmn.common.adapter.vnf.RollbackVnfNotification;

+import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification;

+import org.openecomp.mso.bpmn.common.adapter.vnf.VnfAdapterNotify;

+import org.openecomp.mso.bpmn.common.adapter.vnf.VnfRollback;

+import org.openecomp.mso.bpmn.common.adapter.vnf.VnfStatus;

+import org.openecomp.mso.logger.MsoLogger;

+

+/**

+ * Implementation of the VnfAdapterNotify service.

+ */

+@WebService(serviceName = "vnfAdapterNotify", targetNamespace = "http://org.openecomp.mso/vnfNotify")

+public class VnfAdapterNotifyServiceImpl extends AbstractCallbackService implements VnfAdapterNotify{

+

 	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
 
-	private final String logMarker = "[VNF-NOTIFY]";
-
-	@Context WebServiceContext wsContext;
-
-	private volatile ProcessEngineServices pes4junit = null;
-
-    /**
-     *
-     * @param errorMessage
-     * @param exception
-     * @param messageId
-     * @param completed
-     */
-    @WebMethod(operationName = "rollbackVnfNotification")
-    @Oneway
-    @RequestWrapper(localName = "rollbackVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.RollbackVnfNotification")
+	private final String logMarker = "[VNF-NOTIFY]";

+

+	@Context WebServiceContext wsContext;

+

+    @WebMethod(operationName = "rollbackVnfNotification")

+    @Oneway

+    @RequestWrapper(localName = "rollbackVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.RollbackVnfNotification")

     @Action(input = "http://org.openecomp.mso/notify/adapterNotify/rollbackVnfNotificationRequest")
-    public void rollbackVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage) {
-
-
-
-		RollbackVnfNotification rollbackVnfNotification = new RollbackVnfNotification();
-
-		rollbackVnfNotification.setMessageId(messageId);
-		rollbackVnfNotification.setCompleted(completed);
-		rollbackVnfNotification.setException(exception);
-		rollbackVnfNotification.setErrorMessage(errorMessage);
-
-		ProcessEngineServices pes = getProcessEngineServices();
-		RuntimeService runtimeService = pes.getRuntimeService();
-
-		MsoLogger.setServiceName("MSO." + "vnfAdapterRollback");
-		MsoLogger.setLogContext(messageId, "N/A");
-		msoLogger.debug(logMarker + "Received RollbackVnfNotification" + rollbackVnfNotification.toString());
-
-		long startTime = System.currentTimeMillis();
-		try {
-
-			/* Check to make sure the process instance is ready for correlation*/
-			isReadyforCorrelation(runtimeService, messageId, "rollbackVnfNotificationCallback", "VNFRB_messageId");
-
-			msoLogger.debug(logMarker + "*** Received MSO rollbackVnfNotification Callback ******");			
-			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Call to MSO VnfAdapterNotifyService ");			
-			msoLogger.debug(logMarker + "Rollback VNF Notification string:\n"  + rollbackVnfNotification.toString());
-
-			System.out.println("testing ROllbackVnfNotification : " + rollbackVnfNotification.toString());
-
-			Map<String,Object> variables = new HashMap<String,Object>();
-			variables.put("VNFRB_messageId", messageId );
-			variables.put("rollbackVnfNotificationCallback", rollbackVnfNotification.toString());
-
-			/*Correlating the response with the running instance*/
-
-			runtimeService.createMessageCorrelation("rollbackVnfNotificationCallback").setVariables(variables)
-				  .processInstanceVariableEquals("VNFRB_messageId", messageId).correlate();
-
-			msoLogger.debug(logMarker + "***** Completed processing of MSO VnfAdapterNotifyService ******");
-		} catch(MismatchingMessageCorrelationException e) {
-			msoLogger.debug(logMarker + "[CORM]correlation id mismatch");
-			String msg =
-				"VNF Adapter Notify Service received a Create VNF Notification request with RequestId '"
-				+ messageId
-				+ "' but that RequestId could not be correlated to any active process - ignoring the request";
-			
-			msoLogger.error (MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
-					MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg);
-			
-		}		
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO Vnf Adapter Notify for Rollback VNF Notification.");
-		
-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO Vnf Adapter Notify for Rollback VNF Notification.", "BPMN", 
-				MsoLogger.getServiceName(), "rollbackVnfNotification");
-		
-		return;
-	 }
-
-
-
-    /**
-     *
-     * @param errorMessage
-     * @param vnfExists
-     * @param status
-     * @param exception
-     * @param outputs
-     * @param messageId
-     * @param vnfId
-     * @param completed
-     */
-    @WebMethod(operationName = "queryVnfNotification")
-    @Oneway
+    public void rollbackVnfNotification(

+        @WebParam(name = "messageId", targetNamespace = "")

+        String messageId,

+        @WebParam(name = "completed", targetNamespace = "")

+        boolean completed,

+        @WebParam(name = "exception", targetNamespace = "")

+        MsoExceptionCategory exception,

+        @WebParam(name = "errorMessage", targetNamespace = "")

+        String errorMessage) {

+

+		RollbackVnfNotification rollbackVnfNotification = new RollbackVnfNotification();

+

+		rollbackVnfNotification.setMessageId(messageId);

+		rollbackVnfNotification.setCompleted(completed);

+		rollbackVnfNotification.setException(exception);

+		rollbackVnfNotification.setErrorMessage(errorMessage);

+

+		String method = "rollbackVnfNotification";

+		Object message = rollbackVnfNotification;

+		String messageEventName = "rollbackVnfNotificationCallback";

+		String messageVariable = "rollbackVnfNotificationCallback";

+		String correlationVariable = "VNFRB_messageId";

+		String correlationValue = messageId;

+

+		handleCallback(method, message, messageEventName, messageVariable,

+			correlationVariable, correlationValue, logMarker);

+    }

+

+    @WebMethod(operationName = "queryVnfNotification")

+    @Oneway

     @RequestWrapper(localName = "queryVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.QueryVnfNotification")
     @Action(input = "http://org.openecomp.mso/notify/adapterNotify/queryVnfNotificationRequest")
-    public void queryVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage,
-        @WebParam(name = "vnfExists", targetNamespace = "")
-        Boolean vnfExists,
-        @WebParam(name = "vnfId", targetNamespace = "")
-        String vnfId,
-        @WebParam(name = "status", targetNamespace = "")
-        VnfStatus status,
-        @WebParam(name = "outputs", targetNamespace = "")
-        org.openecomp.mso.bpmn.common.adapter.vnf.QueryVnfNotification.Outputs outputs){
-
-    	QueryVnfNotification queryVnfNotification = new QueryVnfNotification();
-
-    	queryVnfNotification.setMessageId(messageId);
-    	queryVnfNotification.setCompleted(completed);
-    	queryVnfNotification.setException(exception);
-    	queryVnfNotification.setErrorMessage(errorMessage);
-    	queryVnfNotification.setVnfExists(vnfExists);
-    	queryVnfNotification.setVnfId(vnfId);
-    	queryVnfNotification.setStatus(status);
-    	queryVnfNotification.setOutputs(outputs);
-
-
-    	ProcessEngineServices pes = getProcessEngineServices();
-		RuntimeService runtimeService = pes.getRuntimeService();
-
-		MsoLogger.setServiceName("MSO." + "vnf Adapter Query");
-		MsoLogger.setLogContext(messageId, "N/A");
-		msoLogger.debug(logMarker + "Received QueryVnfNotification" + queryVnfNotification.toString());
-
-		System.out.println("Received QueryVnfNotification : " + queryVnfNotification.toString());
-
-		long startTime = System.currentTimeMillis();
-		try {
-
-			/* Check to make sure the process instance is ready for correlation*/
-			isReadyforCorrelation(runtimeService, messageId, "queryVnfNotificationCallback", "VNFQ_messageId");
-
-			msoLogger.debug(logMarker + "*** Received MSO queryVnfNotification Callback ******");
-			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Call to MSO VnfAdapterNotifyService ");
-			msoLogger.debug(logMarker + "Query VNF Notification string:\n"  + queryVnfNotification.toString());
-
-			Map<String,Object> variables = new HashMap<String,Object>();
-			variables.put("VNFQ_messageId", messageId );
-			variables.put("queryVnfNotificationCallback", queryVnfNotification.toString());
-
-			/*Correlating the response with the running instance*/
-
-			runtimeService.createMessageCorrelation("queryVnfNotificationCallback").setVariables(variables)
-				  .processInstanceVariableEquals("VNFQ_messageId", messageId).correlate();
-
-			msoLogger.debug(logMarker + "***** Completed processing of MSO VnfAdapterNotifyService ******");
-		} catch(MismatchingMessageCorrelationException e) {
-			msoLogger.debug(logMarker + "[CORM]correlation id mismatch");
-			String msg =
-				"VNF Adapter Notify Service received a Query VNF Notification request with RequestId '"
-				+ messageId
-				+ "' but that RequestId could not be correlated to any active process - ignoring the request";
-			
-			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
-					MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg, e);
-		}
-
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO Vnf Adapter Notify for Query VNF Notification.");
-		
-		return;
-	 }
-
-
-
-
-    /**
-     *
-     * @param errorMessage
-     * @param exception
-     * @param rollback
-     * @param outputs
-     * @param messageId
-     * @param vnfId
-     * @param completed
-     */
-	@WebMethod(operationName = "createVnfNotification")
-    @Oneway
+    public void queryVnfNotification(

+        @WebParam(name = "messageId", targetNamespace = "")

+        String messageId,

+        @WebParam(name = "completed", targetNamespace = "")

+        boolean completed,

+        @WebParam(name = "exception", targetNamespace = "")

+        MsoExceptionCategory exception,

+        @WebParam(name = "errorMessage", targetNamespace = "")

+        String errorMessage,

+        @WebParam(name = "vnfExists", targetNamespace = "")

+        Boolean vnfExists,

+        @WebParam(name = "vnfId", targetNamespace = "")

+        String vnfId,

+        @WebParam(name = "status", targetNamespace = "")

+        VnfStatus status,

+        @WebParam(name = "outputs", targetNamespace = "")

+        QueryVnfNotification.Outputs outputs){

+

+		String method = "queryVnfNotification";

+		String messageEventName = "queryVnfNotificationCallback";

+		String messageVariable = "queryVnfNotificationCallback";

+		String correlationVariable = "VNFQ_messageId";

+		String correlationValue = messageId;

+

+		MsoLogger.setServiceName("MSO." + method);

+		MsoLogger.setLogContext(correlationValue, "N/A");

+

+    	QueryVnfNotification message = new QueryVnfNotification();

+

+    	message.setMessageId(messageId);

+    	message.setCompleted(completed);

+    	message.setException(exception);

+    	message.setErrorMessage(errorMessage);

+    	message.setVnfExists(vnfExists);

+    	message.setVnfId(vnfId);

+    	message.setStatus(status);

+    	message.setOutputs(outputs);

+

+		handleCallback(method, message, messageEventName, messageVariable,

+			correlationVariable, correlationValue, logMarker);

+    }

+

+	@WebMethod(operationName = "createVnfNotification")

+    @Oneway

     @RequestWrapper(localName = "createVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.CreateVnfNotification")
     @Action(input = "http://org.openecomp.mso/notify/adapterNotify/createVnfNotificationRequest")
-	public void createVnfNotification(
-			@WebParam(name = "messageId", targetNamespace = "")
-	        String messageId,
-	        @WebParam(name = "completed", targetNamespace = "")
-	        boolean completed,
-	        @WebParam(name = "exception", targetNamespace = "")
-	        MsoExceptionCategory exception,
-	        @WebParam(name = "errorMessage", targetNamespace = "")
-	        String errorMessage,
-	        @WebParam(name = "vnfId", targetNamespace = "")
-	        String vnfId,
-	        @WebParam(name = "outputs", targetNamespace = "")
-	        org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs outputs,
-	        @WebParam(name = "rollback", targetNamespace = "")
-	        VnfRollback rollback){
-
-		CreateVnfNotification createVnfNotification = new CreateVnfNotification();
-
-		createVnfNotification.setMessageId(messageId);
-		createVnfNotification.setCompleted(completed);
-		createVnfNotification.setException(exception);
-		createVnfNotification.setErrorMessage(errorMessage);
-		createVnfNotification.setVnfId(vnfId);
-		createVnfNotification.setOutputs(outputs);
-		createVnfNotification.setRollback(rollback);
-
-		ProcessEngineServices pes = getProcessEngineServices();
-		RuntimeService runtimeService = pes.getRuntimeService();
-
-		MsoLogger.setServiceName("MSO." + "vnf Adapter Create");
-		MsoLogger.setLogContext(messageId, "N/A");
-		msoLogger.debug(logMarker + "Received CreateVnfNotification - " + createVnfNotification.toString());
-
-		long startTime = System.currentTimeMillis();
-		try {
-
-			/* Check to make sure the process instance is ready for correlation*/
-			isReadyforCorrelation(runtimeService, messageId, "createVnfNotificationCallback", "VNFC_messageId");
-
-			msoLogger.debug(logMarker + "*** Received MSO createVnfNotification Callback ******");
-			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Call to MSO VnfAdapterNotifyService ");
-			
-			msoLogger.debug(logMarker + "Create VNF Notification string:\n"  + createVnfNotification.toString());
-
-			Map<String,Object> variables = new HashMap<String,Object>();
-			variables.put("VNFC_messageId", messageId );
-			variables.put("createVnfNotificationCallback", createVnfNotification.toString());
-
-			/*Correlating the response with the running instance*/
-
-			runtimeService.createMessageCorrelation("createVnfNotificationCallback").setVariables(variables)
-				  .processInstanceVariableEquals("VNFC_messageId", messageId).correlate();
-
-			msoLogger.debug(logMarker + "***** Completed processing of MSO VnfAdapterNotifyService ******");
-		} catch(MismatchingMessageCorrelationException e) {
-			msoLogger.debug(logMarker + "[CORM]correlation id mismatch");
-			String msg =
-				"VNF Adapter Notify Service received a Create VNF Notification request with RequestId '"
-				+ messageId
-				+ "' but that RequestId could not be correlated to any active process - ignoring the request";
-			
-			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
-					MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg, e);
-			
-		}
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO Vnf Adapter Notify for Query VNF Notification.");
-		
-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO Vnf Adapter Notify for Query VNF Notification.", "BPMN", 
-				MsoLogger.getServiceName(), "createVnfNotification");
-		
-		return;
-	 }
-
-    /**
-     *
-     * @param errorMessage
-     * @param exception
-     * @param rollback
-     * @param outputs
-     * @param messageId
-     * @param completed
-     */
-	@WebMethod(operationName = "updateVnfNotification")
-    @Oneway
+	public void createVnfNotification(

+			@WebParam(name = "messageId", targetNamespace = "")

+	        String messageId,

+	        @WebParam(name = "completed", targetNamespace = "")

+	        boolean completed,

+	        @WebParam(name = "exception", targetNamespace = "")

+	        MsoExceptionCategory exception,

+	        @WebParam(name = "errorMessage", targetNamespace = "")

+	        String errorMessage,

+	        @WebParam(name = "vnfId", targetNamespace = "")

+	        String vnfId,

+	        @WebParam(name = "outputs", targetNamespace = "")

+	        CreateVnfNotification.Outputs outputs,

+	        @WebParam(name = "rollback", targetNamespace = "")

+	        VnfRollback rollback){

+

+		String method = "createVnfNotification";

+		String messageEventName = "createVnfNotificationCallback";

+		String messageVariable = "createVnfNotificationCallback";

+		String correlationVariable = "VNFC_messageId";

+		String correlationValue = messageId;

+

+		MsoLogger.setServiceName("MSO." + method);

+		MsoLogger.setLogContext(correlationValue, "N/A");

+

+		CreateVnfNotification message = new CreateVnfNotification();

+

+		message.setMessageId(messageId);

+		message.setCompleted(completed);

+		message.setException(exception);

+		message.setErrorMessage(errorMessage);

+		message.setVnfId(vnfId);

+		message.setOutputs(outputs);

+		message.setRollback(rollback);

+

+		handleCallback(method, message, messageEventName, messageVariable,

+			correlationVariable, correlationValue, logMarker);

+	 }

+

+	@WebMethod(operationName = "updateVnfNotification")

+    @Oneway

     @RequestWrapper(localName = "updateVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.UpdateVnfNotification")
     @Action(input = "http://org.openecomp.mso/notify/adapterNotify/updateVnfNotificationRequest")
-    public void updateVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage,
-        @WebParam(name = "outputs", targetNamespace = "")
-        org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification.Outputs outputs,
-        @WebParam(name = "rollback", targetNamespace = "")
-        VnfRollback rollback){
-
-    	UpdateVnfNotification updateVnfNotification = new UpdateVnfNotification();
-
-    	updateVnfNotification.setMessageId(messageId);
-    	updateVnfNotification.setCompleted(completed);
-    	updateVnfNotification.setException(exception);
-    	updateVnfNotification.setErrorMessage(errorMessage);
-    	updateVnfNotification.setOutputs(outputs);
-    	updateVnfNotification.setRollback(rollback);
-
-		ProcessEngineServices pes = getProcessEngineServices();
-		RuntimeService runtimeService = pes.getRuntimeService();
-
-		MsoLogger.setServiceName("MSO." + "vnf Adapter Update");
-		MsoLogger.setLogContext(messageId, "N/A");
-		msoLogger.debug(logMarker + "Received UpdateVnfNotification - " + updateVnfNotification.toString());
-
-		long startTime = System.currentTimeMillis();
-		try {
-
-			// Check to make sure the process instance is ready for correlation
-			isReadyforCorrelation(runtimeService, messageId, "updateVnfNotificationCallback", "VNFU_messageId");
-
-			msoLogger.debug(logMarker + "*** Received MSO updateVnfNotification Callback ******");
-			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Call to MSO VnfAdapterNotifyService ");
-			
-			msoLogger.debug(logMarker + "Update VNF Notification string:\n"  + updateVnfNotification.toString());
-
-			Map<String,Object> variables = new HashMap<String,Object>();
-			variables.put("VNFU_messageId", messageId );
-			variables.put("updateVnfNotificationCallback", updateVnfNotification.toString());
-
-			//Correlating the response with the running instance
-			runtimeService.createMessageCorrelation("updateVnfNotificationCallback").setVariables(variables)
-				  .processInstanceVariableEquals("VNFU_messageId", messageId).correlate();
-
-			msoLogger.debug(logMarker + "***** Completed processing of MSO VnfAdapterNotifyService ******");
-			
-		} catch(MismatchingMessageCorrelationException e) {
-			msoLogger.debug(logMarker + "[CORM]correlation id mismatch");
-			String msg =
-				"VNF Adapter Notify Service received a Update VNF Notification request with RequestId '"
-				+ messageId
-				+ "' but that RequestId could not be correlated to any active process - ignoring the request";
-			
-			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
-					MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg, e);
-			
-		}
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO Vnf Adapter Notify for Update VNF Notification.");
-		
-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO Vnf Adapter Notify for Update VNF Notification.", "BPMN", 
-				MsoLogger.getServiceName(), "updateVnfNotification");
-		
-		return;
-	 }
-
-    /**
-     *
-     * @param errorMessage
-     * @param exception
-     * @param messageId
-     * @param completed
-     */
-
-    //@WebService(serviceName="VNFAdapterDeleteCallbackV1", targetNamespace="http://org.openecomp.mso/vnfNotify")
-    @WebMethod(operationName = "deleteVnfNotification")
-    @Oneway
+    public void updateVnfNotification(

+        @WebParam(name = "messageId", targetNamespace = "")

+        String messageId,

+        @WebParam(name = "completed", targetNamespace = "")

+        boolean completed,

+        @WebParam(name = "exception", targetNamespace = "")

+        MsoExceptionCategory exception,

+        @WebParam(name = "errorMessage", targetNamespace = "")

+        String errorMessage,

+        @WebParam(name = "outputs", targetNamespace = "")

+        UpdateVnfNotification.Outputs outputs,

+        @WebParam(name = "rollback", targetNamespace = "")

+        VnfRollback rollback){

+

+		String method = "updateVnfNotification";

+		String messageEventName = "updateVnfNotificationCallback";

+		String messageVariable = "updateVnfNotificationCallback";

+		String correlationVariable = "VNFU_messageId";

+		String correlationValue = messageId;

+

+		MsoLogger.setServiceName("MSO." + method);

+		MsoLogger.setLogContext(correlationValue, "N/A");

+

+    	UpdateVnfNotification message = new UpdateVnfNotification();

+

+    	message.setMessageId(messageId);

+    	message.setCompleted(completed);

+    	message.setException(exception);

+    	message.setErrorMessage(errorMessage);

+    	message.setOutputs(outputs);

+    	message.setRollback(rollback);

+

+		handleCallback(method, message, messageEventName, messageVariable,

+			correlationVariable, correlationValue, logMarker);

+	 }

+

+    @WebMethod(operationName = "deleteVnfNotification")

+    @Oneway

     @RequestWrapper(localName = "deleteVnfNotification", targetNamespace = "http://org.openecomp.mso/vnfNotify", className = "org.openecomp.mso.adapters.vnf.async.client.DeleteVnfNotification")
     @Action(input = "http://org.openecomp.mso/notify/adapterNotify/deleteVnfNotificationRequest")
-    public void deleteVnfNotification(
-        @WebParam(name = "messageId", targetNamespace = "")
-        String messageId,
-        @WebParam(name = "completed", targetNamespace = "")
-        boolean completed,
-        @WebParam(name = "exception", targetNamespace = "")
-        MsoExceptionCategory exception,
-        @WebParam(name = "errorMessage", targetNamespace = "")
-        String errorMessage) {
-
-		//Callback URL to use http://localhost:28080/mso/services/VNFAdapterDeleteCallbackV1
-
-    	//DeleteVnfNotification Class
-    	DeleteVnfNotification deleteVnfNotification = new DeleteVnfNotification();
-    	deleteVnfNotification.setMessageId(messageId);
-    	deleteVnfNotification.setCompleted(completed);
-    	deleteVnfNotification.setException(exception);
-    	deleteVnfNotification.setErrorMessage(errorMessage);
-
-		ProcessEngineServices pes = getProcessEngineServices();
-		RuntimeService runtimeService = pes.getRuntimeService();
-
-		MsoLogger.setServiceName("MSO." + "vnfAdapterDelete");
-		MsoLogger.setLogContext(messageId, "N/A");
-		msoLogger.debug(logMarker + "Received DeleteVnfNotification callback: " + deleteVnfNotification.toString());
-
-		long startTime = System.currentTimeMillis();
-		try {
-
-			/* Check to make sure the process instance is ready for correlation*/
-			//isReadyforCorrelation(runtimeService, messageId, "deleteVnfACallback", "VNFDEL_uuid");
-
-			msoLogger.debug(logMarker + " *** Received MSO deleteVnfACallback ******");			
-			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Call to MSO deleteVnfACallback ");		
-			msoLogger.debug(logMarker + " Callback response string:\n"  + deleteVnfNotification.toString());
-
-			Map<String,Object> variables = new HashMap<String,Object>();
-			variables.put("VNFDEL_uuid", messageId);
-			variables.put("deleteVnfACallback", deleteVnfNotification.toString());
-
-			/*Correlating the response with the running instance*/
-
-			runtimeService.createMessageCorrelation("deleteVnfACallback")
-				  .setVariables(variables)
-				  .processInstanceVariableEquals("VNFDEL_uuid", messageId).correlate();
-
-			msoLogger.debug(logMarker + "***** Completed processing of MSO deleteVnfACallback ******");
-
-		} catch(MismatchingMessageCorrelationException e) {
-
-			msoLogger.debug(logMarker + " [CORM]correlation id mismatch");
-			// Couldn't correlate requestId to any active flow
-			//MsoLogger logger = MsoLogger.getMsoLogger("SDNCAdapterCallbackService");
-
-			String msg =
-				"Vnf Adapter Callback Service received a Vnf Adapter Callback with messageId '"
-				+ messageId
-				+ "' but that messageId could not be correlated to any active process - ignoring the Request";
-			
-			msoLogger.error(MessageEnum.BPMN_SDNC_CALLBACK_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
-					MsoLogger.ErrorCode.UnknownError, logMarker + ":" + msg, e);
-
-		}
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO VNFAdapterDeleteCallbackV1.");
-		
-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + "Completed the execution of MSO VNFAdapterDeleteCallbackV1.", "BPMN", 
-				MsoLogger.getServiceName(), "deleteVnfNotification");
-		
-		return;
-	}
-
-	private void isReadyforCorrelation(RuntimeService runtimeService, String requestId, String responseName, String correlationValue) {
-
-		long waitingInstances = runtimeService.createExecutionQuery().messageEventSubscriptionName(responseName).processVariableValueEquals(correlationValue, requestId).count();
-		int retries = 50;
-		while (waitingInstances==0 && retries > 0) {
-		  try {
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-            // should I add new exception Message to MessageEnum???
-			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logMarker, e);
-			
-		} // you can still play with the numbers
-		  waitingInstances = runtimeService.createExecutionQuery() //
-			  .messageEventSubscriptionName(responseName)
-			  .processVariableValueEquals(correlationValue, requestId).count();
-		  retries--;
-		}
-	}
-
-
-	private ProcessEngineServices getProcessEngineServices() {
-		if (pes4junit == null) {
-			return BpmPlatform.getDefaultProcessEngine();
-		} else {
-			return pes4junit;
-		}
-	}
-
-	@WebMethod(exclude=true)
-	public void setProcessEngineServices4junit(ProcessEngineServices pes) {
-		pes4junit = pes;
-	}
-}
+    public void deleteVnfNotification(

+        @WebParam(name = "messageId", targetNamespace = "")

+        String messageId,

+        @WebParam(name = "completed", targetNamespace = "")

+        boolean completed,

+        @WebParam(name = "exception", targetNamespace = "")

+        MsoExceptionCategory exception,

+        @WebParam(name = "errorMessage", targetNamespace = "")

+        String errorMessage) {

+

+		String method = "deleteVnfNotification";

+		String messageEventName = "deleteVnfACallback";

+		String messageVariable = "deleteVnfACallback";

+		String correlationVariable = "VNFDEL_uuid";

+		String correlationValue = messageId;

+

+		MsoLogger.setServiceName("MSO." + method);

+		MsoLogger.setLogContext(correlationValue, "N/A");

+

+    	DeleteVnfNotification message = new DeleteVnfNotification();

+

+    	message.setMessageId(messageId);

+    	message.setCompleted(completed);

+    	message.setException(exception);

+    	message.setErrorMessage(errorMessage);

+

+		handleCallback(method, message, messageEventName, messageVariable,

+			correlationVariable, correlationValue, logMarker);

+	}

+}
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java
index 5afbded..698ec13 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;

 

 import javax.ws.rs.Consumes;

+import javax.ws.rs.HeaderParam;

 import javax.ws.rs.POST;

 import javax.ws.rs.Path;

 import javax.ws.rs.PathParam;

@@ -11,10 +12,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;

 import javax.ws.rs.core.Response;

 

-import org.camunda.bpm.BpmPlatform;

-import org.camunda.bpm.engine.ProcessEngineServices;

-import org.camunda.bpm.engine.RuntimeService;

-

 import org.openecomp.mso.logger.MessageEnum;

 import org.openecomp.mso.logger.MsoLogger;

 

@@ -27,25 +24,29 @@ import org.openecomp.mso.logger.MsoLogger;
  * </pre>

  */

 @Path("/")

-public class WorkflowMessageResource {

+public class WorkflowMessageResource extends AbstractCallbackService {

 	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);

 	private static final String LOGMARKER = "[WORKFLOW-MESSAGE]";

-

-	private ProcessEngineServices pes4junit = null;

 	

 	@POST

 	@Path("/WorkflowMessage/{messageType}/{correlator}")

 	@Consumes("*/*")

 	@Produces(MediaType.TEXT_PLAIN)

-	public Response deliver(@PathParam("messageType") String messageType,

-			@PathParam("correlator") String correlator, String message) {

+	public Response deliver(

+			@HeaderParam("Content-Type") String contentType,

+			@PathParam("messageType") String messageType,

+			@PathParam("correlator") String correlator,

+			String message) {

+

+		String method = "receiveWorkflowMessage";

+		MsoLogger.setServiceName("MSO." + method);

+		MsoLogger.setLogContext(correlator, "N/A");

 

 		LOGGER.debug(LOGMARKER + " Received workflow message"

 			+ " type='" + messageType + "'"

 			+ " correlator='" + correlator + "'"

-			+ System.lineSeparator() + message);

-

-		MsoLogger.setServiceName("MSO." + "WorkflowMessage");

+			+ (contentType == null ? "" : " contentType='" + contentType + "'")

+			+ " message=" + System.lineSeparator() + message);

 

 		if (messageType == null || messageType.isEmpty()) {

 			String msg = "Missing message type";

@@ -63,79 +64,25 @@ public class WorkflowMessageResource {
 			return Response.status(400).entity(msg).build();

 		}

 

-		String correlatorVariable = messageType + "_CORRELATOR";

+		String messageEventName = "WorkflowMessage";

 		String messageVariable = messageType + "_MESSAGE";

+		String correlationVariable = messageType + "_CORRELATOR";

+		String correlationValue = correlator;

+		String contentTypeVariable = messageType + "_CONTENT_TYPE";

 

-		long startTime = System.currentTimeMillis();

-

-		try {

-			RuntimeService runtimeService = getProcessEngineServices().getRuntimeService();

-

-			if (!isReadyforCorrelation(runtimeService, correlatorVariable, correlator)) {

-				String msg = "No process is waiting to receive '" + messageType + "' WorkflowMessage with correlator '" + correlator + "'";

-				LOGGER.debug(LOGMARKER + " " + msg);

-				LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, LOGMARKER + ":" + msg);

-				LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.BusinessProcesssError, msg, "BPMN", MsoLogger.getServiceName(), messageType);

-				LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.BusinessProcesssError, msg);

-				return Response.status(500).entity(msg).build();

-			}

+		Map<String, Object> variables = new HashMap<String, Object>();

 

-			Map<String, Object> variables = new HashMap<String, Object>();

-			variables.put(correlatorVariable, correlator);

-			variables.put(messageVariable, message);

-

-			runtimeService.createMessageCorrelation("WorkflowMessage").setVariables(variables)

-				.processInstanceVariableEquals(correlatorVariable, correlator).correlate();

-

-			String msg = "Completed delivery of '" + messageType + "' WorkflowMessage with correlator '" + correlator + "'";

-			LOGGER.debug(LOGMARKER + msg);

-			LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, msg, "BPMN", MsoLogger.getServiceName(), messageType);

-			LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, msg);

-			return Response.status(204).build();

-		} catch (Exception e) {

-			// For example: MismatchingMessageCorrelationException

-			String msg = "Caught " + e.getClass().getSimpleName() + " processing '" + messageType + "' WorkflowMessage with " + correlatorVariable + "='" + correlator + "'";

-			LOGGER.debug(LOGMARKER + " " + msg);

-			LOGGER.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, LOGMARKER + ":" + msg, e);

-			LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, msg, "BPMN", MsoLogger.getServiceName(), messageType);

-			LOGGER.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, msg);

-			return Response.status(500).entity(msg).build();

+		if (contentType != null) {

+			variables.put(contentTypeVariable, contentType);

 		}

-	}

-	

-	private boolean isReadyforCorrelation(RuntimeService runtimeService,

-			String correlationVariable, String correlationValue)

-			throws InterruptedException {

-

-		long waitingInstances = runtimeService.createExecutionQuery()

-			.messageEventSubscriptionName("WorkflowMessage")

-			.processVariableValueEquals(correlationVariable, correlationValue)

-			.count();

-

-		int retries = 50;

-		while (waitingInstances == 0 && retries > 0) {

-			Thread.sleep(100);

 

-			waitingInstances = runtimeService.createExecutionQuery()

-				.messageEventSubscriptionName("WorkflowMessage")

-				.processVariableValueEquals(correlationVariable, correlationValue)

-				.count();

-

-			retries--;

-		}

+		CallbackResult result = handleCallback(method, message, messageEventName,

+			messageVariable, correlationVariable, correlationValue, LOGMARKER, variables);

 

-		return waitingInstances != 0;

-	}

-	

-	private ProcessEngineServices getProcessEngineServices() {

-		if (pes4junit == null) {

-			return BpmPlatform.getDefaultProcessEngine();

+		if (result instanceof CallbackError) {

+			return Response.status(500).entity(((CallbackError)result).getErrorMessage()).build();

 		} else {

-			return pes4junit;

+			return Response.status(204).build();

 		}

 	}

-

-	public void setProcessEngineServices4junit(ProcessEngineServices pes) {

-		pes4junit = pes;

-	}

 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
index af615e3..6f012bc 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/GenericGetService.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_D5VzAHElEeaJwpcpVN5gXw" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_D5VzAHElEeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="GenericGetService" name="GenericGetService" isExecutable="true">
     <bpmn2:scriptTask id="intialization" name="Initialization" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
@@ -9,16 +9,16 @@ GenericGetService getService = new GenericGetService()
 getService.preProcessRequest(execution)
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="getUrl"/>
-    <bpmn2:exclusiveGateway id="getUrl" name="Get Url?" default="getUrlNo">
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="getUrl" />
+    <bpmn2:exclusiveGateway id="getUrl" name="Need Object&#39;s Url?" default="getUrlNo">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>getUrlYes</bpmn2:outgoing>
       <bpmn2:outgoing>getUrlNo</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="getUrlYes" name="Yes" sourceRef="getUrl" targetRef="obtain">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_obtainServiceInstanceUrl" ) == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_obtainObjectsUrl" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="getUrlNo" name="No" sourceRef="getUrl" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:sequenceFlow id="getUrlNo" name="No" sourceRef="getUrl" targetRef="ExclusiveGateway_2" />
     <bpmn2:subProcess id="bpmnExceptionHandlingSubProcess" name="Error Handling Sub Process" triggeredByEvent="true">
       <bpmn2:scriptTask id="processBPMNException" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
@@ -28,12 +28,12 @@ getService.preProcessRequest(execution)
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="processBPMNException" targetRef="EndEvent_2"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="processBPMNException" targetRef="EndEvent_2" />
       <bpmn2:startEvent id="StartEvent_2">
         <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1"/>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />
       </bpmn2:startEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="StartEvent_2" targetRef="processBPMNException"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="StartEvent_2" targetRef="processBPMNException" />
       <bpmn2:endEvent id="EndEvent_2">
         <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
       </bpmn2:endEvent>
@@ -46,43 +46,43 @@ GenericGetService getService = new GenericGetService()
 getService.setSuccessIndicator(execution, true)
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1"/>
-    <bpmn2:scriptTask id="getServiceInstance" name="GET&#xD;&#xA;Service Instance" scriptFormat="groovy">
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="toggleSuccess" targetRef="EndEvent_1" />
+    <bpmn2:scriptTask id="getServiceInstance" name="GET&#10;Object" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.getServiceObject(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getServiceInstance" targetRef="toggleSuccess"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getServiceInstance" targetRef="toggleSuccess" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_2">
       <bpmn2:incoming>getUrlNo</bpmn2:incoming>
       <bpmn2:incoming>foundYes</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_2" targetRef="getServiceInstance"/>
-    <bpmn2:scriptTask id="obtainServiceUrlById" name="Obtain Service URL Using&#xD;&#xA;Id" scriptFormat="groovy">
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ExclusiveGateway_2" targetRef="getServiceInstance" />
+    <bpmn2:scriptTask id="obtainServiceUrlById" name="Node Query Using Id&#10;" scriptFormat="groovy">
       <bpmn2:incoming>obtainById</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.obtainServiceInstanceUrlById(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="obtainServiceUrlById" targetRef="ExclusiveGateway_3"/>
-    <bpmn2:scriptTask id="obtainServiceUrlByName" name="Obtain Service Url Using&#xD;&#xA;Name" scriptFormat="groovy">
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="obtainServiceUrlById" targetRef="ExclusiveGateway_3" />
+    <bpmn2:scriptTask id="obtainServiceUrlByName" name="Node Query Using Name" scriptFormat="groovy">
       <bpmn2:incoming>obtainByName</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 GenericGetService getService = new GenericGetService()
 getService.obtainServiceInstanceUrlByName(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="obtainServiceUrlByName" targetRef="ExclusiveGateway_3"/>
-    <bpmn2:exclusiveGateway id="obtain" name="Obtain By?" default="obtainById">
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="obtainServiceUrlByName" targetRef="ExclusiveGateway_3" />
+    <bpmn2:exclusiveGateway id="obtain" name="Query By?" default="obtainById">
       <bpmn2:incoming>getUrlYes</bpmn2:incoming>
       <bpmn2:outgoing>obtainById</bpmn2:outgoing>
       <bpmn2:outgoing>obtainByName</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="obtainById" name="Id" sourceRef="obtain" targetRef="obtainServiceUrlById"/>
+    <bpmn2:sequenceFlow id="obtainById" name="Id" sourceRef="obtain" targetRef="obtainServiceUrlById" />
     <bpmn2:sequenceFlow id="obtainByName" name="Name" sourceRef="obtain" targetRef="obtainServiceUrlByName">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_obtainServiceInstanceUrlByName" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
@@ -94,226 +94,226 @@ getService.obtainServiceInstanceUrlByName(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="foundYes" name="Yes" sourceRef="serviceFoundCheck" targetRef="ExclusiveGateway_2">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="notFound" name="No" sourceRef="serviceFoundCheck" targetRef="EndEvent_3"/>
+    <bpmn2:sequenceFlow id="notFound" name="No" sourceRef="serviceFoundCheck" targetRef="EndEvent_3" />
     <bpmn2:endEvent id="EndEvent_3">
       <bpmn2:incoming>notFound</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_29"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_29" />
     </bpmn2:endEvent>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_3">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ExclusiveGateway_3" targetRef="serviceFoundCheck"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ExclusiveGateway_3" targetRef="serviceFoundCheck" />
     <bpmn2:endEvent id="EndEvent_1">
       <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_26"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_26" />
     </bpmn2:endEvent>
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization" />
   </bpmn2:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="GenericGetService">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_69" bpmnElement="StartEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="108.0" y="264.0"/>
+        <dc:Bounds x="108" y="264" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="126.0" y="305.0"/>
+          <dc:Bounds x="126" y="305" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_288" bpmnElement="intialization">
-        <dc:Bounds height="80.0" width="100.0" x="228.0" y="242.0"/>
+        <dc:Bounds x="228" y="242" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_69" targetElement="_BPMNShape_ScriptTask_288">
-        <di:waypoint xsi:type="dc:Point" x="144.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="228.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="144" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="228" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="177.0" y="282.0"/>
+          <dc:Bounds x="177" y="282" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_227" bpmnElement="getUrl" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="372.0" y="256.0"/>
+        <dc:Bounds x="372" y="256" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="70.0" x="408.0" y="286.0"/>
+          <dc:Bounds x="420" y="282" width="72" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_288" targetElement="_BPMNShape_ExclusiveGateway_227">
-        <di:waypoint xsi:type="dc:Point" x="328.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="372.0" y="281.0"/>
+        <di:waypoint xsi:type="dc:Point" x="328" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="372" y="281" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="350.0" y="281.0"/>
+          <dc:Bounds x="350" y="281" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_289" bpmnElement="obtainServiceUrlById">
-        <dc:Bounds height="80.0" width="100.0" x="528.0" y="197.0"/>
+        <dc:Bounds x="528" y="197" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_228" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="738.0" y="256.0"/>
+        <dc:Bounds x="738" y="256" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="763.0" y="311.0"/>
+          <dc:Bounds x="763" y="311" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_290" bpmnElement="getServiceInstance">
-        <dc:Bounds height="80.0" width="100.0" x="820.0" y="242.0"/>
+        <dc:Bounds x="820" y="242" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="getUrlYes" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_ExclusiveGateway_233">
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="256.0"/>
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="170.0"/>
-        <di:waypoint xsi:type="dc:Point" x="446.0" y="170.0"/>
+        <di:waypoint xsi:type="dc:Point" x="397" y="256" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="170" />
+        <di:waypoint xsi:type="dc:Point" x="446" y="170" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="397.0" y="213.0"/>
+          <dc:Bounds x="397" y="213" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_289" targetElement="_BPMNShape_ExclusiveGateway_234">
-        <di:waypoint xsi:type="dc:Point" x="628.0" y="237.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="237.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="195.0"/>
+        <di:waypoint xsi:type="dc:Point" x="628" y="237" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="237" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="195" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="668.0" y="221.0"/>
+          <dc:Bounds x="668" y="221" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ExclusiveGateway_228" targetElement="_BPMNShape_ScriptTask_290">
-        <di:waypoint xsi:type="dc:Point" x="788.0" y="281.0"/>
-        <di:waypoint xsi:type="dc:Point" x="820.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="788" y="281" />
+        <di:waypoint xsi:type="dc:Point" x="820" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="798.0" y="281.0"/>
+          <dc:Bounds x="798" y="281" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="getUrlNo" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_ExclusiveGateway_228">
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="306.0"/>
-        <di:waypoint xsi:type="dc:Point" x="397.0" y="370.0"/>
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="370.0"/>
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="306.0"/>
+        <di:waypoint xsi:type="dc:Point" x="397" y="306" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="370" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="370" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="306" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="400.0" y="324.0"/>
+          <dc:Bounds x="400" y="324" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_291" bpmnElement="toggleSuccess">
-        <dc:Bounds height="80.0" width="100.0" x="960.0" y="242.0"/>
+        <dc:Bounds x="960" y="242" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_290" targetElement="_BPMNShape_ScriptTask_291">
-        <di:waypoint xsi:type="dc:Point" x="920.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="960.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="920" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="960" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="937.0" y="282.0"/>
+          <dc:Bounds x="937" y="282" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_223" bpmnElement="EndEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="1133.0" y="264.0"/>
+        <dc:Bounds x="1133" y="264" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="1151.0" y="305.0"/>
+          <dc:Bounds x="1151" y="305" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_291" targetElement="_BPMNShape_EndEvent_223">
-        <di:waypoint xsi:type="dc:Point" x="1060.0" y="282.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1133.0" y="282.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1060" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="1133" y="282" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1100.0" y="282.0"/>
+          <dc:Bounds x="1100" y="282" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_25" bpmnElement="bpmnExceptionHandlingSubProcess" isExpanded="true">
-        <dc:Bounds height="169.0" width="325.0" x="152.0" y="468.0"/>
+        <dc:Bounds x="152" y="468" width="325" height="169" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_2">
-        <dc:Bounds height="36.0" width="36.0" x="176.0" y="535.0"/>
+        <dc:Bounds x="176" y="535" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="194.0" y="576.0"/>
+          <dc:Bounds x="194" y="576" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_224" bpmnElement="EndEvent_2">
-        <dc:Bounds height="36.0" width="36.0" x="416.0" y="535.0"/>
+        <dc:Bounds x="416" y="535" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="434.0" y="576.0"/>
+          <dc:Bounds x="434" y="576" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_292" bpmnElement="processBPMNException">
-        <dc:Bounds height="80.0" width="100.0" x="265.0" y="513.0"/>
+        <dc:Bounds x="265" y="513" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_292">
-        <di:waypoint xsi:type="dc:Point" x="212.0" y="553.0"/>
-        <di:waypoint xsi:type="dc:Point" x="265.0" y="553.0"/>
+        <di:waypoint xsi:type="dc:Point" x="212" y="553" />
+        <di:waypoint xsi:type="dc:Point" x="265" y="553" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="233.0" y="553.0"/>
+          <dc:Bounds x="233" y="553" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_292" targetElement="_BPMNShape_EndEvent_224">
-        <di:waypoint xsi:type="dc:Point" x="365.0" y="553.0"/>
-        <di:waypoint xsi:type="dc:Point" x="416.0" y="553.0"/>
+        <di:waypoint xsi:type="dc:Point" x="365" y="553" />
+        <di:waypoint xsi:type="dc:Point" x="416" y="553" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="385.0" y="553.0"/>
+          <dc:Bounds x="385" y="553" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_301" bpmnElement="obtainServiceUrlByName">
-        <dc:Bounds height="80.0" width="100.0" x="528.0" y="59.0"/>
+        <dc:Bounds x="528" y="59" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_233" bpmnElement="obtain" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="446.0" y="145.0"/>
+        <dc:Bounds x="446" y="145" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="71.0" x="496.0" y="162.0"/>
+          <dc:Bounds x="501" y="164" width="53" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_234" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="646.0" y="145.0"/>
+        <dc:Bounds x="646" y="145" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="671.0" y="200.0"/>
+          <dc:Bounds x="671" y="200" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="obtainById" sourceElement="_BPMNShape_ExclusiveGateway_233" targetElement="_BPMNShape_ScriptTask_289">
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="195.0"/>
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="236.0"/>
-        <di:waypoint xsi:type="dc:Point" x="528.0" y="237.0"/>
+        <di:waypoint xsi:type="dc:Point" x="471" y="195" />
+        <di:waypoint xsi:type="dc:Point" x="471" y="236" />
+        <di:waypoint xsi:type="dc:Point" x="528" y="237" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="16.0" x="476.0" y="207.0"/>
+          <dc:Bounds x="476" y="207" width="16" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="obtainByName" sourceElement="_BPMNShape_ExclusiveGateway_233" targetElement="_BPMNShape_ScriptTask_301">
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="145.0"/>
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="99.0"/>
-        <di:waypoint xsi:type="dc:Point" x="528.0" y="99.0"/>
+        <di:waypoint xsi:type="dc:Point" x="471" y="145" />
+        <di:waypoint xsi:type="dc:Point" x="471" y="99" />
+        <di:waypoint xsi:type="dc:Point" x="528" y="99" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="40.0" x="471.0" y="115.0"/>
+          <dc:Bounds x="471" y="115" width="40" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_301" targetElement="_BPMNShape_ExclusiveGateway_234">
-        <di:waypoint xsi:type="dc:Point" x="628.0" y="99.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="99.0"/>
-        <di:waypoint xsi:type="dc:Point" x="671.0" y="145.0"/>
+        <di:waypoint xsi:type="dc:Point" x="628" y="99" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="99" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="145" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="665.0" y="99.0"/>
+          <dc:Bounds x="665" y="99" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_235" bpmnElement="serviceFoundCheck" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="738.0" y="145.0"/>
+        <dc:Bounds x="738" y="145" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="59.0" x="735.0" y="125.0"/>
+          <dc:Bounds x="735" y="125" width="59" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ExclusiveGateway_234" targetElement="_BPMNShape_ExclusiveGateway_235">
-        <di:waypoint xsi:type="dc:Point" x="696.0" y="170.0"/>
-        <di:waypoint xsi:type="dc:Point" x="738.0" y="170.0"/>
+        <di:waypoint xsi:type="dc:Point" x="696" y="170" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="170" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="704.0" y="170.0"/>
+          <dc:Bounds x="704" y="170" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="foundYes" sourceElement="_BPMNShape_ExclusiveGateway_235" targetElement="_BPMNShape_ExclusiveGateway_228">
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="195.0"/>
-        <di:waypoint xsi:type="dc:Point" x="763.0" y="256.0"/>
+        <di:waypoint xsi:type="dc:Point" x="763" y="195" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="256" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="762.0" y="205.0"/>
+          <dc:Bounds x="762" y="205" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="notFound" sourceElement="_BPMNShape_ExclusiveGateway_235" targetElement="_BPMNShape_EndEvent_229">
-        <di:waypoint xsi:type="dc:Point" x="788.0" y="170.0"/>
-        <di:waypoint xsi:type="dc:Point" x="877.0" y="171.0"/>
+        <di:waypoint xsi:type="dc:Point" x="788" y="170" />
+        <di:waypoint xsi:type="dc:Point" x="877" y="171" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="798.0" y="170.0"/>
+          <dc:Bounds x="798" y="170" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_229" bpmnElement="EndEvent_3">
-        <dc:Bounds height="36.0" width="36.0" x="877.0" y="153.0"/>
+        <dc:Bounds x="877" y="153" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="895.0" y="194.0"/>
+          <dc:Bounds x="895" y="194" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
index 8a5f9e9..19d2127 100644
--- a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/AaiUtilTest.groovy
@@ -1,305 +1,385 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.bpmn.common.scripts;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*
-
-import org.mockito.MockitoAnnotations
-import org.mockito.runners.MockitoJUnitRunner
-import org.mockito.internal.debugging.MockitoDebuggerImpl
-import org.junit.Before
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;
-import org.junit.Rule;
-import org.junit.Test
-import org.junit.Ignore
-import org.junit.runner.RunWith
-import org.junit.Before;
-import org.junit.Test;
-import org.camunda.bpm.engine.ProcessEngineServices
-import org.camunda.bpm.engine.RepositoryService
-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
-import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl
-import org.camunda.bpm.engine.repository.ProcessDefinition
-
-@RunWith(MockitoJUnitRunner.class)
-class AaiUtilTest extends MsoGroovyTest {
-
-	@Test
-	public void testGetVersionDefault() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-		assertEquals('8', version)
-	}
-
-	@Test
-	public void testGetVersionResourceSpecific() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-		assertEquals('7', version)
-	}
-
-	@Test
-	public void testGetVersionFlowSpecific() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_custom_CreateAAIVfModule_aai_version")).thenReturn('6')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-		assertEquals('6', version)
-	}
-
-	@Test(expected=java.lang.Exception.class)
-	public void testGetVersionNotDefined() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')
-	}
-
-	@Test
-	public void testGetUriDefaultVersion() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getUri(mockExecution, 'l3-network')
-		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)
-	}
-
-	@Test
-	public void testGetUriFlowAndResourceSpecific() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_CreateAAIVfModule_aai_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getUri(mockExecution, 'l3-network')
-		assertEquals('/aai/v6/network/l3-networks/l3-network', uri)
-	}
-
-	@Test
-	public void testGetNetworkGenericVnfEndpoint() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def endpoint = aaiUtil.getNetworkGenericVnfEndpoint(mockExecution)
-		assertEquals('http://localhost:28090/aai/v8/network/generic-vnfs/generic-vnf', endpoint)
-	}
-
-	@Test
-	public void testGetNetworkGenericVnfUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkGenericVnfUri(mockExecution)
-		assertEquals('/aai/v8/network/generic-vnfs/generic-vnf', uri)
-	}
-
-	@Test
-	public void testGetNetworkVpnBindingUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn('/aai/v8/network/vpn-bindings/vpn-binding')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkVpnBindingUri(mockExecution)
-		assertEquals('/aai/v8/network/vpn-bindings/vpn-binding', uri)
-	}
-
-	@Test
-	public void testGetNetworkPolicyUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_network_policy_uri")).thenReturn('/aai/v8/network/network-policies/network-policy')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkPolicyUri(mockExecution)
-		assertEquals('/aai/v8/network/network-policies/network-policy', uri)
-	}
-
-	@Test
-	public void testGetNetworkTableReferencesUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_route_table_reference_uri")).thenReturn('/aai/v8/network/route-table-references/route-table-reference')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkTableReferencesUri(mockExecution)
-		assertEquals('/aai/v8/network/route-table-references/route-table-reference', uri)
-	}
-
-	@Test
-	public void testGetNetworkVceUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vce_uri")).thenReturn('/aai/v8/network/vces/vce')
-
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkVceUri(mockExecution)
-		assertEquals('/aai/v8/network/vces/vce', uri)
-	}
-
-	@Test
-	public void testGetNetworkL3NetworkUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)
-		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)
-	}
-
-	@Test
-	public void testGetBusinessCustomerUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_customer_uri")).thenReturn('/aai/v8/business/customers/customer')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getBusinessCustomerUri(mockExecution)
-		assertEquals('/aai/v8/business/customers/customer', uri)
-	}
-
-	@Test
-	public void testGetCloudInfrastructureCloudRegionEndpoint() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')
-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(mockExecution)
-		assertEquals('http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)
-	}
-
-	@Test
-	public void testGetCloudInfrastructureCloudRegionUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getCloudInfrastructureCloudRegionUri(mockExecution)
-		assertEquals('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)
-	}
-
-	@Test
-	public void testGetCloudInfrastructureTenantUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_tenant_uri")).thenReturn('/aai/v8/cloud-infrastructure/tenants/tenant')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getCloudInfrastructureTenantUri(mockExecution)
-		assertEquals('/aai/v8/cloud-infrastructure/tenants/tenant', uri)
-	}
-
-	@Test
-	public void testGetSearchNodesQueryUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getSearchNodesQueryUri(mockExecution)
-		assertEquals('/aai/v8/search/nodes-query', uri)
-	}
-
-	@Test
-	public void testGetSearchNodesQueryEndpoint() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')
-		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getSearchNodesQueryEndpoint(mockExecution)
-		assertEquals('http://localhost:28090/aai/v8/search/nodes-query', uri)
-	}
-
-	@Test
-	public void testGetSearchGenericQueryUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')
-		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_query_uri")).thenReturn('/aai/v8/search/generic-query')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def uri = aaiUtil.getSearchGenericQueryUri(mockExecution)
-		assertEquals('/aai/v8/search/generic-query', uri)
-	}
-
-	@Test
-	public void testGetNamespaceFromUri() {
-		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')
-		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')
-		CreateAAIVfModule myproc = new CreateAAIVfModule()
-		AaiUtil aaiUtil = new AaiUtil(myproc)
-		def ns = aaiUtil.getNamespaceFromUri('/aai/v6/search/generic-query')
-		assertEquals('http://org.openecomp.aai.inventory/v6', ns)
-	}
-
-}
+/*- 

+ * ============LICENSE_START======================================================= 

+ * OPENECOMP - MSO 

+ * ================================================================================ 

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

+ * ================================================================================ 

+ * Licensed under the Apache License, Version 2.0 (the "License"); 

+ * you may not use this file except in compliance with the License. 

+ * You may obtain a copy of the License at 

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0 

+ * 

+ * Unless required by applicable law or agreed to in writing, software 

+ * distributed under the License is distributed on an "AS IS" BASIS, 

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

+ * See the License for the specific language governing permissions and 

+ * limitations under the License. 

+ * ============LICENSE_END========================================================= 

+ */ 

+

+package org.openecomp.mso.bpmn.common.scripts;

+

+import static org.junit.Assert.*;

+import static org.mockito.Mockito.*

+

+import org.openecomp.mso.rest.HttpHeader

+import org.mockito.MockitoAnnotations

+import org.mockito.runners.MockitoJUnitRunner

+import org.mockito.internal.debugging.MockitoDebuggerImpl

+import org.junit.Before

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

+import org.junit.Rule;

+import org.junit.Test

+import org.junit.Ignore

+import org.junit.runner.RunWith

+import org.junit.Before;

+import org.junit.Test;

+import org.camunda.bpm.engine.ProcessEngineServices

+import org.camunda.bpm.engine.RepositoryService

+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

+import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl

+import org.camunda.bpm.engine.repository.ProcessDefinition

+

+@RunWith(MockitoJUnitRunner.class)

+class AaiUtilTest extends MsoGroovyTest {

+	

+	@Test

+	public void testGetVersionDefault() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+		assertEquals('8', version)

+	}

+	

+	@Test

+	public void testGetVersionResourceSpecific() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+		assertEquals('7', version)

+	}

+

+	@Test

+	public void testGetVersionFlowSpecific() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_custom_CreateAAIVfModule_aai_version")).thenReturn('6')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_l3_network_version")).thenReturn('7')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+		assertEquals('6', version)

+	}

+

+	@Test(expected=java.lang.Exception.class)

+	public void testGetVersionNotDefined() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def version = aaiUtil.getVersion(mockExecution, 'l3-network', 'CreateAAIVfModule')

+	}

+	

+	@Test

+	public void testGetUriDefaultVersion() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getUri(mockExecution, 'l3-network')

+		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)

+	}

+	

+	@Test

+	public void testGetUriFlowAndResourceSpecific() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_CreateAAIVfModule_aai_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getUri(mockExecution, 'l3-network')

+		assertEquals('/aai/v6/network/l3-networks/l3-network', uri)

+	}

+	

+	@Test

+	public void testGetNetworkGenericVnfEndpoint() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def endpoint = aaiUtil.getNetworkGenericVnfEndpoint(mockExecution)

+		assertEquals('http://localhost:28090/aai/v8/network/generic-vnfs/generic-vnf', endpoint)

+	}

+	

+	@Test

+	public void testGetNetworkGenericVnfUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_vnf_uri")).thenReturn('/aai/v8/network/generic-vnfs/generic-vnf')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkGenericVnfUri(mockExecution)

+		assertEquals('/aai/v8/network/generic-vnfs/generic-vnf', uri)

+	}

+	

+	@Test

+	public void testGetNetworkVpnBindingUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn('/aai/v8/network/vpn-bindings/vpn-binding')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkVpnBindingUri(mockExecution)

+		assertEquals('/aai/v8/network/vpn-bindings/vpn-binding', uri)

+	}

+

+	@Test

+	public void testGetNetworkPolicyUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_network_policy_uri")).thenReturn('/aai/v8/network/network-policies/network-policy')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkPolicyUri(mockExecution)

+		assertEquals('/aai/v8/network/network-policies/network-policy', uri)

+	}

+	

+	@Test

+	public void testGetNetworkTableReferencesUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_route_table_reference_uri")).thenReturn('/aai/v8/network/route-table-references/route-table-reference')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkTableReferencesUri(mockExecution)

+		assertEquals('/aai/v8/network/route-table-references/route-table-reference', uri)

+	}

+	

+	@Test

+	public void testGetNetworkVceUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vce_uri")).thenReturn('/aai/v8/network/vces/vce')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkVceUri(mockExecution)

+		assertEquals('/aai/v8/network/vces/vce', uri)

+	}

+	

+	@Test

+	public void testGetNetworkL3NetworkUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn('/aai/v8/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)

+		assertEquals('/aai/v8/network/l3-networks/l3-network', uri)

+	}

+	

+	@Test

+	public void testGetBusinessCustomerUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_customer_uri")).thenReturn('/aai/v8/business/customers/customer')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getBusinessCustomerUri(mockExecution)

+		assertEquals('/aai/v8/business/customers/customer', uri)

+	}

+	

+	@Test

+	public void testGetCloudInfrastructureCloudRegionEndpoint() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getCloudInfrastructureCloudRegionEndpoint(mockExecution)

+		assertEquals('http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)

+	}

+	

+	@Test

+	public void testGetCloudInfrastructureCloudRegionUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getCloudInfrastructureCloudRegionUri(mockExecution)

+		assertEquals('/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic', uri)

+	}

+	

+	@Test

+	public void testGetCloudInfrastructureTenantUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_tenant_uri")).thenReturn('/aai/v8/cloud-infrastructure/tenants/tenant')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getCloudInfrastructureTenantUri(mockExecution)

+		assertEquals('/aai/v8/cloud-infrastructure/tenants/tenant', uri)

+	}

+	

+	@Test

+	public void testGetSearchNodesQueryUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getSearchNodesQueryUri(mockExecution)

+		assertEquals('/aai/v8/search/nodes-query', uri)

+	}

+	

+	@Test

+	public void testGetSearchNodesQueryEndpoint() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_nodes_query_uri")).thenReturn('/aai/v8/search/nodes-query')

+		when(mockExecution.getVariable('URN_aai_endpoint')).thenReturn('http://localhost:28090')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getSearchNodesQueryEndpoint(mockExecution)

+		assertEquals('http://localhost:28090/aai/v8/search/nodes-query', uri)

+	}

+	

+	@Test

+	public void testGetSearchGenericQueryUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('8')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_generic_query_uri")).thenReturn('/aai/v8/search/generic-query')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getSearchGenericQueryUri(mockExecution)

+		assertEquals('/aai/v8/search/generic-query', uri)

+	}

+	

+	@Test

+	public void testGetNamespaceFromUri() {

+		ExecutionEntity mockExecution = setupMock('CreateAAIVfModule')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('6')

+		when(mockExecution.getVariable("URN_mso_workflow_default_aai_v6_l3_network_uri")).thenReturn('/aai/v6/network/l3-networks/l3-network')

+		when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		CreateAAIVfModule myproc = new CreateAAIVfModule()

+		AaiUtil aaiUtil = new AaiUtil(myproc)

+		def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

+		def ns = aaiUtil.getNamespaceFromUri('/aai/v6/search/generic-query')

+		assertEquals('http://org.openecomp.aai.inventory/v6', ns)

+	}

+	

+	@Test

+	public void testGetNamespaceFromUri2() {

+		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('10')

+		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v10_l3_network_uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   CreateAAIVfModule myproc = new CreateAAIVfModule()

+		   AaiUtil aaiUtil = new AaiUtil(myproc)

+		   def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

+		   def ns = aaiUtil.getNamespaceFromUri('/aai/v10/search/generic-query')

+		   assertEquals('http://org.openecomp.aai.inventory/v10', ns)

+	}

+	

+	@Test

+	public void testGetNamespaceFromUri3() {

+		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('100')

+		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v100_l3_network_uri")).thenReturn('/aai/v100/network/l3-networks/l3-network')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   CreateAAIVfModule myproc = new CreateAAIVfModule()

+		   AaiUtil aaiUtil = new AaiUtil(myproc)

+		   def uri = aaiUtil.getNetworkL3NetworkUri(mockExecution)  // Required to populate the namespace in the class

+		   def ns = aaiUtil.getNamespaceFromUri('/aai/v100/search/generic-query')

+		   assertEquals('http://org.openecomp.aai.inventory/v100', ns)

+	}

+

+	@Test

+	public void testGetNamespaceFromUri_twoArguments() {  // (execution, uri)

+		   ExecutionEntity mockExecution = setupMock('DeleteVfModuleVolumeInfraV1')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn('10')

+		   when(mockExecution.getVariable("URN_mso_workflow_default_aai_v10_l3_network_uri")).thenReturn('/aai/v10/network/l3-networks/l3-network')

+		   when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_namespace")).thenReturn('http://org.openecomp.aai.inventory/')

+		   //

+		   when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn('true')

+		   CreateAAIVfModule myproc = new CreateAAIVfModule()

+		   AaiUtil aaiUtil = new AaiUtil(myproc)

+		   def ns = aaiUtil.getNamespaceFromUri(mockExecution,'/aai/v10/search/generic-query')

+		   assertEquals('http://org.openecomp.aai.inventory/v10', ns)

+	}

+}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
index f1a2d7b..e2942c9 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
@@ -1,136 +1,136 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * OPENECOMP - MSO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
-
-package org.openecomp.mso.bpmn.common;
-
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVfModuleId;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVfModuleIdNoResponse;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.mock.FileUtil;
-
-/**
- * Unit tests for CreateAAIVfModuleVolumeGroup.bpmn.
- */
-public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {
-		
-	/**
-	 * Test the happy path through the flow.
-	 */
-	@Test	
-	@Deployment(resources = {
-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"
-		})
-	public void happyPath() throws IOException {
-		
-		logStart();
-		
-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 
-		MockGetGenericVnfByIdWithPriority("skask", "lukewarm", 200, "VfModularity/VfModule-lukewarm.xml", 2);
-		MockPutVfModuleIdNoResponse("skask", "PCRF", "lukewarm");
-		
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.put("mso-request-id", "999-99-9999");
-		variables.put("isDebugLogEnabled","true");
-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);
-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);
-		
-		Assert.assertTrue(isProcessEnded(businessKey));
-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");
-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");
-		System.out.println("Subflow response code: " + responseCode);
-		System.out.println("Subflow response: " + response);
-		Assert.assertEquals(200, responseCode.intValue());
-		
-		logEnd();
-	}
-
-	/**
-	 * Test the case where the GET to AAI returns a 404.
-	 */
-	@Test	
-	@Deployment(resources = {
-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"
-		})
-	public void badGet() throws IOException {
-		
-		logStart();
-		
-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 
-		MockGetVfModuleId("skask", ".*", "VfModularity/VfModule-supercool.xml", 404);
-		
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.put("mso-request-id", "999-99-9999");
-		variables.put("isDebugLogEnabled","true");
-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);
-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);
-		
-		Assert.assertTrue(isProcessEnded(businessKey));
-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponse");
-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponseCode");
-		System.out.println("Subflow response code: " + responseCode);
-		System.out.println("Subflow response: " + response);
-		Assert.assertEquals(404, responseCode.intValue());
-		
-		logEnd();
-	}
-
-	/**
-	 * Test the case where the GET to AAI is successful, but he subsequent PUT returns 404.
-	 */
-	@Test	
-	@Deployment(resources = {
-			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"
-		})
-	public void badPut() throws IOException {
-		
-		logStart();
-		
-		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 
-		MockGetVfModuleId("skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);
-		
-		String businessKey = UUID.randomUUID().toString();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.put("mso-request-id", "999-99-9999");
-		variables.put("isDebugLogEnabled","true");
-		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);
-		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);
-		
-		Assert.assertTrue(isProcessEnded(businessKey));
-		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");
-		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");
-		System.out.println("Subflow response code: " + responseCode);
-		System.out.println("Subflow response: " + response);
-		Assert.assertEquals(404, responseCode.intValue());
-		
-		logEnd();
-	}
-}
-
+/*- 

+ * ============LICENSE_START======================================================= 

+ * OPENECOMP - MSO 

+ * ================================================================================ 

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

+ * ================================================================================ 

+ * Licensed under the Apache License, Version 2.0 (the "License"); 

+ * you may not use this file except in compliance with the License. 

+ * You may obtain a copy of the License at 

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0 

+ * 

+ * Unless required by applicable law or agreed to in writing, software 

+ * distributed under the License is distributed on an "AS IS" BASIS, 

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

+ * See the License for the specific language governing permissions and 

+ * limitations under the License. 

+ * ============LICENSE_END========================================================= 

+ */ 

+

+package org.openecomp.mso.bpmn.common;

+

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVfModuleId;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVfModuleIdNoResponse;

+

+import java.io.IOException;

+import java.util.HashMap;

+import java.util.Map;

+import java.util.UUID;

+

+import org.camunda.bpm.engine.test.Deployment;

+import org.junit.Assert;

+import org.junit.Test;

+import org.openecomp.mso.bpmn.mock.FileUtil;

+

+/**

+ * Unit tests for CreateAAIVfModuleVolumeGroup.bpmn.

+ */

+public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {

+		

+	/**

+	 * Test the happy path through the flow.

+	 */

+	@Test	

+	@Deployment(resources = {

+			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

+		})

+	public void happyPath() throws IOException {

+		

+		logStart();

+		

+		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

+		MockGetGenericVnfByIdWithPriority("skask", "lukewarm", 200, "VfModularity/VfModule-lukewarm.xml", 2);

+		MockPutVfModuleIdNoResponse("skask", "PCRF", "lukewarm");

+		

+		String businessKey = UUID.randomUUID().toString();

+		Map<String, Object> variables = new HashMap<String, Object>();

+		variables.put("mso-request-id", "999-99-9999");

+		variables.put("isDebugLogEnabled","true");

+		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

+		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

+		

+		Assert.assertTrue(isProcessEnded(businessKey));

+		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");

+		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");

+		System.out.println("Subflow response code: " + responseCode);

+		System.out.println("Subflow response: " + response);

+		Assert.assertEquals(200, responseCode.intValue());

+		

+		logEnd();

+	}

+

+	/**

+	 * Test the case where the GET to AAI returns a 404.

+	 */

+	@Test	

+	@Deployment(resources = {

+			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

+		})

+	public void badGet() throws IOException {

+		

+		logStart();

+		

+		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

+		MockGetVfModuleId("skask", ".*", "VfModularity/VfModule-supercool.xml", 404);

+		

+		String businessKey = UUID.randomUUID().toString();

+		Map<String, Object> variables = new HashMap<String, Object>();

+		variables.put("mso-request-id", "999-99-9999");

+		variables.put("isDebugLogEnabled","true");

+		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

+		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

+		

+		Assert.assertTrue(isProcessEnded(businessKey));

+		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponse");

+		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_getVfModuleResponseCode");

+		System.out.println("Subflow response code: " + responseCode);

+		System.out.println("Subflow response: " + response);

+		Assert.assertEquals(404, responseCode.intValue());

+		

+		logEnd();

+	}

+

+	/**

+	 * Test the case where the GET to AAI is successful, but he subsequent PUT returns 404.

+	 */

+	@Test	

+	@Deployment(resources = {

+			"subprocess/CreateAAIVfModuleVolumeGroup.bpmn"

+		})

+	public void badPatch() throws IOException {

+		

+		logStart();

+		

+		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/CreateAAIVfModuleVolumeGroupRequest.xml"); 

+		MockGetVfModuleId("skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);

+

+		String businessKey = UUID.randomUUID().toString();

+		Map<String, Object> variables = new HashMap<String, Object>();

+		variables.put("mso-request-id", "999-99-9999");

+		variables.put("isDebugLogEnabled","true");

+		variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);

+		invokeSubProcess("CreateAAIVfModuleVolumeGroup", businessKey, variables);

+		

+		Assert.assertTrue(isProcessEnded(businessKey));

+		String response = (String) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponse");

+		Integer responseCode = (Integer) getVariableFromHistory(businessKey, "CAAIVfModVG_updateVfModuleResponseCode");

+		System.out.println("Subflow response code: " + responseCode);

+		System.out.println("Subflow response: " + response);

+		Assert.assertEquals(404, responseCode.intValue());

+		

+		logEnd();

+	}

+}

+

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
index 2af42db..b73ad7a 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
@@ -1,505 +1,505 @@
-/*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
- */
-/*- 
- * ============LICENSE_START======================================================= 
- * OPENECOMP - MSO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
-
-package org.openecomp.mso.bpmn.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_500;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceSubscription;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_500;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_404;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_500;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-
-
-/**
- * Unit Test for the GenericGetService Sub Flow
- */
-public class GenericGetServiceTest extends WorkflowTest {
-
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance() throws Exception{
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceSubscription() throws Exception{
-
-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance_byName() throws Exception{
-
-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertNotNull(response);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance_byId() throws Exception{
-
-		MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");
-		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("true", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstance_404Response() throws Exception{
-
-		MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceSubscription404() throws Exception{
-		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", 404);
-		
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertNotNull(response);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceByName404() throws Exception{
-
-		MockNodeQueryServiceInstanceByName_404("1604-MVM-26");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("404", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceById404() throws Exception{
-
-		MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("404", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceEmptyResponse() throws Exception{
-
-		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", " ");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{
-		MockNodeQueryServiceInstanceByName("1604-MVM-26", "");
-		
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "", "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceInstanceByIdEmpty() throws Exception{
-
-	        MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		assertEquals("true", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("200", siUrlResponseCode);
-		assertEquals(null, workflowException);
-	}
-
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.]";
-
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstance_getSIBadResponse() throws Exception{
-
-		MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("false", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstance_getUrlByIdBadResponse() throws Exception{
-
-		MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("false", byName);
-		assertEquals("500", siUrlResponseCode);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-	@Test
-	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})
-	public void testGenericGetService_error_serviceInstance_getUrlByNameBadResponse() throws Exception{
-
-		MockNodeQueryServiceInstanceByName_500("1604-MVM-26");
-
-		Map<String, String> variables = new HashMap<String, String>();
-		setVariablesInstance(variables, null, "1604-MVM-26", null, null);
-
-		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");
-		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");
-		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");
-		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrl");
-		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");
-		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");
-
-		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";
-
-		assertEquals("false", successIndicator);
-		assertEquals("false", found);
-		assertEquals("true", obtainUrl);
-		assertEquals("true", byName);
-		assertEquals("500", siUrlResponseCode);
-		assertEquals(expectedWorkflowException, workflowException);
-	}
-
-
-	private void setVariablesInstance(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENGS_serviceInstanceId", siId);
-		variables.put("GENGS_serviceInstanceName", siName);
-		variables.put("GENGS_globalCustomerId",globalCustId);
-		variables.put("GENGS_serviceType", serviceType);
-		variables.put("GENGS_type", "service-instance");
-	}
-
-	private void setVariablesSubscription(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {
-		variables.put("isDebugLogEnabled", "true");
-		variables.put("GENGS_serviceInstanceId", siId);
-		variables.put("GENGS_serviceInstanceName", siName);
-		variables.put("GENGS_globalCustomerId",globalCustId);
-		variables.put("GENGS_serviceType", serviceType);
-		variables.put("GENGS_type", "service-subscription");
-	}
-
-
-}
+/*

+ * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.

+ */

+/*- 

+ * ============LICENSE_START======================================================= 

+ * OPENECOMP - MSO 

+ * ================================================================================ 

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

+ * ================================================================================ 

+ * Licensed under the Apache License, Version 2.0 (the "License"); 

+ * you may not use this file except in compliance with the License. 

+ * You may obtain a copy of the License at 

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0 

+ * 

+ * Unless required by applicable law or agreed to in writing, software 

+ * distributed under the License is distributed on an "AS IS" BASIS, 

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

+ * See the License for the specific language governing permissions and 

+ * limitations under the License. 

+ * ============LICENSE_END========================================================= 

+ */ 

+

+package org.openecomp.mso.bpmn.common;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.openecomp.mso.bpmn.common.BPMNUtil.executeWorkFlow;

+import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance_500;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceSubscription;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById_500;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceByName_500;

+

+import java.util.HashMap;

+import java.util.Map;

+

+import org.camunda.bpm.engine.test.Deployment;

+import org.junit.Test;

+import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

+

+

+/**

+ * Unit Test for the GenericGetService Sub Flow

+ */

+public class GenericGetServiceTest extends WorkflowTest {

+

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance() throws Exception{

+		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals(null, workflowException);

+	}

+

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceSubscription() throws Exception{

+

+		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance_byName() throws Exception{

+

+		MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");

+		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertNotNull(response);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance_byId() throws Exception{

+

+		MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");

+		MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("true", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstance_404Response() throws Exception{

+

+		MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%2F1604%2F0026%2FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceSubscription404() throws Exception{

+		MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", 404);

+		

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String response = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowResponse");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertNotNull(response);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceByName404() throws Exception{

+

+		MockNodeQueryServiceInstanceByName_404("1604-MVM-26");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertEquals("404", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceById404() throws Exception{

+

+		MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals("404", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceEmptyResponse() throws Exception{

+

+		MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", " ");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{

+		MockNodeQueryServiceInstanceByName("1604-MVM-26", "");

+		

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "", "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceInstanceByIdEmpty() throws Exception{

+

+	        MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		assertEquals("true", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals("200", siUrlResponseCode);

+		assertEquals(null, workflowException);

+	}

+

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming serviceInstanceId and serviceInstanceName are null. ServiceInstanceId or ServiceInstanceName is required to Get a service-instance.]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Incoming ServiceType or GlobalCustomerId is null. These variables are required to Get a service-subscription.]";

+

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstance_getSIBadResponse() throws Exception{

+

+		MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("false", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstance_getUrlByIdBadResponse() throws Exception{

+

+		MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_genericQueryResponseCode");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("false", byName);

+		assertEquals("500", siUrlResponseCode);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+	@Test

+	@Deployment(resources = {"subprocess/GenericGetService.bpmn"})

+	public void testGenericGetService_error_serviceInstance_getUrlByNameBadResponse() throws Exception{

+

+		MockNodeQueryServiceInstanceByName_500("1604-MVM-26");

+

+		Map<String, String> variables = new HashMap<String, String>();

+		setVariablesInstance(variables, null, "1604-MVM-26", null, null);

+

+		WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);

+		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());

+

+		String successIndicator = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_SuccessIndicator");

+		String found = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_FoundIndicator");

+		String workflowException = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "WorkflowException");

+		String obtainUrl = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainObjectsUrl");

+		String byName = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainServiceInstanceUrlByName");

+		String siUrlResponseCode = BPMNUtil.getVariable(processEngineRule, "GenericGetService", "GENGS_obtainSIUrlResponseCode");

+

+		String expectedWorkflowException = "WorkflowException[processKey=GenericGetService,errorCode=500,errorMessage=Received a bad response from AAI]";

+

+		assertEquals("false", successIndicator);

+		assertEquals("false", found);

+		assertEquals("true", obtainUrl);

+		assertEquals("true", byName);

+		assertEquals("500", siUrlResponseCode);

+		assertEquals(expectedWorkflowException, workflowException);

+	}

+

+

+	private void setVariablesInstance(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {

+		variables.put("isDebugLogEnabled", "true");

+		variables.put("GENGS_serviceInstanceId", siId);

+		variables.put("GENGS_serviceInstanceName", siName);

+		variables.put("GENGS_globalCustomerId",globalCustId);

+		variables.put("GENGS_serviceType", serviceType);

+		variables.put("GENGS_type", "service-instance");

+	}

+

+	private void setVariablesSubscription(Map<String, String> variables, String siId, String siName, String globalCustId, String serviceType) {

+		variables.put("isDebugLogEnabled", "true");

+		variables.put("GENGS_serviceInstanceId", siId);

+		variables.put("GENGS_serviceInstanceName", siName);

+		variables.put("GENGS_globalCustomerId",globalCustId);

+		variables.put("GENGS_serviceType", serviceType);

+		variables.put("GENGS_type", "service-subscription");

+	}

+

+

+}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
index 6fe6df6..e2babb7 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
@@ -20,10 +20,11 @@
 

 package org.openecomp.mso.bpmn.common;

 

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 

 import java.io.IOException;

 import java.util.HashMap;

@@ -179,14 +180,15 @@ public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {
 	@Deployment(resources = {

 			"subprocess/PrepareUpdateAAIVfModule.bpmn"

 		})

-	public void badPut() throws IOException {

+	public void badPatch() throws IOException {

 		

 		logStart();

 		

 		String prepareUpdateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/PrepareUpdateAAIVfModuleRequest.xml"); 

 		

 		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-			

+		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);

+		

 		String businessKey = UUID.randomUUID().toString();

 		Map<String, Object> variables = new HashMap<String, Object>();		

 		variables.put("mso-request-id", "999-99-9999");

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
index 846a14f..3eb7acd 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
@@ -33,7 +33,6 @@ import java.util.Map;
 

 import javax.ws.rs.core.Response;

 

-import org.camunda.bpm.engine.MismatchingMessageCorrelationException;

 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;

 import org.camunda.bpm.engine.runtime.Job;

 import org.camunda.bpm.engine.test.Deployment;

@@ -44,9 +43,10 @@ import org.openecomp.mso.bpmn.common.adapter.sdnc.CallbackHeader;
 import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterCallbackRequest;

 import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterResponse;

 import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl;

-import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl.SDNCAdapterExceptionResponse;

+import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl.SDNCAdapterErrorResponse;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

+import org.openecomp.mso.bpmn.core.PropertyConfigurationSetup;

 import org.openecomp.mso.bpmn.mock.FileUtil;

 

 /**

@@ -129,7 +129,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceFinished(pid);

 

 		//System.out.println("SDNCAdapter sunny day flow Completed!");

@@ -167,7 +167,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceNotFinished(pid);

 

 		checkForTimeout(pid);

@@ -212,7 +212,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceNotFinished(pid);

 		assertEquals(true, (Boolean) (getVariable(pid, "continueListening")));

 

@@ -221,7 +221,7 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertFalse(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

+		assertFalse(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

 		assertProcessInstanceFinished(pid);

 		assertEquals(false, (Boolean) (getVariable(pid, "continueListening")));

 

@@ -241,10 +241,14 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 	@Deployment(resources = {"subprocess/SDNCAdapterV1.bpmn",

 			"subprocess/GenericNotificationService.bpmn"

 			})

-	public void badCorrelationIdTest() throws InterruptedException {

+	public void badCorrelationIdTest() throws InterruptedException, IOException {

 

 		mockSDNCAdapter(200);

 

+		Map<String, String> urnProperties = PropertyConfigurationSetup.createBpmnUrnProperties();

+		urnProperties.put("mso.correlation.timeout", "5");

+		PropertyConfigurationSetup.addProperties(urnProperties, 10000);

+

 		//System.out.println("SDNCAdapter bad RequestId test Started!");

 

 		ProcessExecutionThread thread = new ProcessExecutionThread(sdncAdapterWorkflowRequest);

@@ -267,8 +271,8 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 		SDNCAdapterResponse sdncAdapterResponse = callbackService.sdncAdapterCallback(sdncAdapterCallbackRequest);

 		//System.out.println("Back from executing process again");

 

-		assertTrue(sdncAdapterResponse instanceof SDNCAdapterExceptionResponse);

-		assertTrue(((SDNCAdapterExceptionResponse) sdncAdapterResponse).getException() instanceof IllegalStateException);

+		assertTrue(sdncAdapterResponse instanceof SDNCAdapterErrorResponse);

+		assertTrue(((SDNCAdapterErrorResponse) sdncAdapterResponse).getError().contains("No process is waiting for sdncAdapterCallbackRequest"));

 		assertProcessInstanceNotFinished(pid);

 

 		//System.out.println("SDNCAdapter bad RequestId test Completed!");

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
index 18fb5ac..1573c8f 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
@@ -20,11 +20,12 @@
 

 package org.openecomp.mso.bpmn.common;

 

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf_Bad;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;

 

 import java.io.IOException;

 import java.util.HashMap;

@@ -144,7 +145,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
 	@Deployment(resources = {

 			"subprocess/UpdateAAIGenericVnf.bpmn"

 		})

-	public void badPut() throws IOException {

+	public void badPatch() throws IOException {

 		

 		logStart();

 		

@@ -152,6 +153,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
 		

 		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

 		MockPutGenericVnf_Bad("skask", 404);

+		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask", 404);

 		

 		String businessKey = UUID.randomUUID().toString();

 		Map<String, Object> variables = new HashMap<String, Object>();

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
index 035f097..d081fcc 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
@@ -20,11 +20,12 @@
 

 package org.openecomp.mso.bpmn.common;

 

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModuleBadPatch;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById_404;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

 

 import java.io.IOException;

 import java.util.HashMap;

@@ -111,13 +112,14 @@ public class UpdateAAIVfModuleTest extends WorkflowTest {
 	@Deployment(resources = {

 			"subprocess/UpdateAAIVfModule.bpmn"

 		})

-	public void badPut() throws IOException {

+	public void badPatch() throws IOException {

 		

 		logStart();

 		

 		String updateAAIVfModuleRequest = FileUtil.readResourceFile("__files/VfModularity/UpdateAAIVfModuleRequest.xml"); 

 		MockGetGenericVnfById_404("/skask/vf-modules/vf-module/supercool");

 		MockGetGenericVnfById("/skask/vf-modules/vf-module/supercool", "VfModularity/VfModule-supercool.xml", 200);

+		MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);

 		

 		String businessKey = UUID.randomUUID().toString();

 		Map<String, Object> variables = new HashMap<String, Object>();

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
index 46bbb72..49ad6d6 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
@@ -110,6 +110,16 @@ public class WorkflowTest {
 	public final WireMockRule wireMockRule;

 

 	/**

+	 * Content-Type for XML.

+	 */

+	protected static final String XML = "application/xml";

+

+	/**

+	 * Content-Type for JSON.

+	 */

+	protected static final String JSON = "application/json; charset=UTF-8";

+

+	/**

 	 * Constructor.

 	 */

 	public WorkflowTest() throws RuntimeException {

@@ -197,15 +207,15 @@ public class WorkflowTest {
 	 * @param businessKey a unique key that will identify the process instance

 	 * @param injectedVariables variables to inject into the process

 	 */

-	protected void invokeSubProcess(String processKey, String businessKey,

-			Map<String, Object> injectedVariables) {

+	protected void invokeSubProcess(String processKey, String businessKey, Map<String, Object> injectedVariables) {

 		RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();

 		List<String> arguments = runtimeMxBean.getInputArguments();

 		System.out.println("JVM args = " + arguments);

 

 		msoRequestId = (String) injectedVariables.get("mso-request-id");

+		String requestId = (String) injectedVariables.get("msoRequestId");

 

-		if (msoRequestId == null) {

+		if (msoRequestId == null && requestId == null) {

 			String msg = "mso-request-id variable was not provided";

 			System.out.println(msg);

 			fail(msg);

@@ -242,7 +252,7 @@ public class WorkflowTest {
 	 * @param injectedVariables optional variables to inject into the process

 	 * @return a TestAsyncResponse object associated with the test

 	 */

-	public TestAsyncResponse invokeAsyncProcess(String processKey,

+	protected TestAsyncResponse invokeAsyncProcess(String processKey,

 			String schemaVersion, String businessKey, String request,

 			Map<String, Object> injectedVariables) {

 

@@ -438,7 +448,7 @@ public class WorkflowTest {
 	 * @param timeout the timeout in milliseconds

 	 * @return the WorkflowResponse

 	 */

-	public WorkflowResponse receiveResponse(String businessKey,

+	protected WorkflowResponse receiveResponse(String businessKey,

 			TestAsyncResponse asyncResponse, long timeout) {

 		System.out.println("Waiting " + timeout + "ms for process with business key " + businessKey

 			+ " to send a response");

@@ -512,24 +522,34 @@ public class WorkflowTest {
 			}

 

 			String content = null;

+			String contentType = null;

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' SDNC request";

 					System.out.println(msg);

 					fail(msg);

 				}

+

+				content = callbackData.getContent();

+				contentType = callbackData.getContentType();

 			} else if ("ERR".equals(modifier)) {

 				content = "{\"SDNCServiceError\":{\"sdncRequestId\":\"((REQUEST-ID))\",\"responseCode\":\"500\",\"responseMessage\":\"SIMULATED ERROR FROM SDNC ADAPTER\",\"ackFinalIndicator\":\"Y\"}}";

+				contentType = JSON;

 			} else {

 				String msg = "Invalid SDNC program modifier: '" + modifier + "'";

 				System.out.println(msg);

 				fail(msg);

 			}

 

-			if (!injectSDNCRestCallback(content, 10000)) {

+			if (contentType == null) {

+				// Default for backward compatibility with existing tests.

+				contentType = JSON;

+			}

+

+			if (!injectSDNCRestCallback(contentType, content, 10000)) {

 				fail("Failed to inject SDNC '" + action + "' callback");

 			}

 

@@ -548,67 +568,14 @@ public class WorkflowTest {
 	 * <pre>

 	 *     event1, event2

 	 * </pre>

+	 * NOTE: Each callback must have a message type associated with it, e.g.

+	 * "SDNCAEvent".

 	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * Defaults the Event Type to "SDNCAEvent" for backward compatibility.

 	 * @param callbacks an object containing event data for the program

 	 * @param program the program to execute

 	 */

 	protected void injectSDNCEvents(CallbackSet callbacks, String program) {

-		injectSDNCEvents(callbacks, program, "SDNCAEvent");

-	}

-

-	/**

-	 * Runs a program to inject SDNC events into the test environment.

-	 * A program is essentially just a list of keys that identify event data

-	 * to be injected, in sequence. An example program:

-	 * <pre>

-	 *     event1, event2

-	 * </pre>

-	 * Errors are handled with junit assertions and will cause the test to fail.

-	 * @param callbacks an object containing event data for the program

-	 * @param program the program to execute

-	 * @param eventType (i.e. "SDNCAEvent", "SNIROResponse", etc.)

-	 */

-	protected void injectSDNCEvents(CallbackSet callbacks, String program, String eventType) {

-

-		String[] cmds = program.replaceAll("\\s+", "").split(",");

-

-		for (String cmd : cmds) {

-			String action = cmd;

-			String modifier = "STD";

-

-			if (cmd.contains(":")) {

-				String[] parts = cmd.split(":");

-				action = parts[0];

-				modifier = parts[1];

-			}

-

-			String content = null;

-

-			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

-

-				if (content == null) {

-					String msg = "No SDNC event callback defined for '" + action + "'";

-					System.out.println(msg);

-					fail(msg);

-				}

-			} else {

-				String msg = "Invalid SDNC program modifier: '" + modifier + "'";

-				System.out.println(msg);

-				fail(msg);

-			}

-

-			if (!injectWorkflowMessage(eventType, content, 10000)) {

-				fail("Failed to inject SDNC '" + action + "' event");

-			}

-

-			try {

-				Thread.sleep(1000);

-			} catch (InterruptedException e) {

-				fail("Interrupted after injection of SDNC '" + action + "' event");

-			}

-		}

+		injectWorkflowMessages(callbacks, program);

 	}

 

 	/**

@@ -622,7 +589,7 @@ public class WorkflowTest {
 	 * @param callbacks an object containing callback data for the program

 	 * @param program the program to execute

 	 */

-	public void injectSDNCCallbacks(CallbackSet callbacks, String program) {

+	protected void injectSDNCCallbacks(CallbackSet callbacks, String program) {

 

 		String[] cmds = program.replaceAll("\\s+", "").split(",");

 

@@ -641,14 +608,15 @@ public class WorkflowTest {
 			String respMsg = "OK";

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' SDNC request";

 					System.out.println(msg);

 					fail(msg);

 				}

 

+				content = callbackData.getContent();

 				respCode = 200;

 				respMsg = "OK";

 			} else if ("ERR".equals(modifier)) {

@@ -684,7 +652,7 @@ public class WorkflowTest {
 	 * @param callbacks an object containing callback data for the program

 	 * @param program the program to execute

 	 */

-	public void injectVNFRestCallbacks(CallbackSet callbacks, String program) {

+	protected void injectVNFRestCallbacks(CallbackSet callbacks, String program) {

 

 		String[] cmds = program.replaceAll("\\s+", "").split(",");

 

@@ -699,24 +667,34 @@ public class WorkflowTest {
 			}

 

 			String content = null;

+			String contentType = null;

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' VNF REST request";

 					System.out.println(msg);

 					fail(msg);

 				}

+

+				content = callbackData.getContent();

+				contentType = callbackData.getContentType();

 			} else if ("ERR".equals(modifier)) {

 				content = "SIMULATED ERROR FROM VNF ADAPTER";

+				contentType = "text/plain";

 			} else {

 				String msg = "Invalid VNF REST program modifier: '" + modifier + "'";

 				System.out.println(msg);

 				fail(msg);

 			}

 

-			if (!injectVnfAdapterRestCallback(content, 10000)) {

+			if (contentType == null) {

+				// Default for backward compatibility with existing tests.

+				contentType = XML;

+			}

+

+			if (!injectVnfAdapterRestCallback(contentType, content, 10000)) {

 				fail("Failed to inject VNF REST '" + action + "' callback");

 			}

 

@@ -756,14 +734,15 @@ public class WorkflowTest {
 			String content = null;

 

 			if ("STD".equals(modifier)) {

-				content = callbacks.get(action);

+				CallbackData callbackData = callbacks.get(action);

 

-				if (content == null) {

+				if (callbackData == null) {

 					String msg = "No callback defined for '" + action + "' VNF request";

 					System.out.println(msg);

 					fail(msg);

 				}

 

+				content = callbackData.getContent();

 			} else if ("ERR".equals(modifier)) {

 				String msg = "Currently unsupported VNF program modifier: '" + modifier + "'";

 				System.out.println(msg);

@@ -805,7 +784,7 @@ public class WorkflowTest {
 	 * @param count the desired count

 	 * @param timeout the timeout in milliseconds

 	 */

-	public void waitForRunningProcessCount(String processKey, int count, long timeout) {

+	protected void waitForRunningProcessCount(String processKey, int count, long timeout) {

 		System.out.println("Waiting " + timeout + "ms for there to be " + count + " "

 			+ processKey + " instances");

 

@@ -916,11 +895,12 @@ public class WorkflowTest {
 	 * may contain the placeholder string ((REQUEST-ID)) which is replaced with

 	 * the actual SDNC request ID. Note: this is not the requestId in the original

 	 * MSO request.

+	 * @param contentType the HTTP content type for the callback

 	 * @param content the content of the callback

 	 * @param timeout the timeout in milliseconds

 	 * @return true if the callback could be injected, false otherwise

 	 */

-	protected boolean injectSDNCRestCallback(String content, long timeout) {

+	protected boolean injectSDNCRestCallback(String contentType, String content, long timeout) {

 		String sdncRequestId = (String) getProcessVariable("SDNCAdapterRestV1",

 			"SDNCAResponse_CORRELATOR", timeout);

 

@@ -935,7 +915,7 @@ public class WorkflowTest {
 		System.out.println("Injecting SDNC adapter callback");

 		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

 		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver("SDNCAResponse", sdncRequestId, content);

+		Response response = workflowMessageResource.deliver(contentType, "SDNCAResponse", sdncRequestId, content);

 		System.out.println("Workflow response to SDNC adapter callback: " + response);

 		return true;

 	}

@@ -986,11 +966,12 @@ public class WorkflowTest {
 	 * may contain the placeholder string ((MESSAGE-ID)) which is replaced with

 	 * the actual message ID. Note: this is not the requestId in the original

 	 * MSO request.

+	 * @param contentType the HTTP content type for the callback

 	 * @param content the content of the callback

 	 * @param timeout the timeout in milliseconds

 	 * @return true if the callback could be injected, false otherwise

 	 */

-	protected boolean injectVnfAdapterRestCallback(String content, long timeout) {

+	protected boolean injectVnfAdapterRestCallback(String contentType, String content, long timeout) {

 		String messageId = (String) getProcessVariable("vnfAdapterRestV1",

 			"VNFAResponse_CORRELATOR", timeout);

 

@@ -1005,7 +986,7 @@ public class WorkflowTest {
 		System.out.println("Injecting VNF adapter callback");

 		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

 		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver("VNFAResponse", messageId, content);

+		Response response = workflowMessageResource.deliver(contentType, "VNFAResponse", messageId, content);

 		System.out.println("Workflow response to VNF adapter callback: " + response);

 		return true;

 	}

@@ -1308,15 +1289,83 @@ public class WorkflowTest {
 	}

 

 	/**

+	 * Runs a program to inject workflow messages into the test environment.

+	 * A program is essentially just a list of keys that identify event data

+	 * to be injected, in sequence. An example program:

+	 * <pre>

+	 *     event1, event2

+	 * </pre>

+	 * Errors are handled with junit assertions and will cause the test to fail.

+	 * NOTE: Each callback must have a workflow message type associated with it.

+	 * @param callbacks an object containing event data for the program

+	 * @param program the program to execute

+	 */

+	protected void injectWorkflowMessages(CallbackSet callbacks, String program) {

+

+		String[] cmds = program.replaceAll("\\s+", "").split(",");

+

+		for (String cmd : cmds) {

+			String action = cmd;

+			String modifier = "STD";

+

+			if (cmd.contains(":")) {

+				String[] parts = cmd.split(":");

+				action = parts[0];

+				modifier = parts[1];

+			}

+

+			String messageType = null;

+			String content = null;

+			String contentType = null;

+

+			if ("STD".equals(modifier)) {

+				CallbackData callbackData = callbacks.get(action);

+

+				if (callbackData == null) {

+					String msg = "No '" + action + "' workflow message callback is defined";

+					System.out.println(msg);

+					fail(msg);

+				}

+

+				messageType = callbackData.getMessageType();

+

+				if (messageType == null || messageType.trim().equals("")) {

+					String msg = "No workflow message type is defined in the '" + action + "' callback";

+					System.out.println(msg);

+					fail(msg);

+				}

+

+				content = callbackData.getContent();

+				contentType = callbackData.getContentType();

+			} else {

+				String msg = "Invalid workflow message program modifier: '" + modifier + "'";

+				System.out.println(msg);

+				fail(msg);

+			}

+

+			if (!injectWorkflowMessage(contentType, messageType, content, 10000)) {

+				fail("Failed to inject '" + action + "' workflow message");

+			}

+

+			try {

+				Thread.sleep(1000);

+			} catch (InterruptedException e) {

+				fail("Interrupted after injection of '" + action + "' workflow message");

+			}

+		}

+	}

+

+	/**

 	 * Injects a workflow message. The specified callback data may contain the

 	 * placeholder string ((CORRELATOR)) which is replaced with the actual

 	 * correlator value.

-	 * @param content the message type

-	 * @param content the message content

+	 * @param contentType the HTTP contentType for the message (possibly null)

+	 * @param messageType the message type

+	 * @param content the message content (possibly null)

 	 * @param timeout the timeout in milliseconds

-	 * @return true if the event could be injected, false otherwise

+	 * @return true if the message could be injected, false otherwise

 	 */

-	protected boolean injectWorkflowMessage(String messageType, String content, long timeout) {

+	protected boolean injectWorkflowMessage(String contentType, String messageType, String content, long timeout) {

 		String correlator = (String) getProcessVariable("ReceiveWorkflowMessage",

 			messageType + "_CORRELATOR", timeout);

 

@@ -1324,12 +1373,14 @@ public class WorkflowTest {
 			return false;

 		}

 

-		content = content.replace("((CORRELATOR))", correlator);

+		if (content != null) {

+			content = content.replace("((CORRELATOR))", correlator);

+		}

 

 		System.out.println("Injecting " + messageType + " message");

 		WorkflowMessageResource workflowMessageResource = new WorkflowMessageResource();

 		workflowMessageResource.setProcessEngineServices4junit(processEngineRule);

-		Response response = workflowMessageResource.deliver(messageType, correlator, content);

+		Response response = workflowMessageResource.deliver(contentType, messageType, correlator, content);

 		System.out.println("Workflow response to " + messageType + " message: " + response);

 		return true;

 	}

@@ -1339,7 +1390,7 @@ public class WorkflowTest {
 	 * @param businessKey the process business key

 	 * @param timeout the amount of time to wait, in milliseconds

 	 */

-	public void waitForProcessEnd(String businessKey, long timeout) {

+	protected void waitForProcessEnd(String businessKey, long timeout) {

 		System.out.println("Waiting " + timeout + "ms for process with business key " +

 			businessKey + " to end");

 

@@ -1377,7 +1428,7 @@ public class WorkflowTest {
 	 * @param variable the variable name

 	 * @param value the expected variable value

 	 */

-	public void checkVariable(String businessKey, String variable, Object value) {

+	protected void checkVariable(String businessKey, String variable, Object value) {

 		if (!isProcessEnded(businessKey)) {

 			fail("Cannot get historic variable " + variable + " because process with business key " +

 				businessKey + " has not ended");

@@ -1405,7 +1456,7 @@ public class WorkflowTest {
 	 * @return the variable value, or null if the variable could not be

 	 * obtained

 	 */

-	public Object getVariableFromHistory(String businessKey, String variableName) {

+	protected Object getVariableFromHistory(String businessKey, String variableName) {

 		try {

 			HistoricProcessInstance processInstance = processEngineRule.getHistoryService()

 				.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).singleResult();

@@ -1426,6 +1477,8 @@ public class WorkflowTest {
 	}

 

 	/**

+	 * @author cb645j

+	 *

 	 * Gets the value of a subflow variable from the specified subflow's

 	 * historical process instance.

 	 *

@@ -1440,6 +1493,10 @@ public class WorkflowTest {
 			List<HistoricProcessInstance> processInstanceList = processEngineRule.getHistoryService()

 					.createHistoricProcessInstanceQuery().processDefinitionName(subflowName).list();

 

+			if (processInstanceList == null) {

+				return null;

+			}

+

 			Collections.sort(processInstanceList, new Comparator<HistoricProcessInstance>() {

 			    public int compare(HistoricProcessInstance m1, HistoricProcessInstance m2) {

 			        return m1.getStartTime().compareTo(m2.getStartTime());

@@ -1448,10 +1505,6 @@ public class WorkflowTest {
 

 			HistoricProcessInstance processInstance = processInstanceList.get(0);

 

-			if (processInstanceList == null) {

-				return null;

-			}

-

 			HistoricVariableInstance v = processEngineRule.getHistoryService()

 				.createHistoricVariableInstanceQuery().processInstanceId(processInstance.getId())

 				.variableName(variableName).singleResult();

@@ -1464,6 +1517,8 @@ public class WorkflowTest {
 	}

 

 	/**

+	 * @author cb645j

+	 *

 	 * Gets the value of a subflow variable from the subflow's

 	 * historical process x instance.

 	 *

@@ -1478,6 +1533,10 @@ public class WorkflowTest {
 			List<HistoricProcessInstance> processInstanceList = processEngineRule.getHistoryService()

 					.createHistoricProcessInstanceQuery().processDefinitionName(subflowName).list();

 

+			if (processInstanceList == null) {

+				return null;

+			}

+

 			Collections.sort(processInstanceList, new Comparator<HistoricProcessInstance>() {

 			    public int compare(HistoricProcessInstance m1, HistoricProcessInstance m2) {

 			        return m1.getStartTime().compareTo(m2.getStartTime());

@@ -1486,10 +1545,6 @@ public class WorkflowTest {
 

 			HistoricProcessInstance processInstance = processInstanceList.get(subflowInstanceIndex);

 

-			if (processInstanceList == null) {

-				return null;

-			}

-

 			HistoricVariableInstance v = processEngineRule.getHistoryService()

 				.createHistoricVariableInstanceQuery().processInstanceId(processInstance.getId())

 				.variableName(variableName).singleResult();

@@ -1594,15 +1649,36 @@ public class WorkflowTest {
 	 * An object that contains callback data for a "program".

 	 */

 	public class CallbackSet {

-		private final Map<String, String> map = new HashMap<String, String>();

+		private final Map<String, CallbackData> map = new HashMap<String, CallbackData>();

 

 		/**

-		 * Add callback data to the set.

+		 * Add untyped callback data to the set.

 		 * @param action the action with which the data is associated

 		 * @param content the callback data

 		 */

 		public void put(String action, String content) {

-			map.put(action, content);

+			map.put(action, new CallbackData(null, null, content));

+		}

+

+		/**

+		 * Add callback data to the set.

+		 * @param action the action with which the data is associated

+		 * @param messageType the callback message type

+		 * @param content the callback data

+		 */

+		public void put(String action, String messageType, String content) {

+			map.put(action, new CallbackData(null, messageType, content));

+		}

+

+		/**

+		 * Add callback data to the set.

+		 * @param action the action with which the data is associated

+		 * @param contentType the callback HTTP content type

+		 * @param messageType the callback message type

+		 * @param content the callback data

+		 */

+		public void put(String action, String contentType, String messageType, String content) {

+			map.put(action, new CallbackData(contentType, messageType, content));

 		}

 

 		/**

@@ -1610,12 +1686,54 @@ public class WorkflowTest {
 		 * @param action the action with which the data is associated

 		 * @return the callback data, or null if there is none for the specified operation

 		 */

-		public String get(String action) {

+		public CallbackData get(String action) {

 			return map.get(action);

 		}

 	}

 

 	/**

+	 * Represents a callback data item.

+	 */

+	public class CallbackData {

+		private final String contentType;

+		private final String messageType;

+		private final String content;

+

+		/**

+		 * Constructor

+		 * @param contentType the HTTP content type (optional)

+		 * @param type the callback message type (optional)

+		 * @param content the content

+		 */

+		public CallbackData(String contentType, String messageType, String content) {

+			this.contentType = contentType;

+			this.messageType = messageType;

+			this.content = content;

+		}

+

+		/**

+		 * Gets the callback HTTP content type, possibly null.

+		 */

+		public String getContentType() {

+			return contentType;

+		}

+

+		/**

+		 * Gets the callback message type, possibly null.

+		 */

+		public String getMessageType() {

+			return messageType;

+		}

+

+		/**

+		 * Gets the callback content.

+		 */

+		public String getContent() {

+			return content;

+		}

+	}

+

+	/**

 	 * A tool for evaluating XPath expressions.

 	 */

 	protected class XPathTool {

@@ -1772,7 +1890,7 @@ public class WorkflowTest {
 	 * Helper class to make it easier to create this type.

 	 */

 	private static class CreateVnfNotificationOutputs

-			extends org.openecomp.mso.bpmn.common.adapter.vnf.CreateVnfNotification.Outputs {

+			extends CreateVnfNotification.Outputs {

 		public void add(String key, String value) {

 			Entry entry = new Entry();

 			entry.setKey(key);

@@ -1785,7 +1903,7 @@ public class WorkflowTest {
 	 * Helper class to make it easier to create this type.

 	 */

 	private static class UpdateVnfNotificationOutputs

-			extends org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification.Outputs {

+			extends UpdateVnfNotification.Outputs {

 		public void add(String key, String value) {

 			Entry entry = new Entry();

 			entry.setKey(key);

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
index 10e9930..6ebc6e2 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/drop_mariadb_engine_7.5.6.sql
@@ -1,76 +1,75 @@
--- Fix for https://itrack.web.att.com/browse/AJSCCMDA-90 --
-use camundabpmn;
-/* 
-Drop a archive tables
-*/
-/*-- TMP_ARCHIVING_PROCINST */
-DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;
-
-/*-- TMP_ARCHIVING_BYTEARRAY */
-DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;
-
-/*-- TMP LOG TABLE */
-DROP TABLE IF EXISTS TMPLOGTABLE;
-
-/* -- Camunda Hi Tables --*/
-DROP TABLE IF EXISTS Camunda_Hi_Tables;
-
-/* drop own extentions columns:
-alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);
-*/
-
-/*--#1 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;
-/*--#2 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;
-/*--#3 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;
-/*--#4 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;
-/*--#5 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;
-/*--#6 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;
-/*--#7 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;
-/*--#8 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;
-/*--#9 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;
-/*--#10 */
-DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;
-
-/* drop PL SQL procedures: */
-DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;
-DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;
- 
-/*-- Sequence */
--- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence
- DROP PROCEDURE IF EXISTS DropSequence;
- 
-  DELIMITER //
- 
-  CREATE PROCEDURE DropSequence (vname VARCHAR(30))
-  BEGIN
-     -- Drop the sequence
-     DELETE FROM _sequences WHERE name = vname;  
-  END
-  //
-  DELIMITER ;
-
--- use the above procedure to drop sequence 
-CALL DropSequence('STAT_EXECUTION_SEQ');
-
-/*-- To Drop the MariaDB specific user defined procedures and functions */
-DROP FUNCTION IF EXISTS NextVal;
-DROP PROCEDURE IF EXISTS CreateSequence;
-DROP PROCEDURE IF EXISTS DropSequence;
+use camundabpmn;

+/* 

+Drop a archive tables

+*/

+/*-- TMP_ARCHIVING_PROCINST */

+DROP TABLE IF EXISTS TMP_ARCHIVING_PROCINST;

+

+/*-- TMP_ARCHIVING_BYTEARRAY */

+DROP TABLE IF EXISTS TMP_ARCHIVING_BYTEARRAY;

+

+/*-- TMP LOG TABLE */

+DROP TABLE IF EXISTS TMPLOGTABLE;

+

+/* -- Camunda Hi Tables --*/

+DROP TABLE IF EXISTS Camunda_Hi_Tables;

+

+/* drop own extentions columns:

+alter table  ARCHIVE_ACT_HI_PROCINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_ACTINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_TASKINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_VARINST DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_DETAIL DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_COMMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_ATTACHMENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_OP_LOG DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+alter table  ARCHIVE_ACT_HI_INCIDENT DROP (STAT_EXECUTION_ID, STAT_EXECUTION_TS);

+*/

+

+/*--#1 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_PROCINST;

+/*--#2 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ACTINST;

+/*--#3 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_TASKINST;

+/*--#4 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_VARINST;

+/*--#5 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_DETAIL;

+/*--#6 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_COMMENT;

+/*--#7 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_ATTACHMENT;

+/*--#8 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_OP_LOG;

+/*--#9 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_HI_INCIDENT;

+/*--#10 */

+DROP TABLE IF EXISTS ARCHIVE_ACT_GE_BYTEARRAY;

+

+/* drop PL SQL procedures: */

+DROP PROCEDURE IF EXISTS ARCHIVE_CAMUNDA_HISTORY;

+DROP PROCEDURE IF EXISTS ROLLB_ARCHIVE_CAMUNDA_HISTORY;

+ 

+/*-- Sequence */

+-- as sequence drop doesn't work automatically in MariaDB, use this procedure to drop sequence

+ DROP PROCEDURE IF EXISTS DropSequence;

+ 

+  DELIMITER //

+ 

+  CREATE PROCEDURE DropSequence (vname VARCHAR(30))

+  BEGIN

+     -- Drop the sequence

+     DELETE FROM _sequences WHERE name = vname;  

+  END

+  //

+  DELIMITER ;

+

+-- use the above procedure to drop sequence 

+CALL DropSequence('STAT_EXECUTION_SEQ');

+

+/*-- To Drop the MariaDB specific user defined procedures and functions */

+DROP FUNCTION IF EXISTS NextVal;

+DROP PROCEDURE IF EXISTS CreateSequence;

+DROP PROCEDURE IF EXISTS DropSequence;

 DROP TABLE IF EXISTS _sequences;
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
index 8c7faa0..c5b69c7 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/CamundaDBScripts/Archive/mariadb_engine_7.5_patch_7.5.6.sql
@@ -1,222 +1,221 @@
--- Fix for https://itrack.web.att.com/browse/AJSCCMDA-90 --
-use camundabpmn;
-/*
- 1.  Add some Camunda Indexes to history schema part (for Archiving)
-*/
-create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 
-create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);
-create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 
-
-
-/*
- 2.  Create Archiving Tables in current schema 
-*/
-
-/*-- TMP_ARCHIVING_PROCINST */
-CREATE TABLE TMP_ARCHIVING_PROCINST
-( PROC_INST_ID_ varchar(64) not null,
-  END_TIME_ datetime(3)
-);
-CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);
-
-/*-- TMP_ARCHIVING_BYTEARRAY */
-CREATE TABLE TMP_ARCHIVING_BYTEARRAY
-( BYTEARRAY_ID_ varchar(64) not null,
-  PROC_INST_ID_ varchar(64)
-);
-CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);
-
-
-/*--#1 ARCHIVE_ACT_HI_PROCINST; */
-create TABLE ARCHIVE_ACT_HI_PROCINST
-AS ( select * from ACT_HI_PROCINST where 1=0);
-
-create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);
-ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);
-
-/*--#2   ARCHIVE_ACT_HI_ACTINST; */
-create TABLE ARCHIVE_ACT_HI_ACTINST
-AS ( select * from ACT_HI_ACTINST where 1=0);
-
-create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);
-create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);
-
-/*--#3  ARCHIVE_ACT_HI_TASKINST; */
-create TABLE ARCHIVE_ACT_HI_TASKINST
-AS ( select * from ACT_HI_TASKINST where 1=0);
-
-create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);
-create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);
-
-/*--#4 ARCHIVE_ACT_HI_VARINST; */
-create TABLE ARCHIVE_ACT_HI_VARINST
-AS ( select * from ACT_HI_VARINST where 1=0);
-
-create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);
-
-/*--#5 ARCHIVE_ACT_HI_DETAIL; */
-create TABLE ARCHIVE_ACT_HI_DETAIL
-AS ( select * from ACT_HI_DETAIL where 1=0);
-
-create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);
-create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);
-
-/*--#6 ARCHIVE_ACT_HI_COMMENT; */
-create TABLE ARCHIVE_ACT_HI_COMMENT
-AS ( select * from ACT_HI_COMMENT where 1=0);
-
-create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);
-create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);
-
-/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */
-create TABLE ARCHIVE_ACT_HI_ATTACHMENT
-AS ( select * from ACT_HI_ATTACHMENT where 1=0);
-
-create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);
-
-/*--#8 ARCHIVE_ACT_HI_OP_LOG; */
-create TABLE ARCHIVE_ACT_HI_OP_LOG
-AS ( select * from ACT_HI_OP_LOG where 1=0);
-
-create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);
-create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);
-
-/*--#9 ARCHIVE_ACT_HI_INCIDENT; */
-create TABLE ARCHIVE_ACT_HI_INCIDENT
-AS ( select * from ACT_HI_INCIDENT where 1=0);
-
-create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);
-
-/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */
-create TABLE ARCHIVE_ACT_GE_BYTEARRAY
-AS ( select * from ACT_GE_BYTEARRAY where 1=0);
-
-create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);
-
-/* -----------------------------------------------------------------------------
-Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 
-*/
- 
-/*
---TEMPLATE:
-alter table ARCHIVE_%TableName%
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);
-*/
-
-
-/*--#1 ACT_HI_PROCINST */
-alter table ARCHIVE_ACT_HI_PROCINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);
-
-/*--#2 ACT_HI_ACTINST */
-alter table ARCHIVE_ACT_HI_ACTINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);
-
-/*--#3 ACT_HI_TASKINST */
-alter table ARCHIVE_ACT_HI_TASKINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);
-
-/*--#4 ACT_HI_VARINST */
-alter table ARCHIVE_ACT_HI_VARINST
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);
-
-/*--#5 ACT_HI_DETAIL */
-alter table ARCHIVE_ACT_HI_DETAIL
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);
-
-/*--#6 ACT_HI_COMMENT */
-alter table ARCHIVE_ACT_HI_COMMENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);
-
-/*--#7 ACT_HI_ATTACHMENT */
-alter table ARCHIVE_ACT_HI_ATTACHMENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);
-
-/*--#8 ACT_HI_OP_LOG */
-alter table ARCHIVE_ACT_HI_OP_LOG
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);
-
-/*--#9 ACT_HI_INCIDENT */
-alter table ARCHIVE_ACT_HI_INCIDENT
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);
-
-/*--#10 ACT_GE_BYTEARRAY */
-alter table ARCHIVE_ACT_GE_BYTEARRAY
-    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );
-CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);
-
-
-/* -- Next Val as a user defined function needed only in MariaDB--*/
-DROP FUNCTION IF EXISTS NextVal;
-  DELIMITER //
-  CREATE FUNCTION NextVal (vname VARCHAR(30))
-    RETURNS INT
-  BEGIN
-     -- Retrieve and update in single statement
-     UPDATE _sequences
-       SET next = next + 1
-       WHERE name = vname;
- 
-     RETURN (SELECT next FROM _sequences LIMIT 1);
-  END
-  //
-  DELIMITER ;
-  
-/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/
-Create Table Camunda_Hi_Tables (id_ MEDIUMINT NOT NULL AUTO_INCREMENT,
-     TableName_ varchar(80) NOT NULL,
-     PRIMARY KEY (id_));
-   
-Insert Into Camunda_Hi_Tables(TableName_) Values ('ACT_HI_PROCINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ACTINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_TASKINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_VARINST');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_DETAIL');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_COMMENT');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ATTACHMENT');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_OP_LOG');
-Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_INCIDENT');
-
-/*-- log table --*/
-CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));
-
-
-/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/
-/*-- Create a sequence SP */
-DROP PROCEDURE IF EXISTS CreateSequence;
-  DELIMITER //
-  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)
-  BEGIN
-     -- Create a table to store sequences
-     CREATE TABLE IF NOT EXISTS _sequences
-     (
-         name VARCHAR(70) NOT NULL UNIQUE,
-         next INT NOT NULL,
-         inc INT NOT NULL
-     );
- 
-     -- Add the new sequence
-     INSERT INTO _sequences VALUES (name, start, inc);  
-  END
-  //
-  DELIMITER ;
-
-/*--------------------------------------------------------------------------------------------------
- Add Meta to Archive
- -------------------------------------------------------------------------------------------------- */
-
-/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */
-CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);
+use camundabpmn;

+/*

+ 1.  Add some Camunda Indexes to history schema part (for Archiving)

+*/

+create INDEX IF NOT EXISTS IDX_ACT_HI_TASKINST_PIID ON ACT_HI_TASKINST (PROC_INST_ID_); 

+create INDEX IF NOT EXISTS IDX_ACT_HI_COMMENT_PIID ON ACT_HI_COMMENT (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_ATTACHMENT_PIID ON ACT_HI_ATTACHMENT (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_OP_LOG_PIID ON ACT_HI_OP_LOG (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_INCIDENT_PIID ON ACT_HI_INCIDENT (PROC_INST_ID_);

+create INDEX IF NOT EXISTS IDX_ACT_HI_ACTINST_PIID ON ACT_HI_ACTINST(PROC_INST_ID_); 

+

+

+/*

+ 2.  Create Archiving Tables in current schema 

+*/

+

+/*-- TMP_ARCHIVING_PROCINST */

+CREATE TABLE TMP_ARCHIVING_PROCINST

+( PROC_INST_ID_ varchar(64) not null,

+  END_TIME_ datetime(3)

+);

+CREATE INDEX AI_TMP_ARCH_PROCINST_PI_ID ON TMP_ARCHIVING_PROCINST(PROC_INST_ID_);

+

+/*-- TMP_ARCHIVING_BYTEARRAY */

+CREATE TABLE TMP_ARCHIVING_BYTEARRAY

+( BYTEARRAY_ID_ varchar(64) not null,

+  PROC_INST_ID_ varchar(64)

+);

+CREATE INDEX AI_TMP_ARCH_BYTEARRAY_BAID ON TMP_ARCHIVING_BYTEARRAY(BYTEARRAY_ID_);

+

+

+/*--#1 ARCHIVE_ACT_HI_PROCINST; */

+create TABLE ARCHIVE_ACT_HI_PROCINST

+AS ( select * from ACT_HI_PROCINST where 1=0);

+

+create index AI_HI_PROCINST_END_TIME on ARCHIVE_ACT_HI_PROCINST(END_TIME_);

+ALTER TABLE ARCHIVE_ACT_HI_PROCINST ADD CONSTRAINT  ARCHIVE_ACT_HI_PROCINST_UQ UNIQUE ( PROC_INST_ID_);

+

+/*--#2   ARCHIVE_ACT_HI_ACTINST; */

+create TABLE ARCHIVE_ACT_HI_ACTINST

+AS ( select * from ACT_HI_ACTINST where 1=0);

+

+create index AI_HI_ACTINST_PROC_INST_ID on ARCHIVE_ACT_HI_ACTINST(PROC_INST_ID_);

+create index AI_HI_ACTINST_END_TIME on ARCHIVE_ACT_HI_ACTINST(END_TIME_);

+

+/*--#3  ARCHIVE_ACT_HI_TASKINST; */

+create TABLE ARCHIVE_ACT_HI_TASKINST

+AS ( select * from ACT_HI_TASKINST where 1=0);

+

+create index AI_HI_TASKINST_PROC_INST_ID on ARCHIVE_ACT_HI_TASKINST(PROC_INST_ID_);

+create index AI_HI_TASKINST_END_TIME on ARCHIVE_ACT_HI_TASKINST(END_TIME_);

+

+/*--#4 ARCHIVE_ACT_HI_VARINST; */

+create TABLE ARCHIVE_ACT_HI_VARINST

+AS ( select * from ACT_HI_VARINST where 1=0);

+

+create index AI_HI_VARINST_PROC_INST_ID on ARCHIVE_ACT_HI_VARINST(PROC_INST_ID_);

+

+/*--#5 ARCHIVE_ACT_HI_DETAIL; */

+create TABLE ARCHIVE_ACT_HI_DETAIL

+AS ( select * from ACT_HI_DETAIL where 1=0);

+

+create index AI_HI_DETAIL_PROC_INST_ID on ARCHIVE_ACT_HI_DETAIL(PROC_INST_ID_);

+create index AI_HI_DETAIL_TIME on ARCHIVE_ACT_HI_DETAIL(TIME_);

+

+/*--#6 ARCHIVE_ACT_HI_COMMENT; */

+create TABLE ARCHIVE_ACT_HI_COMMENT

+AS ( select * from ACT_HI_COMMENT where 1=0);

+

+create index AI_HI_COMMENT_PROC_INST_ID on ARCHIVE_ACT_HI_COMMENT(PROC_INST_ID_);

+create index AI_HI_COMMENT_TIME on ARCHIVE_ACT_HI_COMMENT(TIME_);

+

+/*--#7 ARCHIVE_ACT_HI_ATTACHMENT; */

+create TABLE ARCHIVE_ACT_HI_ATTACHMENT

+AS ( select * from ACT_HI_ATTACHMENT where 1=0);

+

+create index AI_HI_ATTACHMENT_PROC_INST_ID on ARCHIVE_ACT_HI_ATTACHMENT(PROC_INST_ID_);

+

+/*--#8 ARCHIVE_ACT_HI_OP_LOG; */

+create TABLE ARCHIVE_ACT_HI_OP_LOG

+AS ( select * from ACT_HI_OP_LOG where 1=0);

+

+create index AI_HI_OP_LOG_PROC_INST_ID on ARCHIVE_ACT_HI_OP_LOG(PROC_INST_ID_);

+create index AI_HI_OP_LOG_TIMESTAMP on ARCHIVE_ACT_HI_OP_LOG(TIMESTAMP_);

+

+/*--#9 ARCHIVE_ACT_HI_INCIDENT; */

+create TABLE ARCHIVE_ACT_HI_INCIDENT

+AS ( select * from ACT_HI_INCIDENT where 1=0);

+

+create index AI_HI_INCIDENT_PROC_INST_ID on ARCHIVE_ACT_HI_INCIDENT(PROC_INST_ID_);

+

+/*--#10 ARCHIVE_ACT_GE_BYTEARRAY; */

+create TABLE ARCHIVE_ACT_GE_BYTEARRAY

+AS ( select * from ACT_GE_BYTEARRAY where 1=0);

+

+create index AI_GE_BYTEARRAY_ID_ on ARCHIVE_ACT_GE_BYTEARRAY(ID_);

+

+/* -----------------------------------------------------------------------------

+Extend a ARCHIVE: Table by two attributes: STAT_EXECUTION_ID, STAT_EXECUTION_TS 

+*/

+ 

+/*

+--TEMPLATE:

+alter table ARCHIVE_%TableName%

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_%TableName%_EXE_ID ON ARCHIVE_%TableName%(STAT_EXECUTION_ID);

+*/

+

+

+/*--#1 ACT_HI_PROCINST */

+alter table ARCHIVE_ACT_HI_PROCINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_PROCINST_EXE_ID ON ARCHIVE_ACT_HI_PROCINST(STAT_EXECUTION_ID);

+

+/*--#2 ACT_HI_ACTINST */

+alter table ARCHIVE_ACT_HI_ACTINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_ACTINST_EXE_ID ON ARCHIVE_ACT_HI_ACTINST(STAT_EXECUTION_ID);

+

+/*--#3 ACT_HI_TASKINST */

+alter table ARCHIVE_ACT_HI_TASKINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_TASKINST_EXE_ID ON ARCHIVE_ACT_HI_TASKINST(STAT_EXECUTION_ID);

+

+/*--#4 ACT_HI_VARINST */

+alter table ARCHIVE_ACT_HI_VARINST

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_VARINST_EXE_ID ON ARCHIVE_ACT_HI_VARINST(STAT_EXECUTION_ID);

+

+/*--#5 ACT_HI_DETAIL */

+alter table ARCHIVE_ACT_HI_DETAIL

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_DETAIL_EXE_ID ON ARCHIVE_ACT_HI_DETAIL(STAT_EXECUTION_ID);

+

+/*--#6 ACT_HI_COMMENT */

+alter table ARCHIVE_ACT_HI_COMMENT

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_COMMENT_EXE_ID ON ARCHIVE_ACT_HI_COMMENT(STAT_EXECUTION_ID);

+

+/*--#7 ACT_HI_ATTACHMENT */

+alter table ARCHIVE_ACT_HI_ATTACHMENT

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_ATTACHMENT_EXE_ID ON ARCHIVE_ACT_HI_ATTACHMENT(STAT_EXECUTION_ID);

+

+/*--#8 ACT_HI_OP_LOG */

+alter table ARCHIVE_ACT_HI_OP_LOG

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_OP_LOG_EXE_ID ON ARCHIVE_ACT_HI_OP_LOG(STAT_EXECUTION_ID);

+

+/*--#9 ACT_HI_INCIDENT */

+alter table ARCHIVE_ACT_HI_INCIDENT

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_HI_INCIDENT_EXE_ID ON ARCHIVE_ACT_HI_INCIDENT(STAT_EXECUTION_ID);

+

+/*--#10 ACT_GE_BYTEARRAY */

+alter table ARCHIVE_ACT_GE_BYTEARRAY

+    add (STAT_EXECUTION_ID bigint, STAT_EXECUTION_TS timestamp(0) DEFAULT CURRENT_TIMESTAMP );

+CREATE INDEX AI_ACT_GE_BYTEARRAY_EXE_ID ON ARCHIVE_ACT_GE_BYTEARRAY(STAT_EXECUTION_ID);

+

+

+/* -- Next Val as a user defined function needed only in MariaDB--*/

+DROP FUNCTION IF EXISTS NextVal;

+  DELIMITER //

+  CREATE FUNCTION NextVal (vname VARCHAR(30))

+    RETURNS INT

+  BEGIN

+     -- Retrieve and update in single statement

+     UPDATE _sequences

+       SET next = next + 1

+       WHERE name = vname;

+ 

+     RETURN (SELECT next FROM _sequences LIMIT 1);

+  END

+  //

+  DELIMITER ;

+  

+/* -- History tables for use in archive procedure, there is no array type in MariaDB --*/

+Create Table Camunda_Hi_Tables (id_ MEDIUMINT NOT NULL AUTO_INCREMENT,

+     TableName_ varchar(80) NOT NULL,

+     PRIMARY KEY (id_));

+   

+Insert Into Camunda_Hi_Tables(TableName_) Values ('ACT_HI_PROCINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ACTINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_TASKINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_VARINST');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_DETAIL');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_COMMENT');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_ATTACHMENT');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_OP_LOG');

+Insert Into Camunda_Hi_Tables(TableName_)  Values ('ACT_HI_INCIDENT');

+

+/*-- log table --*/

+CREATE TABLE TMPLOGTABLE (LogMessage Varchar(700));

+

+

+/* -- Below user defined functions and procedures needed only in MariaDB, they are in-built in Oracle --*/

+/*-- Create a sequence SP */

+DROP PROCEDURE IF EXISTS CreateSequence;

+  DELIMITER //

+  CREATE PROCEDURE CreateSequence (name VARCHAR(30), start INT, inc INT)

+  BEGIN

+     -- Create a table to store sequences

+     CREATE TABLE IF NOT EXISTS _sequences

+     (

+         name VARCHAR(70) NOT NULL UNIQUE,

+         next INT NOT NULL,

+         inc INT NOT NULL

+     );

+ 

+     -- Add the new sequence

+     INSERT INTO _sequences VALUES (name, start, inc);  

+  END

+  //

+  DELIMITER ;

+

+/*--------------------------------------------------------------------------------------------------

+ Add Meta to Archive

+ -------------------------------------------------------------------------------------------------- */

+

+/* Create STAT_EXECUTION_SEQ: each Archive Entry has a same Execution ID during one Archiving Run */

+CALL CreateSequence('STAT_EXECUTION_SEQ', 1, 1);

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
index 8a69040..7b72812 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/UpdateAAIVfModuleRequest.xml
@@ -1,10 +1,10 @@
-<UpdateAAIVfModuleRequest>
-	<vnf-id>skask</vnf-id>
-	<vf-module-id>supercool</vf-module-id>
-	<heat-stack-id>slowburn</heat-stack-id>
-	<orchestration-status>complete</orchestration-status>
-	<volume-group-id>78987</volume-group-id>
-	<persona-model-id>introvert</persona-model-id>
-	<persona-model-version>3.14</persona-model-version>
-	<contrail-service-instance-fqdn>myhost.appl.com</contrail-service-instance-fqdn>
+<UpdateAAIVfModuleRequest>

+	<vnf-id>skask</vnf-id>

+	<vf-module-id>supercool</vf-module-id>

+	<heat-stack-id>slowburn</heat-stack-id>

+	<orchestration-status>complete</orchestration-status>

+	<volume-group-id>78987</volume-group-id>

+	<persona-model-id>introvert</persona-model-id>

+	<persona-model-version>3.14</persona-model-version>

+	<contrail-service-instance-fqdn>myhost.appl.com</contrail-service-instance-fqdn>

 </UpdateAAIVfModuleRequest>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
index 3370e33..ee09c9b 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
@@ -5,8 +5,8 @@
 	<orchestration-status>pending-create</orchestration-status>

 	<is-base-vf-module>false</is-base-vf-module>

 	<resource-version>330-89</resource-version>

-	<persona-model-id>introvert</persona-model-id>

-	<persona-model-version>2.0</persona-model-version>

+	<model-invariant-id>introvert</model-invariant-id>

+	<model-version-id>2.0</model-version-id>

 	<relationship-list>

 		<relationship>

 			<related-to>volume-group</related-to>

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
index 133f585..1ac75e9 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -57,7 +57,7 @@ aai.endpoint=http://localhost:28090
 # Example to override default version for a resource:

 #mso.workflow.default.aai.vce.version=6

 #mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce

-

+mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/

 mso.workflow.global.default.aai.version=8

 mso.workflow.default.aai.cloud-region.version=9

 mso.workflow.default.aai.generic-vnf.version=9

@@ -83,4 +83,11 @@ log.debug.FalloutHandler=true
 log.debug.GenericGetService=true

 log.debug.sdncAdapter=true

 log.debug.UpdateNetworkInstanceInfra=true

-log.debug.VnfAdapterRestV1=true
\ No newline at end of file
+log.debug.VnfAdapterRestV1=true

+log.debug.GenericGetNetwork=true

+log.debug.GenericGetVnf=true

+log.debug.GenericDeleteService=true

+log.debug.GenericDeleteNetwork=true

+log.debug.GenericDeleteVnf=true

+log.debug.vnfAdapterCreateV1=true

+log.debug.vnfAdapterRestV1=true
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/AllottedResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/AllottedResource.java
new file mode 100644
index 0000000..c7d2ed9
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/AllottedResource.java
@@ -0,0 +1,38 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import org.codehaus.jackson.map.annotate.JsonRootName;

+

+@JsonRootName("allottedResource")

+public class AllottedResource extends ResourceDecomposition {

+

+	private static final long serialVersionUID = 1L;

+

+	/*

+	 * set resourceType for this object

+	 */

+	public AllottedResource(){

+		resourceType = "allottedResource";

+	}

+

+	/*

+	 * fields specific to VNF resource type

+	 */

+	private String allottedResourceType;

+	private String allottedResourceRole;

+	

+	/*

+	 * GET and SET

+	 */

+	public String getAllottedResourceType() {

+		return allottedResourceType;

+	}

+	public void setAllottedResourceType(String allottedResourceType) {

+		this.allottedResourceType = allottedResourceType;

+	}

+	public String getAllottedResourceRole() {

+		return allottedResourceRole;

+	}

+	public void setAllottedResourceRole(String allottedResourceRole) {

+		this.allottedResourceRole = allottedResourceRole;

+	}

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/HomingSolution.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/HomingSolution.java
new file mode 100644
index 0000000..f6c1ad9
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/HomingSolution.java
@@ -0,0 +1,49 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.io.Serializable;

+import java.util.List;

+

+public class HomingSolution  extends JsonWrapper implements Serializable  {

+

+	private static final long serialVersionUID = 1L;

+	

+	private String infraServiceInstanceId;

+	private String aicCloudRegionId;

+	private String ucpeId;

+	private List<String> entitlementPool;

+	private List<String> entitlementKeyGroup;

+	

+	/*

+	 * GET && SET

+	 */

+	public String getInfraServiceInstanceId() {

+		return infraServiceInstanceId;

+	}

+	public void setInfraServiceInstanceId(String infraServiceInstanceId) {

+		this.infraServiceInstanceId = infraServiceInstanceId;

+	}

+	public String getAicCloudRegionId() {

+		return aicCloudRegionId;

+	}

+	public void setAicCloudRegionId(String aicCloudRegionId) {

+		this.aicCloudRegionId = aicCloudRegionId;

+	}

+	public String getUcpeId() {

+		return ucpeId;

+	}

+	public void setUcpeId(String ucpeId) {

+		this.ucpeId = ucpeId;

+	}

+	public List<String> getEntitlementPool() {

+		return entitlementPool;

+	}

+	public void setEntitlementPool(List<String> entitlementPool) {

+		this.entitlementPool = entitlementPool;

+	}

+	public List getEntitlementKeyGroup() {

+		return entitlementKeyGroup;

+	}

+	public void setEntitlementKeyGroup(List entitlementKeyGroup) {

+		this.entitlementKeyGroup = entitlementKeyGroup;

+	}

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/InstanceData.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/InstanceData.java
new file mode 100644
index 0000000..13e9f9a
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/InstanceData.java
@@ -0,0 +1,37 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.io.Serializable;

+

+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

+

+@JsonIgnoreProperties

+public class InstanceData  extends JsonWrapper implements Serializable {

+

+	private static final long serialVersionUID = 1L;

+	

+	private String instanceId;

+	private String instanceName;

+	private HomingSolution homingSolution;

+	

+	/*

+	 * GET && SET

+	 */

+	public String getInstanceId() {

+		return instanceId;

+	}

+	public void setInstanceId(String instanceId) {

+		this.instanceId = instanceId;

+	}

+	public String getInstanceName() {

+		return instanceName;

+	}

+	public void setInstanceName(String instanceName) {

+		this.instanceName = instanceName;

+	}

+	public HomingSolution getHomingSolution() {

+		return homingSolution;

+	}

+	public void setHomingSolution(HomingSolution homingSolution) {

+		this.homingSolution = homingSolution;

+	}

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/JsonWrapper.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/JsonWrapper.java
new file mode 100644
index 0000000..dcc6852
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/JsonWrapper.java
@@ -0,0 +1,140 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.io.IOException;

+import java.util.List;

+

+import org.codehaus.jackson.JsonGenerationException;

+import org.codehaus.jackson.JsonParseException;

+import org.codehaus.jackson.map.JsonMappingException;

+import org.codehaus.jackson.map.ObjectMapper;

+import org.codehaus.jackson.map.ObjectWriter;

+import org.json.JSONException;

+import org.json.JSONObject;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonInclude.Include;

+import com.fasterxml.jackson.databind.DeserializationFeature;

+

+

+//import org.codehaus.jackson.map.SerializationConfig.Feature;

+import org.codehaus.jackson.map.DeserializationConfig.Feature;

+import org.codehaus.jackson.map.annotate.JsonSerialize;

+

+/**

+ * Wrapper encapsulates needed JSON functionality 

+ * to be extended by MSO service decomposition objects

+ * providing ways to convert to and from JSON

+ * 

+ * @author 

+ *

+ */

+@JsonInclude(Include.NON_NULL)

+public abstract class JsonWrapper {

+

+	@JsonInclude(Include.NON_NULL)

+	public String toJsonString(){

+		

+		

+

+		String jsonString = "";

+		//convert with Jackson

+		ObjectMapper mapper = new ObjectMapper();

+		mapper.enable(org.codehaus.jackson.map.SerializationConfig.Feature.WRAP_ROOT_VALUE);

+		

+		mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);

+		

+		ObjectWriter ow = mapper.writer().withDefaultPrettyPrinter();

+		try {

+			jsonString = ow.writeValueAsString(this);

+		} catch (JsonGenerationException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (JsonMappingException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (IOException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return jsonString;

+	}

+	

+	@JsonInclude(Include.NON_NULL)

+	public JSONObject toJsonObject(){

+

+        ObjectMapper mapper = new ObjectMapper();

+       // mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true);

+        //mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);

+

+        mapper.enable(org.codehaus.jackson.map.SerializationConfig.Feature.WRAP_ROOT_VALUE);

+       // mapper.enable(org.codehaus.jackson.map.DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);

+        JSONObject json = new JSONObject();

+         try {

+			json = new JSONObject(mapper.writeValueAsString(this));

+		} catch (JsonGenerationException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (JsonMappingException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (JSONException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (IOException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+         return json; 

+	}

+	

+	public String listToJson(List list) {

+        ObjectMapper mapper = new ObjectMapper();

+        mapper.enable(org.codehaus.jackson.map.SerializationConfig.Feature.WRAP_ROOT_VALUE);

+        

+		String jsonString = "";

+		try {

+			jsonString = mapper.writeValueAsString(list);

+		} catch (JsonGenerationException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (JsonMappingException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (IOException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		

+		return jsonString;

+	}

+	

+	/**

+	 * Method to construct Service Decomposition object converting

+	 * JSON structure

+	 * 

+	 * @param jsonString - input in JSON format confirming ServiceDecomposition

+	 * @return - ServiceDecomposition object

+	 */

+	public ServiceDecomposition JsonToServiceDecomposition(String jsonString) {

+        

+        ServiceDecomposition serviceDecomposition = new ServiceDecomposition();

+        ObjectMapper om = new ObjectMapper();

+        om.configure(Feature.UNWRAP_ROOT_VALUE, true);

+       

+		try {

+			serviceDecomposition = om.readValue(jsonString, ServiceDecomposition.class);

+		} catch (JsonParseException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (JsonMappingException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		} catch (IOException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		

+		return serviceDecomposition;

+	}

+	

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModelInfo.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModelInfo.java
new file mode 100644
index 0000000..ecbb076
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModelInfo.java
@@ -0,0 +1,101 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.io.Serializable;

+

+import org.codehaus.jackson.map.annotate.JsonRootName;

+

+@JsonRootName("modelInfo")

+public class ModelInfo  extends JsonWrapper implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = 1L;

+	

+	private String modelName = "";

+	private String modelUuid = "";

+	private String modelInvariantId = "";

+	private String modelVersion = "";

+	//additionally on resource level

+	private String modelCustomizationUuid = "";

+	private String modelInstanceName = "";

+	

+	//TODO - those were present in original "modelInfo" object structure. Confirm.

+	private String modelCustomizationName = "";

+	private String modelVersionId = "";

+	private String modelType = "";

+	

+	public String getModelName() {

+		return modelName;

+	}

+	public void setModelName(String modelName) {

+		this.modelName = modelName;

+	}

+	public String getModelUuid() {

+		return modelUuid;

+	}

+	public void setModelUuid(String modelUuid) {

+		this.modelUuid = modelUuid;

+	}

+	public String getModelInvariantId() {

+		return modelInvariantId;

+	}

+	public void setModelInvariantId(String modelInvariantId) {

+		this.modelInvariantId = modelInvariantId;

+	}

+	public String getModelVersion() {

+		return modelVersion;

+	}

+	public void setModelVersion(String modelVersion) {

+		this.modelVersion = modelVersion;

+	}

+	public String getModelCustomizationUuid() {

+		return modelCustomizationUuid;

+	}

+	public void setModelCustomizationUuid(String modelCustomizationUuid) {

+		this.modelCustomizationUuid = modelCustomizationUuid;

+	}

+	public String getModelInstanceName() {

+		return modelInstanceName;

+	}

+	public void setModelInstanceName(String modelInstanceName) {

+		this.modelInstanceName = modelInstanceName;

+	}

+	public String getModelCustomizationName() {

+		return modelCustomizationName;

+	}

+	public void setModelCustomizationName(String modelCustomizationName) {

+		this.modelCustomizationName = modelCustomizationName;

+	}

+	public String getModelVersionId() {

+		return modelVersionId;

+	}

+	public void setModelVersionId(String modelVersionId) {

+		this.modelVersionId = modelVersionId;

+	}

+	public String getModelType() {

+		return modelType;

+	}

+	public void setModelType(String modelType) {

+		this.modelType = modelType;

+	}

+	

+	//TODO add convenience methods

+	

+	

+	//TODO - complete this manual

+	public String toString(){

+

+		String jsonString = "";

+		

+		//can try building manually

+		jsonString = "{" +

+				"\"modelName\":\"" + getModelName() + "\"," +

+				"\"modelUuid\":\"" + getModelUuid() + "\"" +

+				"\"modelInvariantId\":\"" + getModelInvariantId() + "\"" +

+				"}";

+		

+

+		return jsonString;

+	}	

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModuleResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModuleResource.java
new file mode 100644
index 0000000..1c91f4e
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModuleResource.java
@@ -0,0 +1,60 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import org.codehaus.jackson.map.annotate.JsonRootName;

+

+@JsonRootName("vfModule")

+public class ModuleResource  extends ResourceDecomposition {

+

+	private static final long serialVersionUID = 1L;

+

+	/*

+	 * set resourceType for this object

+	 */

+	public ModuleResource(){

+		resourceType = "module";

+	}

+	

+	/*

+	 * fields specific to VF Module resource type

+	 */

+	private String vfModuleType;

+	private boolean hasVolumeGroup;

+	private boolean isBase;

+	private String vfModuleLabel;

+	private int initialCount;

+	

+	/*

+	 * GET && SET

+	 */

+	public boolean getIsBase() {

+		return isBase;

+	}

+	public void setIsBase(boolean isBase) {

+		this.isBase = isBase;

+	}

+	public String getVfModuleLabel() {

+		return vfModuleLabel;

+	}

+	public void setVfModuleLabel(String vfModuleLabel) {

+		this.vfModuleLabel = vfModuleLabel;

+	}

+	public int getInitialCount() {

+		return initialCount;

+	}

+	public void setInitialCount(int initialCount) {

+		this.initialCount = initialCount;

+	}

+	public String getVfModuleType() {

+		return vfModuleType;

+	}

+	public void setVfModuleType(String vfModuleType) {

+		this.vfModuleType = vfModuleType;

+	}

+	public boolean isHasVolumeGroup() {

+		return hasVolumeGroup;

+	}

+	public void setHasVolumeGroup(boolean hasVolumeGroup) {

+		this.hasVolumeGroup = hasVolumeGroup;

+	}

+	

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/NetworkResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/NetworkResource.java
new file mode 100644
index 0000000..16d1010
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/NetworkResource.java
@@ -0,0 +1,42 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import org.codehaus.jackson.map.annotate.JsonRootName;

+

+

+/**

+ * Encapsulates Network resource data set

+ * @author

+ *

+ */

+@JsonRootName("networkResource")

+public class NetworkResource extends ResourceDecomposition {

+

+	private static final long serialVersionUID = 1L;

+	/*

+	 * set resourceType for this object

+	 */

+	public NetworkResource(){

+		resourceType = "networkResource";

+	}

+	/*

+	 * fields specific to VNF resource type

+	 */

+	private String networkType;

+	private String networkRole;

+	

+	/*

+	 * GET and SET

+	 */

+	public String getNetworkType() {

+		return networkType;

+	}

+	public void setNetworkType(String networkType) {

+		this.networkType = networkType;

+	}

+	public String getNetworkRole() {

+		return networkRole;

+	}

+	public void setNetworkRole(String networkRole) {

+		this.networkRole = networkRole;

+	}

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ResourceDecomposition.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ResourceDecomposition.java
new file mode 100644
index 0000000..ba01c8f
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ResourceDecomposition.java
@@ -0,0 +1,70 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.io.Serializable;

+

+import org.codehaus.jackson.annotate.JsonIgnore;

+import org.codehaus.jackson.annotate.JsonIgnoreProperties;

+import org.codehaus.jackson.map.annotate.JsonRootName;

+

+/**

+ * Abstract superclass for all individual decomposition resources

+ * 

+ * @author

+ *

+ */

+//@JsonIgnoreProperties

+public abstract class ResourceDecomposition extends JsonWrapper  implements Serializable {

+

+	private static final long serialVersionUID = 1L;

+	

+	protected String resourceType; // Enum of vnf or network or allotted resource

+	private ModelInfo modelInfo;

+

+	//private List modules;

+	private InstanceData instanceData = new InstanceData();

+	

+	// GET and SET

+	public ModelInfo getModelInfo() {

+		return modelInfo;

+	}

+	public void setModelInfo(ModelInfo modelInfo) {

+		this.modelInfo = modelInfo;

+	}

+

+	public InstanceData getInstanceData() {

+		return instanceData;

+	}

+	public void setInstanceData(InstanceData instanceData) {

+		this.instanceData = instanceData;

+	}

+	public void setResourceType(String resourceType) {

+		this.resourceType = resourceType;

+	}

+

+	//Utility methods

+	@JsonIgnore

+	public ModelInfo getResourceModel() {

+		return modelInfo;

+	}

+	@JsonIgnore

+	public String getResourceInstanceId() {

+		return this.getInstanceData().getInstanceId();

+	}

+	@JsonIgnore

+	public String getResourceInstanceName() {

+		return this.getInstanceData().getInstanceName();

+	}

+//	@JsonIgnore

+//	public String getResourceHomingSolution() {

+//	}

+	

+	public void setResourceInstanceId(String newInstanceId){

+		this.getInstanceData().setInstanceId(newInstanceId);

+	}

+	public void setResourceInstanceName(String newInstanceName){

+		this.getInstanceData().setInstanceName(newInstanceName);

+	}

+//	@JsonIgnore

+//	public String setResourceHomingSolution() {

+//	}

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceDecomposition.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceDecomposition.java
new file mode 100644
index 0000000..00ba091
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceDecomposition.java
@@ -0,0 +1,159 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+

+import java.io.Serializable;

+import java.util.ArrayList;

+import java.util.List;

+import org.codehaus.jackson.annotate.JsonIgnore;

+import org.codehaus.jackson.map.annotate.JsonRootName;

+import com.fasterxml.jackson.annotation.JsonProperty;

+

+import org.json.JSONObject;

+

+

+

+/**

+ * Service Decomposition Structure

+ * This Java object contains service information:

+ * - Service model info

+ * - list of VNF resource's decompositon

+ * - list of network resource's decompositon

+ * - list of allotted resource's decompositon

+ */

+@JsonRootName(value = "serviceResources")

+//@JsonTypeInfo(include=As.WRAPPER_OBJECT, use=Id.NAME)

+public class ServiceDecomposition extends JsonWrapper implements Serializable {

+

+	private static final long serialVersionUID = 1L;

+

+	@JsonProperty("modelInfo")

+	private ModelInfo modelInfo;

+	private ServiceInstanceData serviceInstanceData;

+	@JsonProperty("vnfResource")

+	private List <VnfResource>  vnfResources;

+	@JsonProperty("networkResource")

+	private List <NetworkResource>  networkResources;

+	@JsonProperty("allottedResource")

+	private List <AllottedResource>  allottedResources;

+	

+	public ServiceDecomposition () {

+		super();

+	}

+	

+	public ServiceDecomposition (ModelInfo modelInfo, ServiceInstanceData serviceInstanceData, List <VnfResource>  vnfResources, List <NetworkResource>  networkResources, List <AllottedResource>  allottedResources ) {

+		//TODO provide constructor implementation

+//		this.modelInfo = modelInfo;

+//		this.serviceInstanceData = serviceInstanceData;

+//		this.vnfResources = vnfResources;

+//		this.networkResources = networkResources;

+//		this.allottedResources = allottedResources;

+		

+	}

+	

+	public ServiceDecomposition (String catalogRestOutput, String serviceInstanceId) {

+		//TODO provide constructor implementation

+		

+		this.modelInfo = this.JsonToServiceDecomposition(catalogRestOutput).getModelInfo();

+		this.vnfResources = this.JsonToServiceDecomposition(catalogRestOutput).getServiceVnfs();

+		this.allottedResources = this.JsonToServiceDecomposition(catalogRestOutput).getServiceAllottedResources();

+		this.networkResources = this.JsonToServiceDecomposition(catalogRestOutput).getServiceNetworks();

+		this.serviceInstanceData = new ServiceInstanceData();

+		this.serviceInstanceData.setInstanceId(serviceInstanceId);

+	}

+	public ServiceDecomposition (JSONObject catalogRestOutput, String serviceInstanceId) {

+		//TODO provide constructor implementation

+	}

+	//GET and SET

+	public ModelInfo getModelInfo() {

+		return modelInfo;

+	}

+	public void setModelInfo(ModelInfo modelInfo) {

+		this.modelInfo = modelInfo;

+	}

+	public ServiceInstanceData getServiceInstanceData() {

+		return serviceInstanceData;

+	}

+	public void setServiceInstanceData(ServiceInstanceData serviceInstanceData) {

+		this.serviceInstanceData = serviceInstanceData;

+	}

+	public List<VnfResource> getServiceVnfs() {

+		return vnfResources;

+	}

+	public void setServiceVnfs(List<VnfResource> vnfResources) {

+		this.vnfResources = vnfResources;

+	}

+	public List<NetworkResource> getServiceNetworks() {

+		return networkResources;

+	}

+	public void setServiceNetworks(List<NetworkResource> networkResources) {

+		this.networkResources = networkResources;

+	}

+	public List<AllottedResource> getServiceAllottedResources() {

+		return allottedResources;

+	}

+	public void setServiceAllottedResources(List<AllottedResource> allottedResources) {

+		this.allottedResources = allottedResources;

+	}

+	

+	// methods to add to the list

+	public void addVnfResource(VnfResource vnfResource) {

+		if (vnfResources == null){

+			vnfResources = new ArrayList<VnfResource>();

+		}

+		this.vnfResources.add(vnfResource);

+	}

+	public void addNetworkResource(NetworkResource networkResource) {

+		if (networkResources == null){

+			networkResources = new ArrayList<NetworkResource>();

+		}

+		this.networkResources.add(networkResource);

+	}

+	public void addAllottedResource(AllottedResource allottedResource) {

+		if (allottedResources == null){

+			allottedResources = new ArrayList<AllottedResource>();

+		}

+		this.allottedResources.add(allottedResource);

+	}

+	

+//	//TODO - IF NEEDED, update below methods to return one resource decomposition by (?) ID, not index - used temporarily

+//	public VnfResource getnfResource(int index) {

+//		

+////		Iterator<VnfResource> iter = vnfResources.iterator();

+////		while (iter.hasNext()) {

+////			VnfResource vnfResource = iter.next();

+////			vnfResource.getModelInfo().getModelInvariantId();

+////		}

+//		return this.vnfResources.get(index);

+//	}

+//	public NetworkResource getNetworkResource( int index) {

+//		return this.networkResources.get(index);

+//	}

+//	public AllottedResource getAllottedResource(int index) {

+//		return this.allottedResources.get(index);

+//	}

+	

+	@JsonIgnore

+	public List<ResourceDecomposition> getServiceResources(){

+		ArrayList serviceResources = new ArrayList();

+		serviceResources.addAll(this.getServiceNetworks());

+		serviceResources.addAll(this.getServiceVnfs());

+		serviceResources.addAll(this.getServiceAllottedResources());

+		return serviceResources;

+	}

+	

+	@JsonIgnore

+	public String getServiceResourcesJsonString(){

+		StringBuffer serviceResourcesJsonStringBuffer = new StringBuffer();

+		serviceResourcesJsonStringBuffer.append(listToJson((this.getServiceNetworks())));

+		serviceResourcesJsonStringBuffer.append(listToJson((this.getServiceVnfs())));

+		serviceResourcesJsonStringBuffer.append(listToJson((this.getServiceAllottedResources())));

+		return serviceResourcesJsonStringBuffer.toString();

+	}

+	

+	//return String representation of JSON

+	@Override

+	public String toString(){

+		return "string representation";

+	}

+

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceInstanceData.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceInstanceData.java
new file mode 100644
index 0000000..9b7393d
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ServiceInstanceData.java
@@ -0,0 +1,23 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.io.Serializable;

+

+public class ServiceInstanceData extends JsonWrapper implements Serializable {

+

+	private static final long serialVersionUID = 1L;

+	private String instanceId;

+	private String instanceName;

+	

+	public String getInstanceId() {

+		return instanceId;

+	}

+	public void setInstanceId(String instanceId) {

+		this.instanceId = instanceId;

+	}

+	public String getInstanceName() {

+		return instanceName;

+	}

+	public void setInstanceName(String instanceName) {

+		this.instanceName = instanceName;

+	}

+}

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/VnfResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/VnfResource.java
new file mode 100644
index 0000000..267a20e
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/VnfResource.java
@@ -0,0 +1,91 @@
+package org.openecomp.mso.bpmn.core.decomposition;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.codehaus.jackson.annotate.JsonIgnore;

+import org.codehaus.jackson.map.annotate.JsonRootName;

+

+import com.fasterxml.jackson.annotation.JsonProperty;

+

+/**

+ * Encapsulates VNF resource data set

+ * @author

+ *

+ */

+@JsonRootName("vnfResource")

+public class VnfResource extends ResourceDecomposition {

+

+	private static final long serialVersionUID = 1L;

+

+	/*

+	 * set resourceType for this object

+	 */

+	public VnfResource(){

+		resourceType = "vnfResource";

+	}

+	

+	/*

+	 * fields specific to VNF resource type

+	 */

+	@JsonProperty("vfModules")

+	private List <ModuleResource>  vfModules;

+	private String vnfType;

+

+	/*

+	 * GET and SET

+	 */

+	public List<ModuleResource> getVfModules() {

+		return vfModules;

+	}

+	public void setModules(List<ModuleResource> moduleResources) {

+		this.vfModules = moduleResources;

+	}

+	public String getVnfType() {

+		return vnfType;

+	}

+	public void setVnfType(String vnfType) {

+		this.vnfType = vnfType;

+	}

+	

+	/*

+	 * GET accessors per design requirements

+	 */

+	

+	/**

+	 * Returns a list of all VfModule objects.

+	 * Base module is first entry in the list

+	 * @return ordered list of ModuleResources objects

+	 */

+	@JsonIgnore

+	public List<ModuleResource> getAllVfModuleObjects(){

+		

+		for (int i = 0; i < vfModules.size(); i++) {

+			ModuleResource moduleResource = vfModules.get(i);

+			if (moduleResource.getIsBase()){

+				vfModules.remove(moduleResource);

+				vfModules.add(0,moduleResource);

+			}

+		}

+		return vfModules;

+	}

+	

+	/**

+	 * 

+	 * @return Returns JSON list of all VfModule structures.

+	 */

+	@JsonIgnore

+	public String getAllVfModulesJson(){

+		

+		return listToJson(vfModules);

+	}

+	

+	// methods to add to the list

+	public void addVfModule(ModuleResource moduleResource) {

+		if (vfModules == null){

+			vfModules = new ArrayList<ModuleResource>();

+		}

+		this.vfModules.add(moduleResource);

+	}

+	

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericALaCarteServiceInstance.groovy
index 2205ffd..ec414a4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericALaCarteServiceInstance.groovy
@@ -1,262 +1,262 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import static org.apache.commons.lang3.StringUtils.*;

-import groovy.xml.XmlUtil

-import groovy.json.*

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.rest.APIResponse

-

-import java.util.UUID;

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution

-import org.apache.commons.lang3.*

-import org.apache.commons.codec.binary.Base64;

-import org.springframework.web.util.UriUtils

-

-/**

- * This groovy class supports the <class>CreateServiceInstance.bpmn</class> process.

- * AlaCarte flow for 1702 ServiceInstance Create

- *

- */

-public class CreateServiceInstance extends AbstractServiceTaskProcessor {

-	String Prefix="CRESI_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils()

-

-	public void preProcessRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		String msg = ""

-		utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)

-

-		try {

-

-			String siRequest = execution.getVariable("bpmnRequest")

-			utils.logAudit(siRequest)

-

-			String requestId = execution.getVariable("mso-request-id")

-			execution.setVariable("msoRequestId", requestId)

-			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)

-

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			if (isBlank(serviceInstanceId)) {

-				serviceInstanceId = UUID.randomUUID().toString()

-			}

-			utils.log("DEBUG", "Generated new Service Instance:" + serviceInstanceId, isDebugEnabled)

-			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")

-			execution.setVariable("serviceInstanceId", serviceInstanceId)

-

-			//subscriberInfo

-			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")

-			if (isBlank(globalSubscriberId)) {

-				msg = "Input globalSubscriberId' is null"

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			} else {

-				execution.setVariable("globalSubscriberId", globalSubscriberId)

-			}

-

-			//requestInfo

-			execution.setVariable("source", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source"))

-			execution.setVariable("serviceInstanceName", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.instanceName"))

-			execution.setVariable("disableRollback", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.suppressRollback"))

-			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")

-			if (isBlank(productFamilyId))

-			{

-				msg = "Input productFamilyId is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			} else {

-				execution.setVariable("productFamilyId", productFamilyId)

-			}

-

-			//modelInfo

-			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")

-			if (isBlank(serviceModelInfo)) {

-				msg = "Input serviceModelInfo is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			} else

-			{

-				execution.setVariable("serviceModelInfo", serviceModelInfo)

-			}

-

-			utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)

-

-			//requestParameters

-			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")

-			if (isBlank(subscriptionServiceType)) {

-				msg = "Input subscriptionServiceType is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			} else {

-				execution.setVariable("subscriptionServiceType", subscriptionServiceType)

-			}

-

-			//TODO

-			//execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))

-			//execution.setVariable("failExists", true)

-

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex){

-			msg = "Exception in preProcessRequest " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

-	}

-

-	public void sendSyncResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** sendSyncResponse *** ", isDebugEnabled)

-

-		try {

-			String requestId = execution.getVariable("msoRequestId")

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			// RESTResponse for API Handler (APIH) Reply Task

-			String createServiceRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

-			utils.log("DEBUG", " sendSyncResponse to APIH:" + "\n" + createServiceRestRequest, isDebugEnabled)

-			sendWorkflowResponse(execution, 202, createServiceRestRequest)

-			execution.setVariable("sentSyncResponse", true)

-

-		} catch (Exception ex) {

-			String msg = "Exceptuion in sendSyncResponse:" + ex.getMessage()

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)

-	}

-

-

-	public void sendSyncError (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)

-

-		try {

-			String errorMessage = ""

-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

-				WorkflowException wfe = execution.getVariable("WorkflowException")

-				errorMessage = wfe.getErrorMessage()

-			} else {

-				errorMessage = "Sending Sync Error."

-			}

-

-			String buildworkflowException =

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import static org.apache.commons.lang3.StringUtils.*;
+import groovy.xml.XmlUtil
+import groovy.json.*
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.rest.APIResponse
+
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils
+
+/**
+ * This groovy class supports the <class>CreateServiceInstance.bpmn</class> process.
+ * AlaCarte flow for 1702 ServiceInstance Create
+ *
+ */
+public class CreateGenericALaCarteServiceInstance extends AbstractServiceTaskProcessor {
+	String Prefix="CRESI_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils()
+
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		String msg = ""
+		utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)
+
+		try {
+
+			String siRequest = execution.getVariable("bpmnRequest")
+			utils.logAudit(siRequest)
+
+			String requestId = execution.getVariable("mso-request-id")
+			execution.setVariable("msoRequestId", requestId)
+			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
+
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			if (isBlank(serviceInstanceId)) {
+				serviceInstanceId = UUID.randomUUID().toString()
+			}
+			utils.log("DEBUG", "Generated new Service Instance:" + serviceInstanceId, isDebugEnabled)
+			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")
+			execution.setVariable("serviceInstanceId", serviceInstanceId)
+
+			//subscriberInfo
+			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")
+			if (isBlank(globalSubscriberId)) {
+				msg = "Input globalSubscriberId' is null"
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			} else {
+				execution.setVariable("globalSubscriberId", globalSubscriberId)
+			}
+
+			//requestInfo
+			execution.setVariable("source", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source"))
+			execution.setVariable("serviceInstanceName", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.instanceName"))
+			execution.setVariable("disableRollback", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.suppressRollback"))
+			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")
+			if (isBlank(productFamilyId))
+			{
+				msg = "Input productFamilyId is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			} else {
+				execution.setVariable("productFamilyId", productFamilyId)
+			}
+
+			//modelInfo
+			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")
+			if (isBlank(serviceModelInfo)) {
+				msg = "Input serviceModelInfo is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			} else
+			{
+				execution.setVariable("serviceModelInfo", serviceModelInfo)
+			}
+
+			utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)
+
+			//requestParameters
+			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")
+			if (isBlank(subscriptionServiceType)) {
+				msg = "Input subscriptionServiceType is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			} else {
+				execution.setVariable("subscriptionServiceType", subscriptionServiceType)
+			}
+
+			//TODO
+			//execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))
+			//execution.setVariable("failExists", true)
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in preProcessRequest " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+	}
+
+	public void sendSyncResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** sendSyncResponse *** ", isDebugEnabled)
+
+		try {
+			String requestId = execution.getVariable("msoRequestId")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			// RESTResponse for API Handler (APIH) Reply Task
+			String createServiceRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+			utils.log("DEBUG", " sendSyncResponse to APIH:" + "\n" + createServiceRestRequest, isDebugEnabled)
+			sendWorkflowResponse(execution, 202, createServiceRestRequest)
+			execution.setVariable("sentSyncResponse", true)
+
+		} catch (Exception ex) {
+			String msg = "Exceptuion in sendSyncResponse:" + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
+	}
+
+
+	public void sendSyncError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)
+
+		try {
+			String errorMessage = ""
+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
+				WorkflowException wfe = execution.getVariable("WorkflowException")
+				errorMessage = wfe.getErrorMessage()
+			} else {
+				errorMessage = "Sending Sync Error."
+			}
+
+			String buildworkflowException =
 					"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

-				   </aetgt:WorkflowException>"""

-

-			utils.logAudit(buildworkflowException)

-			sendWorkflowResponse(execution, 500, buildworkflowException)

-

-		} catch (Exception ex) {

-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

-		}

-

-	}

-

-	public void prepareCompletionRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)

-

-		try {

-			String requestId = execution.getVariable("msoRequestId")

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			String source = execution.getVariable("source")

-			

-			String msoCompletionRequest =

+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
+				   </aetgt:WorkflowException>"""
+
+			utils.logAudit(buildworkflowException)
+			sendWorkflowResponse(execution, 500, buildworkflowException)
+
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
+		}
+
+	}
+
+	public void prepareCompletionRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)
+
+		try {
+			String requestId = execution.getVariable("msoRequestId")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String source = execution.getVariable("source")
+			
+			String msoCompletionRequest =
 					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

 								xmlns:ns="http://org.openecomp/mso/request/types/v1">

 						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-							<request-id>${requestId}</request-id>

-							<action>CREATE</action>

-							<source>${source}</source>

-			   			</request-info>

-						<status-message>Service Instance was created successfully.</status-message>

-						<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

-			   			<mso-bpel-name>CreateServiceInstance</mso-bpel-name>

-					</aetgt:MsoCompletionRequest>"""

-

-			// Format Response

-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

-

-			execution.setVariable("completionRequest", xmlMsoCompletionRequest)

-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

-

-		} catch (Exception ex) {

-			String msg = " Exception in prepareCompletion:" + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)

-	}

-

-	public void prepareFalloutRequest(Execution execution){

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)

-

-		try {

-			WorkflowException wfex = execution.getVariable("WorkflowException")

-			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)

-			String requestId = execution.getVariable("msoRequestId")

-			String source = execution.getVariable("source")

-			String requestInfo =

+							<request-id>${requestId}</request-id>
+							<action>CREATE</action>
+							<source>${source}</source>
+			   			</request-info>
+						<status-message>Service Instance was created successfully.</status-message>
+						<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
+			   			<mso-bpel-name>CreateGenericALaCarteServiceInstance</mso-bpel-name>
+					</aetgt:MsoCompletionRequest>"""
+
+			// Format Response
+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
+
+			execution.setVariable("completionRequest", xmlMsoCompletionRequest)
+			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+
+		} catch (Exception ex) {
+			String msg = " Exception in prepareCompletion:" + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
+	}
+
+	public void prepareFalloutRequest(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)
+
+		try {
+			WorkflowException wfex = execution.getVariable("WorkflowException")
+			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
+			String requestId = execution.getVariable("msoRequestId")
+			String source = execution.getVariable("source")
+			String requestInfo =
 					"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					<request-id>${requestId}</request-id>

-					<action>CREATE</action>

-					<source>${source}</source>

-				   </request-info>"""

-

-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

-			execution.setVariable("falloutRequest", falloutRequest)

-		} catch (Exception ex) {

-			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)

-			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()

-			String requestId = execution.getVariable("msoRequestId")

-			String falloutRequest =

+					<request-id>${requestId}</request-id>
+					<action>CREATE</action>
+					<source>${source}</source>
+				   </request-info>"""
+
+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
+			execution.setVariable("falloutRequest", falloutRequest)
+		} catch (Exception ex) {
+			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
+			String errorException = "  Bpmn error encountered in CreateGenericALaCarteServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
+			String requestId = execution.getVariable("msoRequestId")
+			String falloutRequest =
 					"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

 					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

 					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

 					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>${requestId}</request-id>

-					      <action>CREATE</action>

-					      <source>VID</source>

-					   </request-info>

+					      <request-id>${requestId}</request-id>
+					      <action>CREATE</action>
+					      <source>VID</source>
+					   </request-info>
 						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>

-							<aetgt:ErrorCode>7000</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-					</aetgt:FalloutHandlerRequest>"""

-

-			execution.setVariable("falloutRequest", falloutRequest)

-		}

-		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)

-	}

+							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+					</aetgt:FalloutHandlerRequest>"""
+
+			execution.setVariable("falloutRequest", falloutRequest)
+		}
+		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy
index 88e2396..79508cb 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericMacroServiceNetworkVnf.groovy
@@ -1,752 +1,804 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import groovy.xml.XmlUtil

-import groovy.json.*

-

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse;

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

-

-import java.util.UUID;

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution

-import org.json.JSONObject;

-import org.json.JSONArray;

-import org.apache.commons.lang3.*

-import org.apache.commons.codec.binary.Base64;

-import org.springframework.web.util.UriUtils;

-

-/**

- * This groovy class supports the <class>CreateGenericMacroServiceNetworkVnf.bpmn</class> process.

- *

- */

-public class CreateGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {

-

-	String Prefix="CREVAS_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils()

-	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()

-

-	/**

-	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.

-	 * @param execution

-	 */

-	public InitializeProcessVariables(Execution execution){

-		/* Initialize all the process variables in this block */

-

-		execution.setVariable("createGenericMacroServiceNetworkVnfRequest", "")

-		execution.setVariable("globalSubscriberId", "")

-		execution.setVariable("serviceInstanceName", "")

-		execution.setVariable("msoRequestId", "")

-		execution.setVariable("CREVAS_NetworksCreatedCount", 0)

-		execution.setVariable("CREVAS_VnfsCreatedCount", 0)

-		execution.setVariable("productFamilyId", "")

-		

-		

-		//TODO

-		execution.setVariable("sdncVersion", "1702")

-	}

-

-	// **************************************************

-	//     Pre or Prepare Request Section

-	// **************************************************

-	/**

-	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.

-	 * @param execution

-	 */

-	public void preProcessRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-

-		utils.log("DEBUG", " ***** Inside preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)

-

-		try {

-			// initialize flow variables

-			InitializeProcessVariables(execution)

-

-			// check for incoming json message/input

-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("bpmnRequest")

-			utils.logAudit(createGenericMacroServiceNetworkVnfRequest)

-			execution.setVariable("createGenericMacroServiceNetworkVnfRequest", createGenericMacroServiceNetworkVnfRequest);

-			println 'createGenericMacroServiceNetworkVnfRequest - ' + createGenericMacroServiceNetworkVnfRequest

-

-			// extract requestId

-			String requestId = execution.getVariable("mso-request-id")

-			execution.setVariable("msoRequestId", requestId)

-

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-

-			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {

-				serviceInstanceId = UUID.randomUUID().toString()

-				utils.log("DEBUG", " Generated new Service Instance: " + serviceInstanceId , isDebugEnabled)

-			} else {

-				utils.log("DEBUG", "Using provided Service Instance ID: " + serviceInstanceId , isDebugEnabled)

-			}

-

-			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")

-			execution.setVariable("serviceInstanceId", serviceInstanceId)

-			

-			String requestAction = execution.getVariable("requestAction")

-			execution.setVariable("requestAction", requestAction)

-

-			String source = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.source")

-			if ((source == null) || (source.isEmpty())) {

-				execution.setVariable("source", "VID")

-			} else {

-				execution.setVariable("source", source)

-			}

-

-			// extract globalSubscriberId

-			String globalSubscriberId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.subscriberInfo.globalSubscriberId")

-

-			// verify element global-customer-id is sent from JSON input, throw exception if missing

-			if ((globalSubscriberId == null) || (globalSubscriberId.isEmpty())) {

-				String dataErrorMessage = " Element 'globalSubscriberId' is missing. "

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-

-			} else {

-				execution.setVariable("globalSubscriberId", globalSubscriberId)

-				execution.setVariable("globalCustomerId", globalSubscriberId)

-			}

-			

-			// extract subscriptionServiceType

-			String subscriptionServiceType = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestParameters.subscriptionServiceType")

-			execution.setVariable("subscriptionServiceType", subscriptionServiceType)

-			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)

-

-			String suppressRollback = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.suppressRollback")

-			execution.setVariable("disableRollback", suppressRollback)

-			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)

-			

-			String productFamilyId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.productFamilyId")

-			execution.setVariable("productFamilyId", productFamilyId)

-			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)

-			

-			//For Completion Handler & Fallout Handler

-			String requestInfo =

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import groovy.xml.XmlUtil
+import groovy.json.*
+
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.decomposition.ModelInfo
+import org.openecomp.mso.bpmn.core.decomposition.NetworkResource
+import org.openecomp.mso.bpmn.core.decomposition.ServiceDecomposition
+import org.openecomp.mso.bpmn.core.decomposition.VnfResource
+import org.openecomp.mso.rest.APIResponse;
+import org.openecomp.mso.rest.RESTClient
+import org.openecomp.mso.rest.RESTConfig
+
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.json.JSONObject;
+import org.json.JSONArray;
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils;
+
+/**
+ * This groovy class supports the <class>CreateGenericMacroServiceNetworkVnf.bpmn</class> process.
+ *
+ */
+public class CreateGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {
+
+	String Prefix="CGMSNV_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils()
+	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()
+
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.
+	 * @param execution
+	 */
+	public InitializeProcessVariables(Execution execution){
+		/* Initialize all the process variables in this block */
+
+		execution.setVariable("createViprServiceRequest", "")
+		execution.setVariable("globalSubscriberId", "")
+		execution.setVariable("serviceInstanceName", "")
+		execution.setVariable("msoRequestId", "")
+		execution.setVariable("CGMSNV_NetworksCreatedCount", 0)
+		execution.setVariable("CGMSNV_VnfsCreatedCount", 0)
+		execution.setVariable("productFamilyId", "")
+
+		//TODO
+		execution.setVariable("sdncVersion", "1707")
+	}
+
+	// **************************************************
+	//     Pre or Prepare Request Section
+	// **************************************************
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.
+	 * @param execution
+	 */
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)
+
+		try {
+			// initialize flow variables
+			InitializeProcessVariables(execution)
+
+			// check for incoming json message/input
+			String createViprServiceRequest = execution.getVariable("bpmnRequest")
+			utils.logAudit(createViprServiceRequest)
+			execution.setVariable("createViprServiceRequest", createViprServiceRequest);
+			println 'createViprServiceRequest - ' + createViprServiceRequest
+
+			// extract requestId
+			String requestId = execution.getVariable("mso-request-id")
+			execution.setVariable("msoRequestId", requestId)
+
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {
+				serviceInstanceId = UUID.randomUUID().toString()
+				utils.log("DEBUG", " Generated new Service Instance: " + serviceInstanceId , isDebugEnabled)
+			} else {
+				utils.log("DEBUG", "Using provided Service Instance ID: " + serviceInstanceId , isDebugEnabled)
+			}
+
+			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")
+			execution.setVariable("serviceInstanceId", serviceInstanceId)
+
+			String requestAction = execution.getVariable("requestAction")
+			execution.setVariable("requestAction", requestAction)
+
+			String source = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.requestInfo.source")
+			if ((source == null) || (source.isEmpty())) {
+				execution.setVariable("source", "VID")
+			} else {
+				execution.setVariable("source", source)
+			}
+
+			// extract globalSubscriberId
+			String globalSubscriberId = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.subscriberInfo.globalSubscriberId")
+
+			// verify element global-customer-id is sent from JSON input, throw exception if missing
+			if ((globalSubscriberId == null) || (globalSubscriberId.isEmpty())) {
+				String dataErrorMessage = " Element 'globalSubscriberId' is missing. "
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+			} else {
+				execution.setVariable("globalSubscriberId", globalSubscriberId)
+				execution.setVariable("globalCustomerId", globalSubscriberId)
+			}
+
+			// extract subscriptionServiceType
+			String subscriptionServiceType = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.requestParameters.subscriptionServiceType")
+			execution.setVariable("subscriptionServiceType", subscriptionServiceType)
+			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)
+
+			String suppressRollback = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.requestInfo.suppressRollback")
+			execution.setVariable("disableRollback", suppressRollback)
+			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)
+
+			String productFamilyId = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.requestInfo.productFamilyId")
+			execution.setVariable("productFamilyId", productFamilyId)
+			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)
+
+			//For Completion Handler & Fallout Handler
+			String requestInfo =
 			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					<request-id>${requestId}</request-id>

-					<action>CREATE</action>

-					<source>${source}</source>

-				   </request-info>"""

-

-			execution.setVariable("CREVAS_requestInfo", requestInfo)

-			

-			utils.log("DEBUG", " ***** Completed preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)

-

-		} catch (BpmnError e) {

-			throw e;

-

-		} catch (Exception ex){

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method preProcessRequest() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-

-	public void sendSyncResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		utils.log("DEBUG", " ***** Inside sendSyncResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-		try {

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			String requestId = execution.getVariable("mso-request-id")

-

-			// RESTResponse (for API Handler (APIH) Reply Task)

-			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

-

-			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)

-			sendWorkflowResponse(execution, 202, syncResponse)

-

-		} catch (Exception ex) {

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-

-	// *******************************

-	//     

-	// *******************************

-	public void prepareCreateServiceInstance(Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")

-			String serviceModelInfo = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo")

-			execution.setVariable("serviceModelInfo", serviceModelInfo)

-

-			String serviceInputParams = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestParameters")

-			execution.setVariable("serviceInputParams", serviceInputParams)

-			

-			String serviceInstanceName = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.instanceName")

-			execution.setVariable("serviceInstanceName", serviceInstanceName)

-

-			utils.log("DEBUG", " ***** Completed prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareCreateService() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-	

-	

-	public void postProcessServiceInstanceCreate (Execution execution){

-		def method = getClass().getSimpleName() + '.postProcessServiceInstanceCreate(' +'execution=' + execution.getId() +')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-		

-		String source = execution.getVariable("source")

-		String requestId = execution.getVariable("mso-request-id")

-		String serviceInstanceId = execution.getVariable("serviceInstanceId")

-		String serviceInstanceName = execution.getVariable("serviceInstanceName")

-		

-		try {

-

-			String payload = """

+					<request-id>${requestId}</request-id>
+					<action>CREATE</action>
+					<source>${source}</source>
+				   </request-info>"""
+
+			execution.setVariable("CGMSNV_requestInfo", requestInfo)
+
+			utils.log("DEBUG", " ***** Completed preProcessRequest CreateGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)
+
+		} catch (BpmnError e) {
+			throw e;
+
+		} catch (Exception ex){
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method preProcessRequest() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+
+	public void sendSyncResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		utils.log("DEBUG", " ***** Inside sendSyncResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+		try {
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String requestId = execution.getVariable("mso-request-id")
+
+			// RESTResponse (for API Handler (APIH) Reply Task)
+			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+
+			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
+			sendWorkflowResponse(execution, 202, syncResponse)
+
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+
+	// *******************************
+	//
+	// *******************************
+	public void prepareDecomposeService(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareDecomposeService of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			String createViprServiceRequest = execution.getVariable("createViprServiceRequest")
+			String serviceModelInfo = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.modelInfo")
+			execution.setVariable("serviceModelInfo", serviceModelInfo)
+
+			utils.log("DEBUG", " ***** Completed prepareDecomposeService of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareDecomposeService() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+	// *******************************
+	//
+	// *******************************
+	public void prepareCreateServiceInstance(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			/*
+			 * Service modelInfo is created in earlier step. This flow can use it as-is ... or, extract from DecompositionObject
+			 *		ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+			 *		ModelInfo modelInfo = serviceDecomposition.getModelInfo()
+			 *
+			 */
+			String createViprServiceRequest = execution.getVariable("createViprServiceRequest")
+			String serviceInputParams = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.requestParameters")
+			execution.setVariable("serviceInputParams", serviceInputParams)
+
+			String serviceInstanceName = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.requestInfo.instanceName")
+			execution.setVariable("serviceInstanceName", serviceInstanceName)
+
+			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+			execution.setVariable("serviceDecompositionString", serviceDecomposition.toJsonString())
+
+			utils.log("DEBUG", " ***** Completed prepareCreateServiceInstance of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareCreateServiceInstance() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+	public void postProcessServiceInstanceCreate (Execution execution){
+		def method = getClass().getSimpleName() + '.postProcessServiceInstanceCreate(' +'execution=' + execution.getId() +')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		String source = execution.getVariable("source")
+		String requestId = execution.getVariable("mso-request-id")
+		String serviceInstanceId = execution.getVariable("serviceInstanceId")
+		String serviceInstanceName = execution.getVariable("serviceInstanceName")
+
+		try {
+
+			String payload = """
 			<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">

-			<soapenv:Header/>

-			<soapenv:Body>

-			<req:updateInfraRequest>

-				<requestId>${requestId}</requestId>

-				<lastModifiedBy>BPEL</lastModifiedBy>

-				<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

-				<serviceInstanceName>${serviceInstanceName}</serviceInstanceName>

-			</req:updateInfraRequest>

-			</soapenv:Body>

-			</soapenv:Envelope>

-			"""

-			execution.setVariable("CREVAS_setUpdateDbInstancePayload", payload)

-			utils.logAudit("CREVAS_setUpdateDbInstancePayload: " + payload)

-			logDebug('Exited ' + method, isDebugLogEnabled)

-			//println("CMSO_updateDBStatusToSuccessPayload --> " + execution.getVariable("CMSO_updateDBStatusToSuccessPayload"))

-

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)

-		}

-	}

-	

-	

-	public void callDBCatalog (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		utils.log("DEBUG", " ***** Inside callDBCatalog() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-		

-		try {

-			

-			// get variable within incoming json

-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest");

-			

-			String catalog_db_endpoint = execution.getVariable("URN_mso_catalog_db_endpoint")

-			utils.log("DEBUG", "catalog_db_endpoint: "+catalog_db_endpoint, isDebugEnabled)

-			

-			String serviceModelInvariantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo.modelInvariantId")

-			String serviceModelVersion = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.modelInfo.modelVersion")

-			utils.log("DEBUG", "getting network list ", isDebugEnabled)

-			

-			JSONArray networkList = catalogDbUtils.getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(catalog_db_endpoint, serviceModelInvariantId, serviceModelVersion)

-

-			//utils.log("DEBUG", "got network list: "+ networkList.toString(), isDebugEnabled)

-			execution.setVariable("networkList", networkList)

-			execution.setVariable("networkListString", networkList.toString())

-			

-			networkList = execution.getVariable("networkList");

-			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)

-

-			if (networkList != null && networkList.length() > 0) {

-

-				execution.setVariable("CREVAS_NetworksCount", networkList.length())

-				utils.log("DEBUG", "networks to create: "+ networkList.length(), isDebugEnabled)

-			} else {

-				execution.setVariable("CREVAS_NetworksCount", 0)

-				utils.log("DEBUG", "no networks to create based upon Catalog DB response", isDebugEnabled)

-			}	

-			

-			// VNFs

-			JSONArray vnfList = catalogDbUtils.getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(catalog_db_endpoint, serviceModelInvariantId, serviceModelVersion)

-			execution.setVariable("vnfList", vnfList)			

-			

-			String vnfModelInfoString = ""

-			if (vnfList != null && vnfList.length() > 0) {

-				execution.setVariable("CREVAS_VNFsCount", vnfList.length())

-				utils.log("DEBUG", "vnfs to create: "+ vnfList.length(), isDebugEnabled)

-				JSONObject vnfModelInfo = vnfList.getJSONObject(0).getJSONObject("modelInfo")

-				vnfModelInfoString = vnfModelInfo.toString()

-			} else {

-					execution.setVariable("CREVAS_VNFsCount", 0)

-					utils.log("DEBUG", "no vnfs to create based upon Catalog DB response", isDebugEnabled)

-			}

-				

-			execution.setVariable("vnfModelInfo", vnfModelInfoString)

-			//utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)

-

-			utils.log("DEBUG", " ***** Completed callDBCatalog() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			sendSyncError(execution)

-		   String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. callDBCatalog() - " + ex.getMessage()

-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-	

-	// *******************************

-	//     Generate Network request Section

-	// *******************************

-	public void prepareNetworkCreate (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-//			String disableRollback = execution.getVariable("disableRollback")

-//			def backoutOnFailure = ""

-//			if(disableRollback != null){

-//				if ( disableRollback == true) {

-//					backoutOnFailure = "false"

-//				} else if ( disableRollback == false) {

-//					backoutOnFailure = "true"

-//				}

-//			}

-			//failIfExists - optional

-

-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")

-			

-			JSONArray networkList = execution.getVariable("networkList")

-			utils.log("DEBUG", "array networkList: "+ networkList, isDebugEnabled)

-			

-			if (networkList == null || networkList.length() < 1){

-				networkList = new JSONArray(execution.getVariable("networkListString"))

-				utils.log("DEBUG", "array from string networkList: "+ networkList, isDebugEnabled)

-			}

-			

-			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")

-			String networkModelInfoString = ""

-			

-			if (networkList != null) {

-				utils.log("DEBUG", " getting model info for network # :" + networksCreatedCount, isDebugEnabled)

-				JSONObject networkModelInfo = networkList.getJSONObject(networksCreatedCount.intValue()).getJSONObject("modelInfo")

-				networkModelInfoString = networkModelInfo.toString()

-			} else {

-				String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected number of networks to create - " + ex.getMessage()

-				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-			}

-			

-			execution.setVariable("networkModelInfo", networkModelInfoString)

-			utils.log("DEBUG", " networkModelInfoString :" + networkModelInfoString, isDebugEnabled)

-			

-//			String networkModelInfo = execution.getVariable("networkModelInfo")

-			// extract cloud configuration

-			String lcpCloudRegionId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")

-			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)

-			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)

-			String tenantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.tenantId")

-			execution.setVariable("tenantId", tenantId)

-			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)

-			

-			String sdncVersion = execution.getVariable("sdncVersion")

-			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)

-			

-			JSONArray vnfList = execution.getVariable("vnfList")

-			utils.log("DEBUG", "vnfList: "+ vnfList, isDebugEnabled)

-			

-			String vnfModelInfo = execution.getVariable("vnfModelInfo")

-			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)

-			

-			networkList = execution.getVariable("networkList")

-			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)

-			

-			utils.log("DEBUG", " ***** Completed preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareNetworkCreate() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-	

-	// *******************************

-	//     Validate Network request Section -> increment count

-	// *******************************

-	public void validateNetworkCreate (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")

-			networksCreatedCount++

-			

-			execution.setVariable("CREVAS_NetworksCreatedCount", networksCreatedCount)

-			

-			execution.setVariable("DCRENI_rollbackData"+networksCreatedCount, execution.getVariable("DCRENI_rollbackData"))

-

-			utils.log("DEBUG", "networksCreatedCount: "+ networksCreatedCount, isDebugEnabled)

-			utils.log("DEBUG", "DCRENI_rollbackData N : "+ execution.getVariable("DCRENI_rollbackData"+networksCreatedCount), isDebugEnabled)

-			

-			JSONArray vnfList = execution.getVariable("vnfList")

-			utils.log("DEBUG", "vnfList: "+ vnfList, isDebugEnabled)

-			

-			String vnfModelInfo = execution.getVariable("vnfModelInfo")

-			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)

-			

-			JSONArray networkList = execution.getVariable("networkList")

-			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)

-			

-			utils.log("DEBUG", " ***** Completed validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkCreate() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-	

-	// *******************************

-	//     Generate Network request Section

-	// *******************************

-	public void prepareVnfAndModulesCreate (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-			//			String disableRollback = execution.getVariable("disableRollback")

-			//			def backoutOnFailure = ""

-			//			if(disableRollback != null){

-			//				if ( disableRollback == true) {

-			//					backoutOnFailure = "false"

-			//				} else if ( disableRollback == false) {

-			//					backoutOnFailure = "true"

-			//				}

-			//			}

-						//failIfExists - optional

-

-			String createGenericMacroServiceNetworkVnfRequest = execution.getVariable("createGenericMacroServiceNetworkVnfRequest")

-			String productFamilyId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.productFamilyId")

-			execution.setVariable("productFamilyId", productFamilyId)

-			utils.log("DEBUG","productFamilyId: "+ productFamilyId, isDebugEnabled)

-

-			JSONArray vnfList = execution.getVariable("vnfList")

-

-			Integer vnfsCreatedCount = execution.getVariable("CREVAS_VnfsCreatedCount")

-			String vnfModelInfoString = null;

-			

-			if (vnfList != null && vnfList.length() > 0 ) {

-				utils.log("DEBUG", "getting model info for vnf # " + vnfsCreatedCount, isDebugEnabled)

-				JSONObject vnfModelInfo1 = vnfList.getJSONObject(0).getJSONObject("modelInfo")

-				utils.log("DEBUG", "got 0 ", isDebugEnabled)

-				JSONObject vnfModelInfo = vnfList.getJSONObject(vnfsCreatedCount.intValue()).getJSONObject("modelInfo")

-				vnfModelInfoString = vnfModelInfo.toString()

-			} else {

-				//TODO: vnfList does not contain data. Need to investigate why ... . Fro VIPR use model stored

-				vnfModelInfoString = execution.getVariable("vnfModelInfo")

-			}

-							

-			utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)

-			

-			// extract cloud configuration

-			String lcpCloudRegionId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")

-			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)

-			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)

-			String tenantId = jsonUtil.getJsonValue(createGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.tenantId")

-			execution.setVariable("tenantId", tenantId)

-			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)

-						

-			String sdncVersion = execution.getVariable("sdncVersion")

-			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)

-

-			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareVnfAndModulesCreate() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-

-	// *******************************

-	//     Validate Vnf request Section -> increment count

-	// *******************************

-	public void validateVnfCreate (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-			Integer vnfsCreatedCount = execution.getVariable("CREVAS_VnfsCreatedCount")

-			vnfsCreatedCount++

-			

-			execution.setVariable("CREVAS_VnfsCreatedCount", vnfsCreatedCount)

-			

-			utils.log("DEBUG", " ***** Completed validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** "+" vnf # "+vnfsCreatedCount, isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateVnfCreate() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-	

-	// *******************************

-	//     Validate Network request Section -> decrement count

-	// *******************************

-	public void validateNetworkRollback (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-			Integer networksCreatedCount = execution.getVariable("CREVAS_NetworksCreatedCount")

-			networksCreatedCount--

-			

-			execution.setVariable("CREVAS_NetworksCreatedCount", networksCreatedCount)

-			

-			execution.setVariable("DCRENI_rollbackData", execution.getVariable("DCRENI_rollbackData"+networksCreatedCount))

-			

-			utils.log("DEBUG", " ***** Completed validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkRollback() - " + ex.getMessage()

-			//exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			execution.setVariable("CREVAS_NetworksCreatedCount", 0)

-			utils.log("ERROR", exceptionMessage, true)

-		}

-	 }

-	// *******************************

-	//     Build DB request Section

-	// *******************************

-//	public void prepareDBRequest (Execution execution) {

-//		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-//

-//		try {

-//			utils.log("DEBUG", " ***** Inside prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-//

-//			String requestId = execution.getVariable("CREVAS_requestId")

-//			String statusMessage = "vIPR ATM Service Instance successfully created."

-//			String serviceInstanceId = execution.getVariable("CREVAS_serviceInstanceId")

-//

-//			//TODO - verify the format for Service Instance Create,

-//			String dbRequest =

-//					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

-//						<soapenv:Header/>

-//						<soapenv:Body>

+			<soapenv:Header/>
+			<soapenv:Body>
+			<req:updateInfraRequest>
+				<requestId>${requestId}</requestId>
+				<lastModifiedBy>BPEL</lastModifiedBy>
+				<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
+				<serviceInstanceName>${serviceInstanceName}</serviceInstanceName>
+			</req:updateInfraRequest>
+			</soapenv:Body>
+			</soapenv:Envelope>
+			"""
+			execution.setVariable("CGMSNV_setUpdateDbInstancePayload", payload)
+			utils.logAudit("CGMSNV_setUpdateDbInstancePayload: " + payload)
+			logDebug('Exited ' + method, isDebugLogEnabled)
+			//println("CMSO_updateDBStatusToSuccessPayload --> " + execution.getVariable("CMSO_updateDBStatusToSuccessPayload"))
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
+		}
+	}
+
+
+	public void getDataFromDecomposition (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		utils.log("DEBUG", " ***** Inside getDataFromDecomposition() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+		try {
+
+			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+
+			List<NetworkResource> networkList = serviceDecomposition.getServiceNetworks()
+
+			//utils.log("DEBUG", "got network list: "+ networkList.toString(), isDebugEnabled)
+			execution.setVariable("networkList", networkList)
+			execution.setVariable("networkListString", networkList.toString())
+
+			networkList = execution.getVariable("networkList");
+			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)
+
+			if (networkList != null && networkList.size() > 0) {
+
+				execution.setVariable("CGMSNV_NetworksCount", networkList.size())
+				utils.log("DEBUG", "networks to create: "+ networkList.size(), isDebugEnabled)
+			} else {
+				execution.setVariable("CGMSNV_NetworksCount", 0)
+				utils.log("DEBUG", "no networks to create based upon serviceDecomposition content", isDebugEnabled)
+			}
+
+			// VNFs
+			List<VnfResource> vnfList = serviceDecomposition.getServiceVnfs()
+			execution.setVariable("vnfList", vnfList)
+
+			String vnfModelInfoString = ""
+			if (vnfList != null && vnfList.size() > 0) {
+				execution.setVariable("CGMSNV_VNFsCount", vnfList.size())
+				utils.log("DEBUG", "vnfs to create: "+ vnfList.size(), isDebugEnabled)
+				ModelInfo vnfModelInfo = vnfList[0].getModelInfo()
+				String vnfModelInfoWithRoot = vnfModelInfo.toString()
+				vnfModelInfoString = jsonUtil.getJsonValue(vnfModelInfoWithRoot, "modelInfo")
+			} else {
+					execution.setVariable("CGMSNV_VNFsCount", 0)
+					utils.log("DEBUG", "no vnfs to create based upon Catalog DB response", isDebugEnabled)
+			}
+
+			execution.setVariable("vnfModelInfo", vnfModelInfoString)
+			//utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
+
+			utils.log("DEBUG", " ***** Completed getDataFromDecomposition() of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			sendSyncError(execution)
+		   String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. getDataFromDecomposition() - " + ex.getMessage()
+		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+
+	// *******************************
+	//     Generate Network request Section
+	// *******************************
+	public void prepareNetworkCreate (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+//			String disableRollback = execution.getVariable("disableRollback")
+//			def backoutOnFailure = ""
+//			if(disableRollback != null){
+//				if ( disableRollback == true) {
+//					backoutOnFailure = "false"
+//				} else if ( disableRollback == false) {
+//					backoutOnFailure = "true"
+//				}
+//			}
+			//failIfExists - optional
+
+			String createViprServiceRequest = execution.getVariable("createViprServiceRequest")
+
+			JSONArray networkList = execution.getVariable("networkList")
+			utils.log("DEBUG", "array networkList: "+ networkList, isDebugEnabled)
+
+			if (networkList == null || networkList.size() < 1){
+				networkList = new JSONArray(execution.getVariable("networkListString"))
+				utils.log("DEBUG", "array from string networkList: "+ networkList, isDebugEnabled)
+			}
+
+			Integer networksCreatedCount = execution.getVariable("CGMSNV_NetworksCreatedCount")
+			String networkModelInfoString = ""
+
+			if (networkList != null) {
+				utils.log("DEBUG", " getting model info for network # :" + networksCreatedCount, isDebugEnabled)
+				ModelInfo networkModelInfo = networkList[networksCreatedCount.intValue()].getModelInfo()
+				networkModelInfoString = networkModelInfo.toString()
+			} else {
+				String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected number of networks to create - " + ex.getMessage()
+				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+			}
+
+			execution.setVariable("networkModelInfo", networkModelInfoString)
+			utils.log("DEBUG", " networkModelInfoString :" + networkModelInfoString, isDebugEnabled)
+
+//			String networkModelInfo = execution.getVariable("networkModelInfo")
+			// extract cloud configuration
+			String lcpCloudRegionId = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
+			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
+			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
+			String tenantId = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.cloudConfiguration.tenantId")
+			execution.setVariable("tenantId", tenantId)
+			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)
+
+			String sdncVersion = execution.getVariable("sdncVersion")
+			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)
+
+			List<VnfResource> vnfList = execution.getVariable("vnfList")
+			utils.log("DEBUG", "vnfList: "+ vnfList.toString(), isDebugEnabled)
+
+			String vnfModelInfo = execution.getVariable("vnfModelInfo")
+			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)
+
+			networkList = execution.getVariable("networkList")
+			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)
+
+			utils.log("DEBUG", " ***** Completed preparenNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareNetworkCreate() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+	// *******************************
+	//     Validate Network request Section -> increment count
+	// *******************************
+	public void validateNetworkCreate (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			Integer networksCreatedCount = execution.getVariable("CGMSNV_NetworksCreatedCount")
+			networksCreatedCount++
+
+			execution.setVariable("CGMSNV_NetworksCreatedCount", networksCreatedCount)
+
+			execution.setVariable("DCRENI_rollbackData"+networksCreatedCount, execution.getVariable("DCRENI_rollbackData"))
+
+			utils.log("DEBUG", "networksCreatedCount: "+ networksCreatedCount, isDebugEnabled)
+			utils.log("DEBUG", "DCRENI_rollbackData N : "+ execution.getVariable("DCRENI_rollbackData"+networksCreatedCount), isDebugEnabled)
+
+			JSONArray vnfList = execution.getVariable("vnfList")
+			utils.log("DEBUG", "vnfList: "+ vnfList, isDebugEnabled)
+
+			String vnfModelInfo = execution.getVariable("vnfModelInfo")
+			utils.log("DEBUG", "vnfModelInfo: "+ vnfModelInfo, isDebugEnabled)
+
+			JSONArray networkList = execution.getVariable("networkList")
+			utils.log("DEBUG", "networkList: "+ networkList, isDebugEnabled)
+
+			utils.log("DEBUG", " ***** Completed validateNetworkCreate of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkCreate() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+	// *******************************
+	//     Generate Network request Section
+	// *******************************
+	public void prepareVnfAndModulesCreate (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			//			String disableRollback = execution.getVariable("disableRollback")
+			//			def backoutOnFailure = ""
+			//			if(disableRollback != null){
+			//				if ( disableRollback == true) {
+			//					backoutOnFailure = "false"
+			//				} else if ( disableRollback == false) {
+			//					backoutOnFailure = "true"
+			//				}
+			//			}
+						//failIfExists - optional
+
+			String createViprServiceRequest = execution.getVariable("createViprServiceRequest")
+			String productFamilyId = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.requestInfo.productFamilyId")
+			execution.setVariable("productFamilyId", productFamilyId)
+			utils.log("DEBUG","productFamilyId: "+ productFamilyId, isDebugEnabled)
+
+			List<VnfResource> vnfList = execution.getVariable("vnfList")
+
+			Integer vnfsCreatedCount = execution.getVariable("CGMSNV_VnfsCreatedCount")
+			String vnfModelInfoString = null;
+
+			if (vnfList != null && vnfList.size() > 0 ) {
+				utils.log("DEBUG", "getting model info for vnf # " + vnfsCreatedCount, isDebugEnabled)
+				ModelInfo vnfModelInfo1 = vnfList[0].getModelInfo()
+				utils.log("DEBUG", "got 0 ", isDebugEnabled)
+				ModelInfo vnfModelInfo = vnfList[vnfsCreatedCount.intValue()].getModelInfo()
+				vnfModelInfoString = vnfModelInfo.toString()
+			} else {
+				//TODO: vnfList does not contain data. Need to investigate why ... . Fro VIPR use model stored
+				vnfModelInfoString = execution.getVariable("vnfModelInfo")
+			}
+
+			utils.log("DEBUG", " vnfModelInfoString :" + vnfModelInfoString, isDebugEnabled)
+
+			// extract cloud configuration
+			String lcpCloudRegionId = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
+			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
+			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
+			String tenantId = jsonUtil.getJsonValue(createViprServiceRequest, "requestDetails.cloudConfiguration.tenantId")
+			execution.setVariable("tenantId", tenantId)
+			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)
+
+			String sdncVersion = execution.getVariable("sdncVersion")
+			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)
+
+			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareVnfAndModulesCreate() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+	// *******************************
+	//     Validate Vnf request Section -> increment count
+	// *******************************
+	public void validateVnfCreate (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			Integer vnfsCreatedCount = execution.getVariable("CGMSNV_VnfsCreatedCount")
+			vnfsCreatedCount++
+
+			execution.setVariable("CGMSNV_VnfsCreatedCount", vnfsCreatedCount)
+
+			utils.log("DEBUG", " ***** Completed validateVnfCreate of CreateGenericMacroServiceNetworkVnf ***** "+" vnf # "+vnfsCreatedCount, isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateVnfCreate() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+	// *******************************
+	//     Validate Network request Section -> decrement count
+	// *******************************
+	public void validateNetworkRollback (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			Integer networksCreatedCount = execution.getVariable("CGMSNV_NetworksCreatedCount")
+			networksCreatedCount--
+
+			execution.setVariable("CGMSNV_NetworksCreatedCount", networksCreatedCount)
+
+			execution.setVariable("DCRENI_rollbackData", execution.getVariable("DCRENI_rollbackData"+networksCreatedCount))
+
+			utils.log("DEBUG", " ***** Completed validateNetworkRollback of CreateGenericMacroServiceNetworkVnf ***** "+" network # "+networksCreatedCount, isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkRollback() - " + ex.getMessage()
+			//exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			execution.setVariable("CGMSNV_NetworksCreatedCount", 0)
+			utils.log("ERROR", exceptionMessage, true)
+		}
+	 }
+
+//	public void extractServiceModelInfo (Execution execution) {
+//		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+//		String msg = ""
+//		utils.log("DEBUG"," ***** extractServiceModelInfo of CreateGenericMacroServiceNetworkVnf *****",  isDebugEnabled)
+//
+//		try {
+//
+//			// check for input
+//			String requestId = execution.getVariable("msoRequestId")
+//
+//			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+//			ModelInfo modelInfo = serviceDecomposition.getModelInfo()
+//
+//			utils.log("DEBUG", "modelInfo: "+ modelInfo.toJsonString(), isDebugEnabled)
+//			utils.log("DEBUG", "modelInfo: "+ modelInfo, isDebugEnabled)
+//			execution.setVariable("serviceDecomposition", modelInfo)
+//
+//			utils.log("DEBUG"," ***** Exit extractServiceModelInfo of CreateGenericMacroServiceNetworkVnf *****",  isDebugEnabled)
+//
+//		} catch (BpmnError e) {
+//			throw e;
+//		} catch (Exception ex){
+//			msg = "Exception in extractServiceModelInfo " + ex.getMessage()
+//			utils.log("DEBUG", msg, isDebugEnabled)
+//			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+//		}
+//		utils.log("DEBUG"," ***** Exit extractServiceModelInfo of DecomposeService *****",  isDebugEnabled)
+//	}
+
+	// *******************************
+	//     Build DB request Section
+	// *******************************
+//	public void prepareDBRequest (Execution execution) {
+//		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+//
+//		try {
+//			utils.log("DEBUG", " ***** Inside prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+//
+//			String requestId = execution.getVariable("CGMSNV_requestId")
+//			String statusMessage = "vIPR ATM Service Instance successfully created."
+//			String serviceInstanceId = execution.getVariable("CGMSNV_serviceInstanceId")
+//
+//			//TODO - verify the format for Service Instance Create,
+//			String dbRequest =
+//					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+//						<soapenv:Header/>
+//						<soapenv:Body>
 //							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-//								<requestId>${requestId}</requestId>

-//								<lastModifiedBy>BPMN</lastModifiedBy>

-//								<statusMessage>${statusMessage}</statusMessage>

-//								<responseBody></responseBody>

-//								<requestStatus>COMPLETED</requestStatus>

-//								<progress>100</progress>

-//								<vnfOutputs/>

-//								<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

-//							</ns:updateInfraRequest>

-//						   </soapenv:Body>

-//					   </soapenv:Envelope>"""

-//

-//		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)

-//		   execution.setVariable("CREVAS_createDBRequest", buildDeleteDBRequestAsString)

-//		   utils.logAudit(buildDeleteDBRequestAsString)

-//

-//		   utils.log("DEBUG", " ***** Completed prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-//		} catch (Exception ex) {

-//			// try error in method block

-//			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()

-//			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-//

-//		}

-//

-//	 }

-

-

-	// *****************************************

-	//     Prepare Completion request Section

-	// *****************************************

-	public void postProcessResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		utils.log("DEBUG", " ***** Inside postProcessResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-

-		try {

-			String source = execution.getVariable("source")

-			String requestId = execution.getVariable("mso-request-id")

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-

-			String msoCompletionRequest =

+//								<requestId>${requestId}</requestId>
+//								<lastModifiedBy>BPMN</lastModifiedBy>
+//								<statusMessage>${statusMessage}</statusMessage>
+//								<responseBody></responseBody>
+//								<requestStatus>COMPLETED</requestStatus>
+//								<progress>100</progress>
+//								<vnfOutputs/>
+//								<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
+//							</ns:updateInfraRequest>
+//						   </soapenv:Body>
+//					   </soapenv:Envelope>"""
+//
+//		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)
+//		   execution.setVariable("CGMSNV_createDBRequest", buildDeleteDBRequestAsString)
+//		   utils.logAudit(buildDeleteDBRequestAsString)
+//
+//		   utils.log("DEBUG", " ***** Completed prepareDBRequest of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+//		} catch (Exception ex) {
+//			// try error in method block
+//			String exceptionMessage = "Bpmn error encountered in CreateGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()
+//			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+//
+//		}
+//
+//	 }
+
+
+	// *****************************************
+	//     Prepare Completion request Section
+	// *****************************************
+	public void postProcessResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		utils.log("DEBUG", " ***** Inside postProcessResponse of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+		try {
+			String source = execution.getVariable("source")
+			String requestId = execution.getVariable("mso-request-id")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			String msoCompletionRequest =
 					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

 									xmlns:ns="http://org.openecomp/mso/request/types/v1">

 							<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-								<request-id>${requestId}</request-id>

-								<action>CREATE</action>

-								<source>${source}</source>

-							</request-info>

-							<status-message>Service Instance has been created successfully via macro orchestration</status-message>

-							<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

-							<mso-bpel-name>BPMN macro create</mso-bpel-name>

-						</aetgt:MsoCompletionRequest>"""

-

-			// Format Response

-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

-

-			utils.logAudit(xmlMsoCompletionRequest)

-			execution.setVariable("CREVAS_Success", true)

-			execution.setVariable("CREVAS_CompleteMsoProcessRequest", xmlMsoCompletionRequest)

-			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in CreateServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-

-	public void preProcessRollback (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG"," ***** preProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-		try {

-			

-			Object workflowException = execution.getVariable("WorkflowException");

-

-			if (workflowException instanceof WorkflowException) {

-				utils.log("DEBUG", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugEnabled)

-				execution.setVariable("prevWorkflowException", workflowException);

-				//execution.setVariable("WorkflowException", null);

-			}

-		} catch (BpmnError e) {

-			utils.log("DEBUG", "BPMN Error during preProcessRollback", isDebugEnabled)

-		} catch(Exception ex) {

-			String msg = "Exception in preProcessRollback. " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-		}

-		utils.log("DEBUG"," *** Exit preProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)

-	}

-

-	public void postProcessRollback (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG"," ***** postProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)

-		String msg = ""

-		try {

-			Object workflowException = execution.getVariable("prevWorkflowException");

-			if (workflowException instanceof WorkflowException) {

-				utils.log("DEBUG", "Setting prevException to WorkflowException: ", isDebugEnabled)

-				execution.setVariable("WorkflowException", workflowException);

-			}

-		} catch (BpmnError b) {

-			utils.log("DEBUG", "BPMN Error during postProcessRollback", isDebugEnabled)

-			throw b;

-		} catch(Exception ex) {

-			msg = "Exception in postProcessRollback. " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-		}

-		utils.log("DEBUG"," *** Exit postProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)

-	}

-

-	public void prepareFalloutRequest(Execution execution){

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		utils.log("DEBUG", " *** STARTED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process *** ", isDebugEnabled)

-

-		try {

-			WorkflowException wfex = execution.getVariable("WorkflowException")

-			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)

-			String requestInfo = execution.getVariable("CREVAS_requestInfo")

-			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)

-			

-			//TODO. hmmm. there is no way to UPDATE error message.

-//			String errorMessage = wfex.getErrorMessage()

-//			boolean successIndicator = execution.getVariable("DCRESI_rollbackSuccessful")

-//			if (successIndicator){

-//				errorMessage = errorMessage + ". Rollback successful."

-//			} else {

-//				errorMessage = errorMessage + ". Rollback not completed."

-//			}

-			

-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

-

-			execution.setVariable("CREVAS_falloutRequest", falloutRequest)

-

-		} catch (Exception ex) {

-			utils.log("DEBUG", "Error Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process")

-		}

-		utils.log("DEBUG", "*** COMPLETED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process ***", isDebugEnabled)

-	}

-

-

-	public void sendSyncError (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-

-		utils.log("DEBUG", " ***** Inside sendSyncError() of CreateServiceInstanceInfra ***** ", isDebugEnabled)

-

-		try {

-			String errorMessage = ""

-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

-				WorkflowException wfe = execution.getVariable("WorkflowException")

-				errorMessage = wfe.getErrorMessage()

-			} else {

-				errorMessage = "Sending Sync Error."

-			}

-

-			String buildworkflowException =

+								<request-id>${requestId}</request-id>
+								<action>CREATE</action>
+								<source>${source}</source>
+							</request-info>
+							<status-message>Service Instance has been created successfully via macro orchestration</status-message>
+							<serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
+							<mso-bpel-name>BPMN macro create</mso-bpel-name>
+						</aetgt:MsoCompletionRequest>"""
+
+			// Format Response
+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
+
+			utils.logAudit(xmlMsoCompletionRequest)
+			execution.setVariable("CGMSNV_Success", true)
+			execution.setVariable("CGMSNV_CompleteMsoProcessRequest", xmlMsoCompletionRequest)
+			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in CreateServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+
+	public void preProcessRollback (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** preProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		try {
+
+			Object workflowException = execution.getVariable("WorkflowException");
+
+			if (workflowException instanceof WorkflowException) {
+				utils.log("DEBUG", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugEnabled)
+				execution.setVariable("prevWorkflowException", workflowException);
+				//execution.setVariable("WorkflowException", null);
+			}
+		} catch (BpmnError e) {
+			utils.log("DEBUG", "BPMN Error during preProcessRollback", isDebugEnabled)
+		} catch(Exception ex) {
+			String msg = "Exception in preProcessRollback. " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+		}
+		utils.log("DEBUG"," *** Exit preProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)
+	}
+
+	public void postProcessRollback (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** postProcessRollback of CreateGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		String msg = ""
+		try {
+			Object workflowException = execution.getVariable("prevWorkflowException");
+			if (workflowException instanceof WorkflowException) {
+				utils.log("DEBUG", "Setting prevException to WorkflowException: ", isDebugEnabled)
+				execution.setVariable("WorkflowException", workflowException);
+			}
+		} catch (BpmnError b) {
+			utils.log("DEBUG", "BPMN Error during postProcessRollback", isDebugEnabled)
+			throw b;
+		} catch(Exception ex) {
+			msg = "Exception in postProcessRollback. " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+		}
+		utils.log("DEBUG"," *** Exit postProcessRollback of CreateGenericMacroServiceNetworkVnf *** ", isDebugEnabled)
+	}
+
+	public void prepareFalloutRequest(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		utils.log("DEBUG", " *** STARTED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process *** ", isDebugEnabled)
+
+		try {
+			WorkflowException wfex = execution.getVariable("WorkflowException")
+			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)
+			String requestInfo = execution.getVariable("CGMSNV_requestInfo")
+			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)
+
+			//TODO. hmmm. there is no way to UPDATE error message.
+//			String errorMessage = wfex.getErrorMessage()
+//			boolean successIndicator = execution.getVariable("DCRESI_rollbackSuccessful")
+//			if (successIndicator){
+//				errorMessage = errorMessage + ". Rollback successful."
+//			} else {
+//				errorMessage = errorMessage + ". Rollback not completed."
+//			}
+
+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
+
+			execution.setVariable("CGMSNV_falloutRequest", falloutRequest)
+
+		} catch (Exception ex) {
+			utils.log("DEBUG", "Error Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process")
+		}
+		utils.log("DEBUG", "*** COMPLETED CreateGenericMacroServiceNetworkVnf prepareFalloutRequest Process ***", isDebugEnabled)
+	}
+
+
+	public void sendSyncError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside sendSyncError() of CreateServiceInstanceInfra ***** ", isDebugEnabled)
+
+		try {
+			String errorMessage = ""
+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
+				WorkflowException wfe = execution.getVariable("WorkflowException")
+				errorMessage = wfe.getErrorMessage()
+			} else {
+				errorMessage = "Sending Sync Error."
+			}
+
+			String buildworkflowException =
 				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

-				   </aetgt:WorkflowException>"""

-

-			utils.logAudit(buildworkflowException)

-			sendWorkflowResponse(execution, 500, buildworkflowException)

-		} catch (Exception ex) {

-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

-		}

-	}

-

-	public void processJavaException(Execution execution){

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		try{

-			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)

-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

-			execution.setVariable("CRESI_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated

-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")

-		}catch(BpmnError b){

-			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

-			execution.setVariable("CRESI_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated

-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")

-		}

-		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)

-	}

+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
+				   </aetgt:WorkflowException>"""
+
+			utils.logAudit(buildworkflowException)
+			sendWorkflowResponse(execution, 500, buildworkflowException)
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
+		}
+	}
+
+	public void processJavaException(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		try{
+			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
+			execution.setVariable("CRESI_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")
+		}catch(BpmnError b){
+			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			throw b
+		}catch(Exception e){
+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
+			execution.setVariable("CRESI_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")
+		}
+		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)
+	}
 }
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
index 573deb4..b468a51 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
@@ -1,42 +1,45 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts;

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts;
 
 import groovy.json.JsonSlurper
+import groovy.json.JsonOutput
 
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.apache.commons.lang3.*
-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils;

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils;

-import org.openecomp.mso.bpmn.common.scripts.VidUtils;

-import org.openecomp.mso.bpmn.core.RollbackData

-import org.openecomp.mso.bpmn.core.WorkflowException

-
-public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {

-	
-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils;
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils;
+import org.openecomp.mso.bpmn.common.scripts.VidUtils;
+import org.openecomp.mso.bpmn.core.RollbackData
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+
+public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+
 	/**
 	 * Validates the request message and sets up the workflow.
 	 * @param execution the execution
@@ -71,73 +74,160 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 		// check if request is xml or json
 		try {
 			def jsonSlurper = new JsonSlurper()
+			def jsonOutput = new JsonOutput()
 			Map reqMap = jsonSlurper.parseText(incomingRequest)
 			utils.log("DEBUG", " Request is in JSON format.", isDebugLogEnabled)
 
 			def serviceInstanceId = execution.getVariable('serviceInstanceId')
 			def vnfId = execution.getVariable('vnfId')
-
-			def vidUtils = new VidUtils(this)
-
-			String requestInXmlFormat = vidUtils.createXmlVfModuleRequest(execution, reqMap, 'CREATE_VF_MODULE', serviceInstanceId)
-
-			utils.log("DEBUG", " Request in XML format: " + requestInXmlFormat, isDebugLogEnabled)
-
-			execution.setVariable(prefix + 'Request', requestInXmlFormat)
+			
+			execution.setVariable(prefix + 'serviceInstanceId', serviceInstanceId)
 			execution.setVariable(prefix+'vnfId', vnfId)
 			execution.setVariable("isVidRequest", "true")
-
-		}
-		catch(groovy.json.JsonException je) {
-			utils.log("DEBUG", " Request is not in JSON format.", isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - During PreProcessRequest")
-
-		}
-		catch(Exception e) {
-			String restFaultMessage = e.getMessage()
-			//execution.setVariable("CVFMODVOL2_RESTFault", restFaultMessage)
-			//execution.setVariable("CVFMODVOL2_isDataOk", false)
-			utils.log("ERROR", " Exception Encountered - " + "\n" + restFaultMessage, isDebugLogEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - During PreProcessRequest")
-		}
-
-		try {
-			String request = validateInfraRequest(execution)
+			
+			def vnfName = ''
+			def asdcServiceModelVersion = ''
+			def serviceModelInfo = null
+			def vnfModelInfo = null
+			
+			def relatedInstanceList = reqMap.requestDetails?.relatedInstanceList
+						
+			if (relatedInstanceList != null) {
+				relatedInstanceList.each {
+					if (it.relatedInstance.modelInfo?.modelType == 'service') {
+						asdcServiceModelVersion = it.relatedInstance.modelInfo?.modelVersion
+						serviceModelInfo = jsonOutput.toJson(it.relatedInstance.modelInfo)
+						
+					}
+					if (it.relatedInstance.modelInfo.modelType == 'vnf') {
+						vnfName = it.relatedInstance.instanceName ?: ''
+						vnfModelInfo = jsonOutput.toJson(it.relatedInstance.modelInfo)
+					}
+				}
+			}
+			
+			execution.setVariable(prefix + 'vnfName', vnfName)
+			execution.setVariable(prefix + 'asdcServiceModelVersion', asdcServiceModelVersion)
+			execution.setVariable(prefix + 'serviceModelInfo', serviceModelInfo)
+			execution.setVariable(prefix + 'vnfModelInfo', vnfModelInfo)
+			
+			
+			def vnfType = execution.getVariable('vnfType')
+			execution.setVariable(prefix + 'vnfType', vnfType)	
+			def vfModuleId = execution.getVariable('vfModuleId')
+			execution.setVariable(prefix + 'vfModuleId', vfModuleId)
+			def volumeGroupId = execution.getVariable('volumeGroupId')
+			execution.setVariable(prefix + 'volumeGroupId', volumeGroupId)
+			def userParams = reqMap.requestDetails?.requestParameters?.userParams					
+			
+			Map<String, String> userParamsMap = [:]
+			if (userParams != null) {
+				userParams.each { userParam ->
+					userParamsMap.put(userParam.name, userParam.value)
+				}							
+			}		
+						
+			utils.log("DEBUG", 'Processed user params: ' + userParamsMap, isDebugLogEnabled)		
+			
+			execution.setVariable(prefix + 'vfModuleInputParams', userParamsMap)
+			
+			def isBaseVfModule = "false"
+			if (execution.getVariable('isBaseVfModule') == true) {
+				isBaseVfModule = "true"
+			}			
+			
+			execution.setVariable(prefix + 'isBaseVfModule', isBaseVfModule)
+						
+			def requestId = execution.getVariable("mso-request-id")
+			execution.setVariable(prefix + 'requestId', requestId)
+			
+			def vfModuleModelInfo = jsonOutput.toJson(reqMap.requestDetails?.modelInfo)
+			execution.setVariable(prefix + 'vfModuleModelInfo', vfModuleModelInfo)
+			
+			def suppressRollback = reqMap.requestDetails?.requestInfo?.suppressRollback
+			
+			
+			def backoutOnFailure = ""
+			if(suppressRollback != null){
+				if ( suppressRollback == true) {
+					backoutOnFailure = "false"
+				} else if ( suppressRollback == false) {
+					backoutOnFailure = "true"
+				}
+			}
+			
+			execution.setVariable(prefix + 'disableRollback', suppressRollback)
+			
+			def vfModuleName = reqMap.requestDetails?.requestInfo?.instanceName ?: null
+			execution.setVariable(prefix + 'vfModuleName', vfModuleName)
+			
+			def serviceId = reqMap.requestDetails?.requestParameters?.serviceId ?: ''
+			execution.setVariable(prefix + 'serviceId', serviceId)
+			
+			def usePreload = reqMap.requestDetails?.requestParameters?.usePreload
+			execution.setVariable(prefix + 'usePreload', usePreload)
+			
+			def cloudConfiguration = reqMap.requestDetails?.cloudConfiguration
+			def lcpCloudRegionId	= cloudConfiguration.lcpCloudRegionId
+			execution.setVariable(prefix + 'lcpCloudRegionId', lcpCloudRegionId)
+			def tenantId = cloudConfiguration.tenantId
+			execution.setVariable(prefix + 'tenantId', tenantId)
+			
+			def globalSubscriberId = reqMap.requestDetails?.subscriberInfo?.globalSubscriberId ?: ''
+			execution.setVariable(prefix + 'globalSubscriberId', globalSubscriberId)
+			
+			execution.setVariable(prefix + 'sdncVersion', '1702')
 
 			execution.setVariable("CreateVfModuleInfraSuccessIndicator", false)
 			execution.setVariable("RollbackCompleted", false)
-			execution.setVariable("DoCreateVfModuleRequest", request)
+			
 			execution.setVariable("isDebugLogEnabled", isDebugLogEnabled)
-			execution.setVariable("CVFMI_requestInfo",utils.getNodeXml(request,"request-info"))
-			execution.setVariable("CVFMI_requestId",utils.getNodeText1(request,"request-id"))
-			execution.setVariable("CVFMI_source",utils.getNodeText1(request,"source"))
-			execution.setVariable("CVFMI_serviceInstanceId", utils.getNodeText1(request, "service-instance-id"))
-			execution.setVariable("CVFMI_vnfInputs",utils.getNodeXml(request,"vnf-inputs"))
+			
+			
+			def source = reqMap.requestDetails?.requestInfo?.source
+			execution.setVariable("CVFMI_source", source)
+			
+			//For Completion Handler & Fallout Handler
+			String requestInfo =
+			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					<request-id>${requestId}</request-id>
+					<action>CREATE</action>
+					<source>${source}</source>
+				   </request-info>"""
+			
+			execution.setVariable("CVFMI_requestInfo", requestInfo)
+			
 			//backoutOnFailure
 
-			NetworkUtils networkUtils = new NetworkUtils()
-			execution.setVariable("CVFMI_rollbackEnabled", networkUtils.isRollbackEnabled(execution,request))
+			//NetworkUtils networkUtils = new NetworkUtils()
+			//execution.setVariable("CVFMI_rollbackEnabled", networkUtils.isRollbackEnabled(execution,request))
 			execution.setVariable("CVFMI_originalWorkflowException", null)
-			def vnfParams = ""
-			if (utils.nodeExists(request, "vnf-params")) {
-				vnfParams = utils.getNodeXml(request,"vnf-params")
-			}
-			execution.setVariable("CVFMI_vnfParams", vnfParams)
+			
 
 			def newVfModuleId = UUID.randomUUID().toString()
 			execution.setVariable("newVfModuleId", newVfModuleId)
+			execution.setVariable(prefix + 'vfModuleId', newVfModuleId)
 
-			logDebug('RequestInfo: ' + execution.getVariable("CVFMI_requestInfo"), isDebugLogEnabled)
-			logDebug('VnfInputs: ' + execution.getVariable("CVFMI_vnfInputs"), isDebugLogEnabled)
-			logDebug('VnfParams: ' + execution.getVariable("CVFMI_vnfParams"), isDebugLogEnabled)
+			logDebug('RequestInfo: ' + execution.getVariable("CVFMI_requestInfo"), isDebugLogEnabled)			
+			
 			logDebug('rollbackEnabled: ' + execution.getVariable("CVFMI_rollbackEnabled"), isDebugLogEnabled)
 
 			logDebug('Exited ' + method, isDebugLogEnabled)
 		} catch (BpmnError bpmnError) {
 			throw bpmnError
-		} catch (Exception exception) {
+		}
+		catch(groovy.json.JsonException je) {
+			utils.log("DEBUG", " Request is not in JSON format.", isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - During PreProcessRequest")
+		}
+		catch(Exception e) {
+			String restFaultMessage = e.getMessage()
+			//execution.setVariable("CVFMODVOL2_RESTFault", restFaultMessage)
+			//execution.setVariable("CVFMODVOL2_isDataOk", false)
+			utils.log("ERROR", " Exception Encountered - " + "\n" + restFaultMessage, isDebugLogEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 400, "Internal Error - During PreProcessRequest")
 		}
+
 	}
 
 	/**
@@ -168,16 +258,8 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 		try {
 			def requestInfo = execution.getVariable('CVFMI_requestInfo')
 			def requestId = execution.getVariable('CVFMI_requestId')
-			def source = execution.getVariable('CVFMI_source')
-			def progress = getNodeTextForce(requestInfo, 'progress')
-			if (progress.isEmpty()) {
-				progress = '0'
-			}
-			def startTime = getNodeTextForce(requestInfo, 'start-time')
-			if (startTime.isEmpty()) {
-				startTime = System.currentTimeMillis()
-			}
-
+			def source = execution.getVariable('CVFMI_source')			
+			
 			// RESTResponse (for API Handler (APIH) Reply Task)
 			def newVfModuleId = execution.getVariable("newVfModuleId")
 			String synchResponse = """{"requestReferences":{"instanceId":"${newVfModuleId}","requestId":"${requestId}"}}""".trim()
@@ -202,9 +284,8 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 
 		utils.log("DEBUG", " ======== STARTED PostProcessResponse Process ======== ", isDebugEnabled)
-		try{
-			def request = execution.getVariable("DoCreateVfModuleRequest")
-			def requestInfo = utils.getNodeXml(request, 'request-info', false)
+		try{			
+			def requestInfo = execution.getVariable("CVFMI_requestInfo")
 			def action = utils.getNodeText1(requestInfo, "action")
 
 			utils.log("DEBUG", "requestInfo is: " + requestInfo, isDebugEnabled)
@@ -223,10 +304,10 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			}

 			

 			String payload =
-					"""  <aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-                               xmlns:ns="http://org.openecomp/mso/request/types/v1"

-                               xmlns:ns8="http://org.openecomp/mso/workflow/schema/v1">

-			<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+					"""  <aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+                               xmlns:ns="http://org.openecomp/mso/request/types/v1"
+                               xmlns:ns8="http://org.openecomp/mso/workflow/schema/v1">
+			<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
 			${requestInfo}
 			</request-info>
 			<ns8:status-message>Vf Module has been created successfully.</ns8:status-message>
@@ -292,7 +373,7 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 
 			/*
 
-			def requestId = execution.getVariable("mso-request-id")

+			def requestId = execution.getVariable("mso-request-id")
 
 			if (requestId == null) {
 				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request has no mso-request-id")
@@ -300,7 +381,7 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 
 			setVariable(execution, prefix + 'requestId', requestId)
 
-			def serviceInstanceId = execution.getVariable("mso-service-instance-id")

+			def serviceInstanceId = execution.getVariable("mso-service-instance-id")
 
 			if (serviceInstanceId == null) {
 				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")
@@ -325,14 +406,16 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 
 		utils.log("DEBUG", " ======== STARTED prepareUpdateInfraRequest Process ======== ", isDebugEnabled)
 		try{
-
-			String vnfInputs = execution.getVariable("CVFMI_vnfInputs")
-			String requestInfo = execution.getVariable("CVFMI_requestInfo")
-			def aicCloudRegion	= utils.getNodeText1(vnfInputs, "aic-cloud-region")
-			def tenantId = utils.getNodeText1(vnfInputs, "tenant-id")
+			
+			
+			String requestInfo = execution.getVariable("CVFMI_requestInfo")			
+			def aicCloudRegion	= execution.getVariable("CVFMI_lcpCloudRegionId")
+			def tenantId = execution.getVariable("CVFMI_tenantId")
 			def requestId = utils.getNodeText1(requestInfo, "request-id")
 			def vnfId = execution.getVariable("CVFMI_vnfId")
 			def vfModuleId = execution.getVariable("CVFMI_vfModuleId")
+			// vfModuleName may be generated by DoCreateVfModule subprocess if it is not specified on the input
+			def vfModuleName = execution.getVariable("CVFMI_vfModuleName")
 
 			def dbAdapterEndpoint = execution.getVariable("URN_mso_adapters_db_endpoint")
 			execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
@@ -352,18 +435,19 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			

 			String payload =
 				"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-						xmlns:ns="http://org.openecomp.mso/requestsdb">

+						xmlns:ns="http://org.openecomp.mso/requestsdb">
 						<soapenv:Header/>
 						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
 							<requestId>${requestId}</requestId>
 							<lastModifiedBy>BPMN</lastModifiedBy>
 							<statusMessage>VF Module successfully created</statusMessage>
 							<responseBody></responseBody>
 							<requestStatus>COMPLETE</requestStatus>
 							<progress>100</progress>
-							<vnfOutputs>&lt;vnf-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"&gt;&lt;vnf-id&gt;${vnfId}&lt;/vnf-id&gt;&lt;vf-module-id&gt;${vfModuleId}&lt;/vf-module-id&gt;&lt;/vnf-outputs&gt;</vnfOutputs>

+							<vnfOutputs>&lt;vnf-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"&gt;&lt;vnf-id&gt;${vnfId}&lt;/vnf-id&gt;&lt;vf-module-id&gt;${vfModuleId}&lt;/vf-module-id&gt;&lt;/vnf-outputs&gt;</vnfOutputs>
 							<vfModuleId>${vfModuleId}</vfModuleId>
+							<vfModuleName>${vfModuleName}</vfModuleName>
 						</ns:updateInfraRequest>
 					</soapenv:Body>
 				</soapenv:Envelope>"""
@@ -396,9 +480,8 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 
 
 		try {
-			def WorkflowException workflowException = execution.getVariable("WorkflowException")
-			def request = execution.getVariable("DoCreateVfModuleRequest")
-			def requestInformation = utils.getNodeXml(request, 'request-info', false)
+			def WorkflowException workflowException = execution.getVariable("WorkflowException")			
+			def requestInformation = execution.getVariable("CVFMI_requestInfo")
 			def errorResponseCode = workflowException.getErrorCode()
 			def errorResponseMsg = workflowException.getErrorMessage()
 			def encErrorResponseMsg = ""
@@ -407,10 +490,10 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			}
 
 			String content = """
-				<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"

-						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"

-						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">

+				<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
+						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
+						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
 						${requestInformation}
 					<aetgt:WorkflowException>
 						<aetgt:ErrorMessage>${encErrorResponseMsg}</aetgt:ErrorMessage>
@@ -458,6 +541,8 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 		execution.setVariable("RollbackCompleted", true)
 
 	}
+	
+	
 
 
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy
index 289e185..48ca290 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleVolumeInfraV1.groovy
@@ -1,304 +1,303 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts

-

-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

-import org.openecomp.mso.bpmn.common.scripts.VidUtils;

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse

-

-import groovy.json.JsonSlurper

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution;

-import org.apache.commons.lang3.*

-

-class CreateVfModuleVolumeInfraV1 extends AbstractServiceTaskProcessor {

-

-	public static final String  prefix='CVMVINFRAV1_'

-

-	/**

-	 * Perform initial processing, such as request validation, initialization of variables, etc.

-	 * * @param execution

-	 */

-	public void preProcessRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		preProcessRequest(execution, isDebugEnabled)

-	}

-

-

-	/**

-	 * Perform initial processing, such as request validation, initialization of variables, etc.

-	 * @param execution

-	 * @param isDebugEnabled

-	 */

-	public void preProcessRequest (Execution execution, isDebugEnabled) {

-

-		execution.setVariable("prefix",prefix)

-		setSuccessIndicator(execution, false)

-		execution.setVariable(prefix+'syncResponseSent', false)

-

-		String createVolumeIncoming = validateRequest(execution, 'vnfId')

-		utils.logAudit(createVolumeIncoming)

-

-		try {

-			def jsonSlurper = new JsonSlurper()

-			Map reqMap = jsonSlurper.parseText(createVolumeIncoming)

-

-			def serviceInstanceId = execution.getVariable('serviceInstanceId')

-			def vnfId = execution.getVariable('vnfId')

-

-			def vidUtils = new VidUtils(this)

-			createVolumeIncoming = vidUtils.createXmlVolumeRequest(reqMap, 'CREATE_VF_MODULE_VOL', serviceInstanceId)

-

-			execution.setVariable(prefix+'Request', createVolumeIncoming)

-			execution.setVariable(prefix+'vnfId', vnfId)

-			execution.setVariable(prefix+'isVidRequest', true)

-

-			utils.log("DEBUG", "XML request:\n" + createVolumeIncoming, isDebugEnabled)

-

-		}

-		catch(groovy.json.JsonException je) {

-			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 2500, 'Request is not a valid JSON document')

-		}

-

-		execution.setVariable(prefix+'source', utils.getNodeText1(createVolumeIncoming, "source"))

-		execution.setVariable(prefix+'volumeGroupName', utils.getNodeText1(createVolumeIncoming, 'volume-group-name'))

-		execution.setVariable(prefix+'volumeOutputs', utils.getNodeXml(createVolumeIncoming, 'volume-outputs', false))

-

-		execution.setVariable(prefix+'serviceType', 'service-instance')

-		execution.setVariable(prefix+'serviceInstanceId', utils.getNodeText1(createVolumeIncoming, "service-instance-id"))

-

-		// Generate volume group id

-		String volumeGroupId = UUID.randomUUID()

-		utils.log("DEBUG", "Generated volume group id: " + volumeGroupId, isDebugEnabled)

-

-		def testGroupId = execution.getVariable('test-volume-group-id')

-		if (testGroupId != null && testGroupId.trim() != '') {

-			volumeGroupId = testGroupId

-		}

-

-		execution.setVariable(prefix+'volumeGroupId', volumeGroupId)

-

-	}

-

-

-	public void sendSyncResponse (Execution execution, isDebugEnabled) {

-		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')

-		def requestId = execution.getVariable("mso-request-id")

-		def serviceInstanceId = execution.getVariable("serviceInstanceId")

-

-		String syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()

-

-		utils.log("DEBUG", "Sync Response: " + "\n" + syncResponse, isDebugEnabled)

-		sendWorkflowResponse(execution, 200, syncResponse)

-

-		execution.setVariable(prefix+'syncResponseSent', true)

-	}

-

-

-	public void sendSyncError (Execution execution, isDebugEnabled) {

-		WorkflowException we = execution.getVariable('WorkflowException')

-		def errorCode = we?.getErrorCode()

-		def errorMessage = we?.getErrorMessage()

-		//default to 400 since only invalid request will trigger this method

-		sendWorkflowResponse(execution, 400, errorMessage)

-	}

-

-

-	/**

-	 * Create a WorkflowException

-	 * @param execution

-	 * @param isDebugEnabled

-	 */

-	public void buildWorkflowException(Execution execution, int errorCode, errorMessage, isDebugEnabled) {

-		utils.log("DEBUG", errorMessage, isDebugEnabled)

-		(new ExceptionUtil()).buildWorkflowException(execution, 2500, errorMessage)

-	}

-

-

-	public void prepareDbInfraSuccessRequest(Execution execution, isDebugEnabled) {

-		ExceptionUtil exceptionUtil = new ExceptionUtil()

-		def dbVnfOutputs = execution.getVariable(prefix+'volumeOutputs')

-		def requestId = execution.getVariable('mso-request-id')

-		def statusMessage = "VolumeGroup successfully created."

-		def requestStatus = "COMPLETED"

-		def progress = "100"

-

-		try {

-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

-			

-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

-		} catch (IOException ex) {

-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

-			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-		}

-		

-		/*

-		from: $gVolumeGroup/aai:volume-group-id/text()

-		to: vnfreq:volume-outputs/vnfreq:volume-group-id

-		*/

-		// for now assume, generated volumeGroupId is accepted

-		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')

-

-		String dbRequest =

-			"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

-				<soapenv:Header/>

-				<soapenv:Body>

-					<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-						<requestId>${requestId}</requestId>

-						<lastModifiedBy>BPMN</lastModifiedBy>

-						<statusMessage>${statusMessage}</statusMessage>

-						<responseBody></responseBody>

-						<requestStatus>${requestStatus}</requestStatus>

-						<progress>${progress}</progress>

-						<vnfOutputs>${dbVnfOutputs}</vnfOutputs>

-						<volumeGroupId>${volumeGroupId}</volumeGroupId>

-					</ns:updateInfraRequest>

-			   	</soapenv:Body>

-			   </soapenv:Envelope>"""

-

-		String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)

-		execution.setVariable(prefix+"createDBRequest", buildDeleteDBRequestAsString)

-

-		utils.logAudit(buildDeleteDBRequestAsString)

-	}

-

-

-

-

-

-	public void postProcessResponse (Execution execution, isDebugEnabled) {

-

-		def dbReturnCode = execution.getVariable(prefix+'dbReturnCode')

-		def createDBResponse =  execution.getVariable(prefix+'createDBResponse')

-

-		utils.logAudit('DB return code: ' + dbReturnCode)

-		utils.logAudit('DB response: ' + createDBResponse)

-

-		def requestId = execution.getVariable("mso-request-id")

-		def source = execution.getVariable(prefix+'source')

-

-		String msoCompletionRequest =

-			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-							xmlns:ns="http://org.openecomp/mso/request/types/v1">

-					<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-						<request-id>${requestId}</request-id>

-						<action>CREATE</action>

-						<source>${source}</source>

-		   			</request-info>

-					<aetgt:status-message>Volume Group has been created successfully.</aetgt:status-message>

-		   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: CREATE</aetgt:mso-bpel-name>

-				</aetgt:MsoCompletionRequest>"""

-

-		String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

-

-		utils.logAudit(createDBResponse)

-		utils.logAudit(xmlMsoCompletionRequest)

-		execution.setVariable(prefix+'Success', true)

-		execution.setVariable(prefix+'CompleteMsoProcessRequest', xmlMsoCompletionRequest)

-		utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

-

-	}

-

-	public void prepareFalloutHandlerRequest(Execution execution, isDebugEnabled) {

-

-		WorkflowException we = execution.getVariable('WorkflowException')

-		def errorCode = we?.getErrorCode()

-		def errorMessage = we?.getErrorMessage()

-

-		def requestId = execution.getVariable("mso-request-id")

-		def source = execution.getVariable(prefix+'source')

-

-		String falloutHandlerRequest =

-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-				                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-				                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-				   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-				      <request-id>${requestId}</request-id>

-				      <action>CREATE</action>

-				      <source>${source}</source>

-				   </request-info>

-					   <aetgt:WorkflowException>

-					      <aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

-					      <aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-

-				</aetgt:FalloutHandlerRequest>"""

-

-		// Format Response

-		String xmlHandlerRequest = utils.formatXml(falloutHandlerRequest)

-		utils.logAudit(xmlHandlerRequest)

-

-		execution.setVariable(prefix+'FalloutHandlerRequest', xmlHandlerRequest)

-		utils.log("ERROR", "Overall Error Response going to FalloutHandler: " + "\n" + xmlHandlerRequest, isDebugEnabled)

-	}

-

-

-	/**

-	 * Query AAI service instance

-	 * @param execution

-	 * @param isDebugEnabled

-	 */

-	public void callRESTQueryAAIServiceInstance(Execution execution, isDebugEnabled) {

-

-		def request = execution.getVariable(prefix+"Request")

-		def serviceInstanceId = utils.getNodeText1(request, "service-instance-id")

-

-		AaiUtil aaiUtil = new AaiUtil(this)

-		String aaiEndpoint = aaiUtil.getSearchNodesQueryEndpoint(execution)

-

-		def String queryAAIRequest = aaiEndpoint + "?search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId

-		utils.logAudit("AAI query service instance request: " + queryAAIRequest)

-

-		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIRequest)

-

-		String returnCode = response.getStatusCode()

-		String aaiResponseAsString = response.getResponseBodyAsString()

-		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)

-

-		utils.logAudit("AAI query service instance return code: " + returnCode)

-		utils.logAudit("AAI query service instance response: " + aaiResponseAsString)

-

-		utils.log("DEBUG", "AAI query service instance return code: " + returnCode, isDebugEnabled)

-		utils.log("DEBUG", "AAI query service instance response: " + aaiResponseAsString, isDebugEnabled)

-

-		ExceptionUtil exceptionUtil = new ExceptionUtil()

-

-		if (returnCode=='200') {

-			utils.log("DEBUG", 'Service instance ' + serviceInstanceId + ' found in AAI.', isDebugEnabled)

-		} else {

-			if (returnCode=='404') {

-				def message = 'Service instance ' + serviceInstanceId + ' was not found in AAI. Return code: 404.'

-				utils.log("DEBUG", message, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, message)

-			} else {

-				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)

-				throw new BpmnError("MSOWorkflowException")

-			}

-		}

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil;
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;
+import org.openecomp.mso.bpmn.common.scripts.VidUtils;
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse
+
+import groovy.json.JsonSlurper
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution;
+import org.apache.commons.lang3.*
+
+class CreateVfModuleVolumeInfraV1 extends AbstractServiceTaskProcessor {
+
+	public static final String  prefix='CVMVINFRAV1_'
+
+	/**
+	 * Perform initial processing, such as request validation, initialization of variables, etc.
+	 * * @param execution
+	 */
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		preProcessRequest(execution, isDebugEnabled)
+	}
+
+
+	/**
+	 * Perform initial processing, such as request validation, initialization of variables, etc.
+	 * @param execution
+	 * @param isDebugEnabled
+	 */
+	public void preProcessRequest (Execution execution, isDebugEnabled) {
+
+		execution.setVariable("prefix",prefix)
+		setSuccessIndicator(execution, false)
+		execution.setVariable(prefix+'syncResponseSent', false)
+
+		String createVolumeIncoming = validateRequest(execution, 'vnfId')
+		utils.logAudit(createVolumeIncoming)
+
+		try {
+			def jsonSlurper = new JsonSlurper()
+			Map reqMap = jsonSlurper.parseText(createVolumeIncoming)
+
+			def serviceInstanceId = execution.getVariable('serviceInstanceId')
+			def vnfId = execution.getVariable('vnfId')
+
+			def vidUtils = new VidUtils(this)
+			createVolumeIncoming = vidUtils.createXmlVolumeRequest(reqMap, 'CREATE_VF_MODULE_VOL', serviceInstanceId)
+
+			execution.setVariable(prefix+'Request', createVolumeIncoming)
+			execution.setVariable(prefix+'vnfId', vnfId)
+			execution.setVariable(prefix+'isVidRequest', true)
+
+			utils.log("DEBUG", "XML request:\n" + createVolumeIncoming, isDebugEnabled)
+
+		}
+		catch(groovy.json.JsonException je) {
+			(new ExceptionUtil()).buildAndThrowWorkflowException(execution, 2500, 'Request is not a valid JSON document')
+		}
+
+		execution.setVariable(prefix+'source', utils.getNodeText1(createVolumeIncoming, "source"))
+		execution.setVariable(prefix+'volumeGroupName', utils.getNodeText1(createVolumeIncoming, 'volume-group-name'))
+		execution.setVariable(prefix+'volumeOutputs', utils.getNodeXml(createVolumeIncoming, 'volume-outputs', false))
+
+		execution.setVariable(prefix+'serviceType', 'service-instance')
+		execution.setVariable(prefix+'serviceInstanceId', utils.getNodeText1(createVolumeIncoming, "service-instance-id"))
+
+		// Generate volume group id
+		String volumeGroupId = UUID.randomUUID()
+		utils.log("DEBUG", "Generated volume group id: " + volumeGroupId, isDebugEnabled)
+
+		def testGroupId = execution.getVariable('test-volume-group-id')
+		if (testGroupId != null && testGroupId.trim() != '') {
+			volumeGroupId = testGroupId
+		}
+
+		execution.setVariable(prefix+'volumeGroupId', volumeGroupId)
+
+	}
+
+
+	public void sendSyncResponse (Execution execution, isDebugEnabled) {
+		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')
+		def requestId = execution.getVariable("mso-request-id")
+		def serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+		String syncResponse = """{"requestReferences":{"instanceId":"${volumeGroupId}","requestId":"${requestId}"}}""".trim()
+
+		utils.log("DEBUG", "Sync Response: " + "\n" + syncResponse, isDebugEnabled)
+		sendWorkflowResponse(execution, 200, syncResponse)
+
+		execution.setVariable(prefix+'syncResponseSent', true)
+	}
+
+
+	public void sendSyncError (Execution execution, isDebugEnabled) {
+		WorkflowException we = execution.getVariable('WorkflowException')
+		def errorCode = we?.getErrorCode()
+		def errorMessage = we?.getErrorMessage()
+		//default to 400 since only invalid request will trigger this method
+		sendWorkflowResponse(execution, 400, errorMessage)
+	}
+
+
+	/**
+	 * Create a WorkflowException
+	 * @param execution
+	 * @param isDebugEnabled
+	 */
+	public void buildWorkflowException(Execution execution, int errorCode, errorMessage, isDebugEnabled) {
+		utils.log("DEBUG", errorMessage, isDebugEnabled)
+		(new ExceptionUtil()).buildWorkflowException(execution, 2500, errorMessage)
+	}
+
+
+	public void prepareDbInfraSuccessRequest(Execution execution, isDebugEnabled) {
+		def dbVnfOutputs = execution.getVariable(prefix+'volumeOutputs')
+		def requestId = execution.getVariable('mso-request-id')
+		def statusMessage = "VolumeGroup successfully created."
+		def requestStatus = "COMPLETED"
+		def progress = "100"
+
+		try {
+			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")
+			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)
+			
+			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))
+			execution.setVariable("BasicAuthHeaderValueDB",encodedString)
+		} catch (IOException ex) {
+			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()
+			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+		}
+		
+		/*
+		from: $gVolumeGroup/aai:volume-group-id/text()
+		to: vnfreq:volume-outputs/vnfreq:volume-group-id
+		*/
+		// for now assume, generated volumeGroupId is accepted
+		def volumeGroupId = execution.getVariable(prefix+'volumeGroupId')
+
+		String dbRequest =
+			"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+				<soapenv:Header/>
+				<soapenv:Body>
+					<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+						<requestId>${requestId}</requestId>
+						<lastModifiedBy>BPMN</lastModifiedBy>
+						<statusMessage>${statusMessage}</statusMessage>
+						<responseBody></responseBody>
+						<requestStatus>${requestStatus}</requestStatus>
+						<progress>${progress}</progress>
+						<vnfOutputs>${dbVnfOutputs}</vnfOutputs>
+						<volumeGroupId>${volumeGroupId}</volumeGroupId>
+					</ns:updateInfraRequest>
+			   	</soapenv:Body>
+			   </soapenv:Envelope>"""
+
+		String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)
+		execution.setVariable(prefix+"createDBRequest", buildDeleteDBRequestAsString)
+
+		utils.logAudit(buildDeleteDBRequestAsString)
+	}
+
+
+
+
+
+	public void postProcessResponse (Execution execution, isDebugEnabled) {
+
+		def dbReturnCode = execution.getVariable(prefix+'dbReturnCode')
+		def createDBResponse =  execution.getVariable(prefix+'createDBResponse')
+
+		utils.logAudit('DB return code: ' + dbReturnCode)
+		utils.logAudit('DB response: ' + createDBResponse)
+
+		def requestId = execution.getVariable("mso-request-id")
+		def source = execution.getVariable(prefix+'source')
+
+		String msoCompletionRequest =
+			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+							xmlns:ns="http://org.openecomp/mso/request/types/v1">
+					<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+						<request-id>${requestId}</request-id>
+						<action>CREATE</action>
+						<source>${source}</source>
+		   			</request-info>
+					<aetgt:status-message>Volume Group has been created successfully.</aetgt:status-message>
+		   			<aetgt:mso-bpel-name>BPMN VF Module Volume action: CREATE</aetgt:mso-bpel-name>
+				</aetgt:MsoCompletionRequest>"""
+
+		String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
+
+		utils.logAudit(createDBResponse)
+		utils.logAudit(xmlMsoCompletionRequest)
+		execution.setVariable(prefix+'Success', true)
+		execution.setVariable(prefix+'CompleteMsoProcessRequest', xmlMsoCompletionRequest)
+		utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+
+	}
+
+	public void prepareFalloutHandlerRequest(Execution execution, isDebugEnabled) {
+
+		WorkflowException we = execution.getVariable('WorkflowException')
+		def errorCode = we?.getErrorCode()
+		def errorMessage = we?.getErrorMessage()
+
+		def requestId = execution.getVariable("mso-request-id")
+		def source = execution.getVariable(prefix+'source')
+
+		String falloutHandlerRequest =
+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+				                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
+				                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
+				   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+				      <request-id>${requestId}</request-id>
+				      <action>CREATE</action>
+				      <source>${source}</source>
+				   </request-info>
+					   <aetgt:WorkflowException>
+					      <aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
+					      <aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+
+				</aetgt:FalloutHandlerRequest>"""
+
+		// Format Response
+		String xmlHandlerRequest = utils.formatXml(falloutHandlerRequest)
+		utils.logAudit(xmlHandlerRequest)
+
+		execution.setVariable(prefix+'FalloutHandlerRequest', xmlHandlerRequest)
+		utils.log("ERROR", "Overall Error Response going to FalloutHandler: " + "\n" + xmlHandlerRequest, isDebugEnabled)
+	}
+
+
+	/**
+	 * Query AAI service instance
+	 * @param execution
+	 * @param isDebugEnabled
+	 */
+	public void callRESTQueryAAIServiceInstance(Execution execution, isDebugEnabled) {
+
+		def request = execution.getVariable(prefix+"Request")
+		def serviceInstanceId = utils.getNodeText1(request, "service-instance-id")
+
+		AaiUtil aaiUtil = new AaiUtil(this)
+		String aaiEndpoint = aaiUtil.getSearchNodesQueryEndpoint(execution)
+
+		def String queryAAIRequest = aaiEndpoint + "?search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId
+		utils.logAudit("AAI query service instance request: " + queryAAIRequest)
+
+		APIResponse response = aaiUtil.executeAAIGetCall(execution, queryAAIRequest)
+
+		String returnCode = response.getStatusCode()
+		String aaiResponseAsString = response.getResponseBodyAsString()
+		aaiResponseAsString = StringEscapeUtils.unescapeXml(aaiResponseAsString)
+
+		utils.logAudit("AAI query service instance return code: " + returnCode)
+		utils.logAudit("AAI query service instance response: " + aaiResponseAsString)
+
+		utils.log("DEBUG", "AAI query service instance return code: " + returnCode, isDebugEnabled)
+		utils.log("DEBUG", "AAI query service instance response: " + aaiResponseAsString, isDebugEnabled)
+
+		ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+		if (returnCode=='200') {
+			utils.log("DEBUG", 'Service instance ' + serviceInstanceId + ' found in AAI.', isDebugEnabled)
+		} else {
+			if (returnCode=='404') {
+				def message = 'Service instance ' + serviceInstanceId + ' was not found in AAI. Return code: 404.'
+				utils.log("DEBUG", message, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, message)
+			} else {
+				WorkflowException aWorkflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
+				throw new BpmnError("MSOWorkflowException")
+			}
+		}
+	}
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVnfInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVnfInfra.groovy
index 6168acd..9b7fd68 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVnfInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVnfInfra.groovy
@@ -205,76 +205,6 @@ class CreateVnfInfra extends AbstractServiceTaskProcessor {
 		utils.log("DEBUG", "*** COMPLETED CreateVnfInfra SendSyncResponse Process ***", isDebugEnabled)
 	}
 
-	public void prepareCreateGenericVnf (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " *** STARTED CreateVnfInfra PrepareCreateGenericVnf Process *** ", isDebugEnabled)
-		try {
-			//Get Vnf Info
-			String vnfId = execution.getVariable("CREVI_vnfId")
-			def vnfName = execution.getVariable("CREVI_vnfName")
-			def vnfType = execution.getVariable("CREVI_vnfType")
-			def serviceId = execution.getVariable("CREVI_serviceId")
-			def orchStatus = execution.getVariable("CREVI_orchStatus")
-			def modelInvariantId = execution.getVariable("CREVI_modelInvariantId")
-			def modelVersion = execution.getVariable("CREVI_modelVersion")
-			// TODO: 1702 Variable
-			def equipmentRole = execution.getVariable("CREVI_equipmentRole")
-
-			//Get Service Instance Info
-			def serviceInstanceId = execution.getVariable("CREVI_serviceInstanceId")
-			String siRelatedLink = execution.getVariable("GENGS_siResourceLink")
-
-			int custStart = siRelatedLink.indexOf("customer/")
-			int custEnd = siRelatedLink.indexOf("/service-subscriptions")
-			String globalCustId = siRelatedLink.substring(custStart + 9, custEnd)
-			int serviceStart = siRelatedLink.indexOf("service-subscription/")
-			int serviceEnd = siRelatedLink.indexOf("/service-instances/")
-			String serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)
-
-			//Get Namespace
-			AaiUtil aaiUtil = new AaiUtil(this)
-			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)
-			String namespace = aaiUtil.getNamespaceFromUri(aai_uri)
-
-			String payload =
-					"""<generic-vnf xmlns="${namespace}">
-				<vnf-id>${vnfId}</vnf-id>
-				<vnf-name>${vnfName}</vnf-name>
-				<service-id>${serviceId}</service-id>
-				<vnf-type>${vnfType}</vnf-type>
-				<orchestration-status>${orchStatus}</orchestration-status>
-				<persona-model-id>${modelInvariantId}</persona-model-id>
-				<persona-model-version>${modelVersion}</persona-model-version>
-				<relationship-list>
-					<relationship>
-               		<related-to>service-instance</related-to>
-               		<related-link>${siRelatedLink}</related-link>
-               		<relationship-data>
-                  		<relationship-key>customer.global-customer-id</relationship-key>
-                  		<relationship-value>${globalCustId}</relationship-value>
-              		</relationship-data>
-               		<relationship-data>
-                  		<relationship-key>service-subscription.service-type</relationship-key>
-                  		<relationship-value>${serviceType}</relationship-value>
-               		</relationship-data>
-					<relationship-data>
-                  		<relationship-key>service-instance.service-instance-id</relationship-key>
-                  		<relationship-value>${serviceInstanceId}</relationship-value>
-               		</relationship-data>
-            		</relationship>
-				</relationship-list>
-			</generic-vnf>"""
-
-			execution.setVariable("CREVI_genericVnfPayload", payload)
-
-		}catch(Exception ex) {
-			utils.log("DEBUG", "Error Occured in CreateVnfInfra PrepareCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in CreateVnfInfra PrepareCreateGenericVnf Process")
-		}
-		utils.log("DEBUG", "*** COMPLETED CreateVnfInfra PrepareCreateGenericVnf Process ***", isDebugEnabled)
-	}
 	
 	public void preProcessSDNCAssignRequest(Execution execution){
 		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DelServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericALaCarteServiceInstance.groovy
index aad0693..7555885 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DelServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericALaCarteServiceInstance.groovy
@@ -1,353 +1,353 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import groovy.xml.XmlUtil

-import groovy.json.*

-

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse;

-

-import java.util.UUID;

-import javax.xml.parsers.DocumentBuilder

-import javax.xml.parsers.DocumentBuilderFactory

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution

-import org.json.JSONObject;

-import org.apache.commons.lang3.*

-import org.apache.commons.codec.binary.Base64;

-import org.w3c.dom.Document

-import org.w3c.dom.Element

-import org.w3c.dom.Node

-import org.w3c.dom.NodeList

-import org.xml.sax.InputSource

-import static org.apache.commons.lang3.StringUtils.*;

-

-import org.springframework.web.util.UriUtils;

-

-/**

- * This groovy class supports the <class>DelServiceInstance.bpmn</class> process.

- *

- */

-public class DelServiceInstance extends AbstractServiceTaskProcessor {

-

-	String Prefix="DELSI_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils()

-	

-	public void preProcessRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		String msg = ""

-		

-		utils.log("DEBUG", " *** preProcessRequest Request *** ", isDebugEnabled)

-

-		try {

-			// check for incoming json message/input

-			String siRequest = execution.getVariable("bpmnRequest")

-			utils.logAudit(siRequest)

-			

-

-			String requestId = execution.getVariable("mso-request-id")

-			execution.setVariable("msoRequestId", requestId)

-			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)

-			

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			if (isBlank(serviceInstanceId)) {

-				msg = "Input serviceInstanceId' is null"

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			}

-		

-			//String xmlRequestDetails = vidUtils.getJsonRequestDetailstoXml(siRequest)

-			//execution.setVariable("requestDetails", xmlRequestDetails)

-			

-			//modelInfo

-			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")

-			if (isBlank(serviceModelInfo)) {

-				msg = "Input serviceModelInfo is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-			} else

-			{

-				execution.setVariable("serviceModelInfo", serviceModelInfo)

-				//utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)

-			}

-			

-			//requestInfo

-			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")

-			if (isBlank(productFamilyId))

-			{

-				msg = "Input productFamilyId is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			} else {

-				execution.setVariable("productFamilyId", productFamilyId)

-			}

-			String source = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source")

-			execution.setVariable("source", source)

-			

-			//subscriberInfo

-			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")

-			if (isBlank(globalSubscriberId)) {

-				msg = "Input globalSubscriberId' is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-			} else {

-				execution.setVariable("globalSubscriberId", globalSubscriberId)

-			}

-			

-			//requestParameters

-			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")

-			if (isBlank(subscriptionServiceType)) {

-				msg = "Input subscriptionServiceType is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			} else {

-				execution.setVariable("subscriptionServiceType", subscriptionServiceType)

-			}

-

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex){

-			msg = "Exception in preProcessRequest " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

-	}

-

-	public void sendSyncResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** sendSyncResponse  *** ", isDebugEnabled)

-

-		try {

-			String requestId = execution.getVariable("msoRequestId")

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-

-			// RESTResponse (for API Handler (APIH) Reply Task)

-			String syncResponse = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

-			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)

-			sendWorkflowResponse(execution, 202, syncResponse)

-

-		} catch (Exception ex) {

-			String msg  = "Exception in sendSyncResponse: " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)

-	}

-	

-	public void sendSyncError (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)

-

-		try {

-			String errorMessage = ""

-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

-				WorkflowException wfe = execution.getVariable("WorkflowException")

-				errorMessage = wfe.getErrorMessage()

-			} else {

-				errorMessage = "Sending Sync Error."

-			}

-

-			String buildworkflowException =

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import groovy.xml.XmlUtil
+import groovy.json.*
+
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse;
+
+import java.util.UUID;
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.json.JSONObject;
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.w3c.dom.Document
+import org.w3c.dom.Element
+import org.w3c.dom.Node
+import org.w3c.dom.NodeList
+import org.xml.sax.InputSource
+import static org.apache.commons.lang3.StringUtils.*;
+
+import org.springframework.web.util.UriUtils;
+
+/**
+ * This groovy class supports the <class>DelServiceInstance.bpmn</class> process.
+ *
+ */
+public class DeleteGenericALaCarteServiceInstance extends AbstractServiceTaskProcessor {
+
+	String Prefix="DELSI_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils()
+	
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		String msg = ""
+		
+		utils.log("DEBUG", " *** preProcessRequest Request *** ", isDebugEnabled)
+
+		try {
+			// check for incoming json message/input
+			String siRequest = execution.getVariable("bpmnRequest")
+			utils.logAudit(siRequest)
+			
+
+			String requestId = execution.getVariable("mso-request-id")
+			execution.setVariable("msoRequestId", requestId)
+			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
+			
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			if (isBlank(serviceInstanceId)) {
+				msg = "Input serviceInstanceId' is null"
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			}
+		
+			//String xmlRequestDetails = vidUtils.getJsonRequestDetailstoXml(siRequest)
+			//execution.setVariable("requestDetails", xmlRequestDetails)
+			
+			//modelInfo
+			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")
+			if (isBlank(serviceModelInfo)) {
+				msg = "Input serviceModelInfo is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+			} else
+			{
+				execution.setVariable("serviceModelInfo", serviceModelInfo)
+				//utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)
+			}
+			
+			//requestInfo
+			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")
+			if (isBlank(productFamilyId))
+			{
+				msg = "Input productFamilyId is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			} else {
+				execution.setVariable("productFamilyId", productFamilyId)
+			}
+			String source = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source")
+			execution.setVariable("source", source)
+			
+			//subscriberInfo
+			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")
+			if (isBlank(globalSubscriberId)) {
+				msg = "Input globalSubscriberId' is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+			} else {
+				execution.setVariable("globalSubscriberId", globalSubscriberId)
+			}
+			
+			//requestParameters
+			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")
+			if (isBlank(subscriptionServiceType)) {
+				msg = "Input subscriptionServiceType is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			} else {
+				execution.setVariable("subscriptionServiceType", subscriptionServiceType)
+			}
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in preProcessRequest " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+	}
+
+	public void sendSyncResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** sendSyncResponse  *** ", isDebugEnabled)
+
+		try {
+			String requestId = execution.getVariable("msoRequestId")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			// RESTResponse (for API Handler (APIH) Reply Task)
+			String syncResponse = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
+			sendWorkflowResponse(execution, 202, syncResponse)
+
+		} catch (Exception ex) {
+			String msg  = "Exception in sendSyncResponse: " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
+	}
+	
+	public void sendSyncError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)
+
+		try {
+			String errorMessage = ""
+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
+				WorkflowException wfe = execution.getVariable("WorkflowException")
+				errorMessage = wfe.getErrorMessage()
+			} else {
+				errorMessage = "Sending Sync Error."
+			}
+
+			String buildworkflowException =
 				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

-				   </aetgt:WorkflowException>"""

-

-			utils.logAudit(buildworkflowException)

-			sendWorkflowResponse(execution, 500, buildworkflowException)

-

-		} catch (Exception ex) {

-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

-		}

-

-	}

-	

-	public void prepareCompletionRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)

-

-		try {

-			String requestId = execution.getVariable("msoRequestId")

-			String source = execution.getVariable("source")

-			String msoCompletionRequest =

+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
+				   </aetgt:WorkflowException>"""
+
+			utils.logAudit(buildworkflowException)
+			sendWorkflowResponse(execution, 500, buildworkflowException)
+
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
+		}
+
+	}
+	
+	public void prepareCompletionRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)
+
+		try {
+			String requestId = execution.getVariable("msoRequestId")
+			String source = execution.getVariable("source")
+			String msoCompletionRequest =
 			"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

 								xmlns:ns="http://org.openecomp/mso/request/types/v1">

 						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-							<request-id>${requestId}</request-id>

-							<action>DELETE</action>

-							<source>${source}</source>

-			   			</request-info>

-						<aetgt:status-message>Service Instance was deleted successfully.</aetgt:status-message>

-			   			<aetgt:mso-bpel-name>DelServiceInstance</aetgt:mso-bpel-name>

-					</aetgt:MsoCompletionRequest>"""

-

-			// Format Response

-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

-

-			execution.setVariable("completionRequest", xmlMsoCompletionRequest)

-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

-

-		} catch (Exception ex) {

-			String msg = " Exception in prepareCompletion:" + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)

-	}

-	

-	public void prepareFalloutRequest(Execution execution){

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)

-

-		try {

-			WorkflowException wfex = execution.getVariable("WorkflowException")

-			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)

-			String requestId = execution.getVariable("msoRequestId")

-			String source = execution.getVariable("source")

-			String requestInfo =

+							<request-id>${requestId}</request-id>
+							<action>DELETE</action>
+							<source>${source}</source>
+			   			</request-info>
+						<aetgt:status-message>Service Instance was deleted successfully.</aetgt:status-message>
+			   			<aetgt:mso-bpel-name>DeleteGenericALaCarteServiceInstance</aetgt:mso-bpel-name>
+					</aetgt:MsoCompletionRequest>"""
+
+			// Format Response
+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
+
+			execution.setVariable("completionRequest", xmlMsoCompletionRequest)
+			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+
+		} catch (Exception ex) {
+			String msg = " Exception in prepareCompletion:" + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
+	}
+	
+	public void prepareFalloutRequest(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)
+
+		try {
+			WorkflowException wfex = execution.getVariable("WorkflowException")
+			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
+			String requestId = execution.getVariable("msoRequestId")
+			String source = execution.getVariable("source")
+			String requestInfo =
 			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					<request-id>${requestId}</request-id>

-					<action>DELETE</action>

-					<source>${source}</source>

-				   </request-info>"""

-

-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

-			execution.setVariable("falloutRequest", falloutRequest)

-		} catch (Exception ex) {

-			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)

-			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()

-			String requestId = execution.getVariable("msoRequestId")

-			String falloutRequest =

+					<request-id>${requestId}</request-id>
+					<action>DELETE</action>
+					<source>${source}</source>
+				   </request-info>"""
+
+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
+			execution.setVariable("falloutRequest", falloutRequest)
+		} catch (Exception ex) {
+			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
+			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
+			String requestId = execution.getVariable("msoRequestId")
+			String falloutRequest =
 			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

 					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

 					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

 					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>${requestId}</request-id>

-					      <action>DELETE</action>

-					      <source>VID</source>

-					   </request-info>

+					      <request-id>${requestId}</request-id>
+					      <action>DELETE</action>
+					      <source>VID</source>
+					   </request-info>
 						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>

-							<aetgt:ErrorCode>7000</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-					</aetgt:FalloutHandlerRequest>"""

-

-			execution.setVariable("falloutRequest", falloutRequest)

-		}

-		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)

-	}

-	

-

-	// *******************************

-	//     Build DB request Section

-	// *******************************

-	public void prepareDBRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-

-		try {

-			utils.log("DEBUG", " ***** Inside prepareDBRequest of DeleteServiceInstance ***** ", isDebugEnabled)

-

-			String requestId = execution.getVariable("DELSI_requestId")

-			String statusMessage = "Service Instance successfully deleted."

-

-			//TODO - verify the format for Service Instance Delete,

-			String dbRequest =

-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

-						<soapenv:Header/>

-						<soapenv:Body>

+							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+					</aetgt:FalloutHandlerRequest>"""
+
+			execution.setVariable("falloutRequest", falloutRequest)
+		}
+		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
+	}
+	
+
+	// *******************************
+	//     Build DB request Section
+	// *******************************
+	public void prepareDBRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareDBRequest of DeleteGenericALaCarteServiceInstance ***** ", isDebugEnabled)
+
+			String requestId = execution.getVariable("DELSI_requestId")
+			String statusMessage = "Service Instance successfully deleted."
+
+			//TODO - verify the format for Service Instance Delete,
+			String dbRequest =
+					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+						<soapenv:Header/>
+						<soapenv:Body>
 							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-								<requestId>${requestId}</requestId>

-								<lastModifiedBy>BPMN</lastModifiedBy>

-								<statusMessage>${statusMessage}</statusMessage>

-								<responseBody></responseBody>

-								<requestStatus>COMPLETED</requestStatus>

-								<progress>100</progress>

-							</ns:updateInfraRequest>

-						   </soapenv:Body>

-					   </soapenv:Envelope>"""

-

-		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)

-		   execution.setVariable("DELSI_createDBRequest", buildDeleteDBRequestAsString)

-		   utils.logAudit(buildDeleteDBRequestAsString)

-

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstance flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-

-		}

-

-	 }

-

-	// *******************************

-	//     Build Error Section

-	// *******************************

-	public void prepareDBRequestError (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-

-		utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteServiceInstanceInfra ***** ", isDebugEnabled)

-

-		try {

-			String requestId = execution.getVariable("DELSI_requestId")

-			String statusMessage = ""

-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

-				WorkflowException wfe = execution.getVariable("WorkflowException")

-				statusMessage = wfe.getErrorMessage()

-

-			} else {

-				statusMessage = "Encountered Error during DeleteServiceInstanceInfra proccessing. "

-			}

-

-			//TODO - verify the format for Service Instance Create,

-			String dbRequest =

-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

-						<soapenv:Header/>

-						<soapenv:Body>

+								<requestId>${requestId}</requestId>
+								<lastModifiedBy>BPMN</lastModifiedBy>
+								<statusMessage>${statusMessage}</statusMessage>
+								<responseBody></responseBody>
+								<requestStatus>COMPLETED</requestStatus>
+								<progress>100</progress>
+							</ns:updateInfraRequest>
+						   </soapenv:Body>
+					   </soapenv:Envelope>"""
+
+		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)
+		   execution.setVariable("DELSI_createDBRequest", buildDeleteDBRequestAsString)
+		   utils.logAudit(buildDeleteDBRequestAsString)
+
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in DeleteGenericALaCarteServiceInstance flow. Unexpected Error from method prepareDBRequest() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	 }
+
+	// *******************************
+	//     Build Error Section
+	// *******************************
+	public void prepareDBRequestError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteGenericALaCarteServiceInstance ***** ", isDebugEnabled)
+
+		try {
+			String requestId = execution.getVariable("DELSI_requestId")
+			String statusMessage = ""
+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
+				WorkflowException wfe = execution.getVariable("WorkflowException")
+				statusMessage = wfe.getErrorMessage()
+
+			} else {
+				statusMessage = "Encountered Error during DeleteGenericALaCarteServiceInstance proccessing. "
+			}
+
+			//TODO - verify the format for Service Instance Create,
+			String dbRequest =
+					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+						<soapenv:Header/>
+						<soapenv:Body>
 							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-								<requestId>${requestId}</requestId>

-								<lastModifiedBy>BPMN</lastModifiedBy>

-								<statusMessage>${statusMessage}</statusMessage>

-								<responseBody></responseBody>

-								<requestStatus>FAILED</requestStatus>

-							</ns:updateInfraRequest>

-						   </soapenv:Body>

-					   </soapenv:Envelope>"""

-

-		   String buildDBRequestAsString = utils.formatXml(dbRequest)

-		   execution.setVariable("DELSI_createDBInfraErrorRequest", buildDBRequestAsString)

-		   utils.logAudit(buildDBRequestAsString)

-

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstanceInfra flow. Unexpected Error from method prepareDBRequestError() - " + ex.getMessage()

-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

-

-		}

-

-	 }

-}

+								<requestId>${requestId}</requestId>
+								<lastModifiedBy>BPMN</lastModifiedBy>
+								<statusMessage>${statusMessage}</statusMessage>
+								<responseBody></responseBody>
+								<requestStatus>FAILED</requestStatus>
+							</ns:updateInfraRequest>
+						   </soapenv:Body>
+					   </soapenv:Envelope>"""
+
+		   String buildDBRequestAsString = utils.formatXml(dbRequest)
+		   execution.setVariable("DELSI_createDBInfraErrorRequest", buildDBRequestAsString)
+		   utils.logAudit(buildDBRequestAsString)
+
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in DeleteGenericALaCarteServiceInstance flow. Unexpected Error from method prepareDBRequestError() - " + ex.getMessage()
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	 }
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy
index e49de0b..108f8d3 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericMacroServiceNetworkVnf.groovy
@@ -1,468 +1,468 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import groovy.xml.XmlUtil

-import groovy.json.*

-

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse;

-

-

-import java.util.UUID;

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution

-import org.json.JSONObject;

-import org.json.JSONArray;

-import org.apache.commons.lang3.*

-import org.apache.commons.codec.binary.Base64;

-import org.springframework.web.util.UriUtils;

-

-/**

- * This groovy class supports the <class>DeleteViprAtmService.bpmn</class> process.

- *

- */

-public class DeleteGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {

-

-	String Prefix="DELVAS_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils()

-	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()

-	NetworkUtils networkUtils = new NetworkUtils()

-

-	/**

-	 * This method is executed during the preProcessRequest task of the <class>DeleteViprAtmService.bpmn</class> process.

-	 * @param execution

-	 */

-	public InitializeProcessVariables(Execution execution){

-		/* Initialize all the process variables in this block */

-

-		execution.setVariable("deleteViprAtmServiceRequest", "")

-		execution.setVariable("msoRequestId", "")

-		execution.setVariable("DELVAS_vnfsDeletedCount", 0)

-		execution.setVariable("DELVAS_vnfsCount", 0)

-		execution.setVariable("DELVAS_networksCount", 0)

-		execution.setVariable("DELVAS_networksDeletedCount", 0)

-	}

-

-	// **************************************************

-	//     Pre or Prepare Request Section

-	// **************************************************

-	/**

-	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.

-	 * @param execution

-	 */

-	public void preProcessRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-

-		utils.log("DEBUG", " ***** Inside preProcessRequest DeleteViprAtmService Request ***** ", isDebugEnabled)

-

-		try {

-			// initialize flow variables

-			InitializeProcessVariables(execution)

-

-			// check for incoming json message/input

-			String deleteViprAtmServiceRequest = execution.getVariable("bpmnRequest")

-			utils.logAudit(deleteViprAtmServiceRequest)

-			execution.setVariable("deleteViprAtmServiceRequest", deleteViprAtmServiceRequest);

-			println 'deleteViprAtmServiceRequest - ' + deleteViprAtmServiceRequest

-

-			// extract requestId

-			String requestId = execution.getVariable("mso-request-id")

-			execution.setVariable("msoRequestId", requestId)

-

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {

-				String dataErrorMessage = " Element 'serviceInstanceId' is missing. "

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-			}

-			

-			String requestAction = execution.getVariable("requestAction")

-			execution.setVariable("requestAction", requestAction)

-

-			String source = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.source")

-			if ((source == null) || (source.isEmpty())) {

-				execution.setVariable("source", "VID")

-			} else {

-				execution.setVariable("source", source)

-			}

-

-			// extract globalSubscriberId

-			String globalSubscriberId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.subscriberInfo.globalSubscriberId")

-

-			// global-customer-id is optional on Delete

-

-			execution.setVariable("globalSubscriberId", globalSubscriberId)

-			execution.setVariable("globalCustomerId", globalSubscriberId)

-			

-			String suppressRollback = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.suppressRollback")

-			execution.setVariable("disableRollback", suppressRollback)

-			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)

-			

-			String productFamilyId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestInfo.productFamilyId")

-			execution.setVariable("productFamilyId", productFamilyId)

-			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)

-			

-			// extract subscriptionServiceType

-			String subscriptionServiceType = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.requestParameters.subscriptionServiceType")

-			execution.setVariable("subscriptionServiceType", subscriptionServiceType)

-			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)

-			

-			// extract cloud configuration

-			String lcpCloudRegionId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")

-			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)

-			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)

-			String tenantId = jsonUtil.getJsonValue(deleteViprAtmServiceRequest, "requestDetails.cloudConfiguration.tenantId")

-			execution.setVariable("tenantId", tenantId)

-			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)

-

-			String sdncVersion = "1702"

-			execution.setVariable("sdncVersion", sdncVersion)

-			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)

-			

-			//For Completion Handler & Fallout Handler

-			String requestInfo =

-			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					<request-id>${requestId}</request-id>

-					<action>DELETE</action>

-					<source>${source}</source>

-				   </request-info>"""

-

-			execution.setVariable("DELVAS_requestInfo", requestInfo)

-			

-			//Setting for Generic Sub Flows

-			execution.setVariable("GENGS_type", "service-instance")

-			

-			utils.log("DEBUG", " ***** Completed preProcessRequest DeleteViprAtmService Request ***** ", isDebugEnabled)

-

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex){

-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected from method preProcessRequest() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-

-	public void sendSyncResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		utils.log("DEBUG", " ***** Inside sendSyncResponse of DeleteViprAtmService ***** ", isDebugEnabled)

-

-		try {

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			String requestId = execution.getVariable("mso-request-id")

-

-			// RESTResponse (for API Handler (APIH) Reply Task)

-			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

-

-			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)

-			sendWorkflowResponse(execution, 202, syncResponse)

-		} catch (Exception ex) {

-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-

-	public void prepareServiceInstanceDelete (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " ***** Inside prepareServiceInstanceDelete() of DeleteViprAtmService ***** ", isDebugEnabled)

-		

-		try {

-			

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			

-			// confirm if ServiceInstance was found

-			if ( !execution.getVariable("GENGS_FoundIndicator") )

-			{

-				String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Service Instance was not found in AAI by id: " + serviceInstanceId

-				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-			}

-			

-			// get variable within incoming json

-			String deleteViprAtmServiceRequest = execution.getVariable("deleteViprAtmServiceRequest");

-			

-			// get SI extracted by GenericGetService

-			String serviceInstanceAaiRecord = execution.getVariable("GENGS_service");

-			

-			utils.log("DEBUG", "serviceInstanceAaiRecord: "+serviceInstanceAaiRecord, isDebugEnabled)

-			

-			String relationship = ""

-			try {

-				relationship = networkUtils.getFirstNodeXml(serviceInstanceAaiRecord, "relationship-list")

-			} catch (Exception ex) {

-				//no relationships found

-			}

-			utils.log("DEBUG", " relationship string - " + relationship, isDebugEnabled)

-			

-			int vnfsCount = 0

-			int networksCount = 0

-			

-			if (relationship != null && relationship.length() > 0){

-				relationship = relationship.trim().replace("tag0:","").replace(":tag0","")

-				

-				// Check if Network TableREf is present, then build a List of network policy

-				List relatedVnfIdList = networkUtils.getRelatedVnfIdList(relationship)

-				vnfsCount = relatedVnfIdList.size()

-				execution.setVariable("DELVAS_vnfsCount", vnfsCount)

-				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)

-				execution.setVariable("DELVAS_relatedVnfIdList", relatedVnfIdList)

-				

-				// Check if Network TableREf is present, then build a List of network policy

-				List relatedNetworkIdList = networkUtils.getRelatedNetworkIdList(relationship)

-				networksCount = relatedNetworkIdList.size()

-				execution.setVariable("DELVAS_networksCount", networksCount)

-				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)

-				execution.setVariable("DELVAS_relatedNetworkIdList", relatedNetworkIdList)

-			} else {

-				execution.setVariable("DELVAS_vnfsCount", 0)

-				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)

-				execution.setVariable("DELVAS_networksCount", 0)

-				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)

-			}

-			

-			utils.log("DEBUG", " ***** Completed prepareServiceInstanceDelete() of DeleteViprAtmService ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			sendSyncError(execution)

-		   String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. prepareServiceInstanceDelete() - " + ex.getMessage()

-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-	

-	

-	// *******************************

-	//     

-	// *******************************

-	public void prepareVnfAndModulesDelete (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)

-

-			List vnfList = execution.getVariable("DELVAS_relatedVnfIdList")

-			Integer vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")

-			String vnfModelInfoString = ""

-			String vnfId = ""

-			if (vnfList.size() > 0 ) {

-				vnfId = vnfList.get(vnfsDeletedCount.intValue())

-			}

-							

-			execution.setVariable("vnfId", vnfId)

-			utils.log("DEBUG", "need to delete vnfId:" + vnfId, isDebugEnabled)

-

-			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstanceMacro flow. Unexpected Error from method prepareVnfAndModulesDelete() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-	

-	// *******************************

-	//     Validate Vnf request Section -> increment count

-	// *******************************

-	public void validateVnfDelete (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside validateVnfDelete of DeleteViprAtmService ***** ", isDebugEnabled)

-

-			String vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")

-			vnfsDeletedCount++

-			

-			execution.setVariable("DELVAS_vnfsDeletedCount", vnfsDeletedCount)

-			

-			utils.log("DEBUG", " ***** Completed validateVnfDelete of DeleteViprAtmService ***** "+" vnf # "+vnfsDeletedCount, isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method validateVnfDelete() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-	

-	// *******************************

-	//     Generate Network request Section

-	// *******************************

-	public void prepareNetworkDelete (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside prepareNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

-

-			List networkList = execution.getVariable("DELVAS_relatedNetworkIdList")

-			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")

-

-			String networkId = ""

-			if (networkList.size() > 0) {

-				networkId = networkList.get(networksDeletedCount.intValue())

-			}

-							

-			execution.setVariable("networkId", networkId)

-			utils.log("DEBUG", "need to delete networkId:" + networkId, isDebugEnabled)

-			

-			utils.log("DEBUG", " ***** Completed prepareNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = q"Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method prepareNetworkDelete() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-	

-	// *******************************

-	//     Validate Network request Section

-	// *******************************

-	public void validateNetworkDelete (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-

-		try {

-			utils.log("DEBUG", " ***** Inside validateNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

-

-			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")

-			networksDeletedCount++

-			

-			execution.setVariable("DELVAS_networksDeletedCount", networksDeletedCount)

-			

-			utils.log("DEBUG", " ***** Completed validateNetworkDelete of DeleteViprAtmService ***** ", isDebugEnabled)

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in DeleteViprAtmService flow. Unexpected Error from method validateNetworkDelete() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	 }

-

-	

-	// *****************************************

-	//     Prepare Completion request Section

-	// *****************************************

-	public void postProcessResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " ***** Inside postProcessResponse of DeleteViprAtmService ***** ", isDebugEnabled)

-

-		try {

-			String source = execution.getVariable("source")

-			String requestId = execution.getVariable("msoRequestId")

-

-			String msoCompletionRequest =

-					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-									xmlns:ns="http://org.openecomp/mso/request/types/v1">

-							<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-								<request-id>${requestId}</request-id>

-								<action>DELETE</action>

-								<source>${source}</source>

-							   </request-info>

-							<aetgt:status-message>vIPR ATM Service Instance has been deleted successfully.</aetgt:status-message>

-							   <aetgt:mso-bpel-name>BPMN Service Instance macro action: DELETE</aetgt:mso-bpel-name>

-						</aetgt:MsoCompletionRequest>"""

-

-			// Format Response

-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

-

-			utils.logAudit(xmlMsoCompletionRequest)

-			execution.setVariable("DELVAS_Success", true)

-			execution.setVariable("DELVAS_CompleteMsoProcessRequest", xmlMsoCompletionRequest)

-			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

-		} catch (BpmnError e) {

-		throw e;

-

-		} catch (Exception ex) {

-			// try error in method block

-			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-		}

-	}

-

-	public void prepareFalloutRequest(Execution execution){

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " *** STARTED DeleteViprAtmService prepareFalloutRequest Process *** ", isDebugEnabled)

-

-		try {

-			WorkflowException wfex = execution.getVariable("WorkflowException")

-			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)

-			String requestInfo = execution.getVariable("DELVAS_requestInfo")

-			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)

-

-			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)

-

-			execution.setVariable("DELVAS_falloutRequest", falloutRequest)

-		} catch (Exception ex) {

-			utils.log("DEBUG", "Error Occured in DeleteViprAtmService prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DeleteViprAtmService prepareFalloutRequest Process")

-		}

-		utils.log("DEBUG", "*** COMPLETED DeleteViprAtmService prepareFalloutRequest Process ***", isDebugEnabled)

-	}

-

-

-	public void sendSyncError (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG", " ***** Inside sendSyncError() of DeleteServiceInstanceInfra ***** ", isDebugEnabled)

-

-		try {

-			String errorMessage = ""

-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {

-				WorkflowException wfe = execution.getVariable("WorkflowException")

-				errorMessage = wfe.getErrorMessage()

-			} else {

-				errorMessage = "Sending Sync Error."

-			}

-

-			String buildworkflowException =

-				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

-					<aetgt:ErrorCode>7000</aetgt:ErrorCode>

-				   </aetgt:WorkflowException>"""

-

-			utils.logAudit(buildworkflowException)

-			sendWorkflowResponse(execution, 500, buildworkflowException)

-		} catch (Exception ex) {

-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)

-		}

-	}

-

-	public void processJavaException(Execution execution){

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		try{

-			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)

-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

-			execution.setVariable("DELVAS_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated

-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")

-		}catch(BpmnError b){

-			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

-			execution.setVariable("DELVAS_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated

-			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")

-		}

-		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)

-	}

-

-

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import groovy.xml.XmlUtil
+import groovy.json.*
+
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse;
+
+
+import java.util.UUID;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.json.JSONObject;
+import org.json.JSONArray;
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils;
+
+/**
+ * This groovy class supports the <class>DeleteViprAtmService.bpmn</class> process.
+ *
+ */
+public class DeleteGenericMacroServiceNetworkVnf extends AbstractServiceTaskProcessor {
+
+	String Prefix="DELVAS_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils()
+	CatalogDbUtils catalogDbUtils = new CatalogDbUtils()
+	NetworkUtils networkUtils = new NetworkUtils()
+
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>DeleteGenericMacroServiceNetworkVnf.bpmn</class> process.
+	 * @param execution
+	 */
+	public InitializeProcessVariables(Execution execution){
+		/* Initialize all the process variables in this block */
+
+		execution.setVariable("DeleteGenericMacroServiceNetworkVnfRequest", "")
+		execution.setVariable("msoRequestId", "")
+		execution.setVariable("DELVAS_vnfsDeletedCount", 0)
+		execution.setVariable("DELVAS_vnfsCount", 0)
+		execution.setVariable("DELVAS_networksCount", 0)
+		execution.setVariable("DELVAS_networksDeletedCount", 0)
+	}
+
+	// **************************************************
+	//     Pre or Prepare Request Section
+	// **************************************************
+	/**
+	 * This method is executed during the preProcessRequest task of the <class>CreateServiceInstance.bpmn</class> process.
+	 * @param execution
+	 */
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside preProcessRequest DeleteGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)
+
+		try {
+			// initialize flow variables
+			InitializeProcessVariables(execution)
+
+			// check for incoming json message/input
+			String DeleteGenericMacroServiceNetworkVnfRequest = execution.getVariable("bpmnRequest")
+			utils.logAudit(DeleteGenericMacroServiceNetworkVnfRequest)
+			execution.setVariable("DeleteGenericMacroServiceNetworkVnfRequest", DeleteGenericMacroServiceNetworkVnfRequest);
+			println 'DeleteGenericMacroServiceNetworkVnfRequest - ' + DeleteGenericMacroServiceNetworkVnfRequest
+
+			// extract requestId
+			String requestId = execution.getVariable("mso-request-id")
+			execution.setVariable("msoRequestId", requestId)
+
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			if ((serviceInstanceId == null) || (serviceInstanceId.isEmpty())) {
+				String dataErrorMessage = " Element 'serviceInstanceId' is missing. "
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+			}
+			
+			String requestAction = execution.getVariable("requestAction")
+			execution.setVariable("requestAction", requestAction)
+
+			String source = jsonUtil.getJsonValue(DeleteGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.source")
+			if ((source == null) || (source.isEmpty())) {
+				execution.setVariable("source", "VID")
+			} else {
+				execution.setVariable("source", source)
+			}
+
+			// extract globalSubscriberId
+			String globalSubscriberId = jsonUtil.getJsonValue(DeleteGenericMacroServiceNetworkVnfRequest, "requestDetails.subscriberInfo.globalSubscriberId")
+
+			// global-customer-id is optional on Delete
+
+			execution.setVariable("globalSubscriberId", globalSubscriberId)
+			execution.setVariable("globalCustomerId", globalSubscriberId)
+			
+			String suppressRollback = jsonUtil.getJsonValue(DeleteGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.suppressRollback")
+			execution.setVariable("disableRollback", suppressRollback)
+			utils.log("DEBUG", "Incoming Suppress/Disable Rollback is: " + suppressRollback, isDebugEnabled)
+			
+			String productFamilyId = jsonUtil.getJsonValue(DeleteGenericMacroServiceNetworkVnfRequest, "requestDetails.requestInfo.productFamilyId")
+			execution.setVariable("productFamilyId", productFamilyId)
+			utils.log("DEBUG", "Incoming productFamilyId is: " + productFamilyId, isDebugEnabled)
+			
+			// extract subscriptionServiceType
+			String subscriptionServiceType = jsonUtil.getJsonValue(DeleteGenericMacroServiceNetworkVnfRequest, "requestDetails.requestParameters.subscriptionServiceType")
+			execution.setVariable("subscriptionServiceType", subscriptionServiceType)
+			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)
+			
+			// extract cloud configuration
+			String lcpCloudRegionId = jsonUtil.getJsonValue(DeleteGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
+			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
+			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
+			String tenantId = jsonUtil.getJsonValue(DeleteGenericMacroServiceNetworkVnfRequest, "requestDetails.cloudConfiguration.tenantId")
+			execution.setVariable("tenantId", tenantId)
+			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)
+
+			String sdncVersion = "1707"
+			execution.setVariable("sdncVersion", sdncVersion)
+			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)
+			
+			//For Completion Handler & Fallout Handler
+			String requestInfo =
+			"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					<request-id>${requestId}</request-id>
+					<action>DELETE</action>
+					<source>${source}</source>
+				   </request-info>"""
+
+			execution.setVariable("DELVAS_requestInfo", requestInfo)
+			
+			//Setting for Generic Sub Flows
+			execution.setVariable("GENGS_type", "service-instance")
+			
+			utils.log("DEBUG", " ***** Completed preProcessRequest DeleteGenericMacroServiceNetworkVnf Request ***** ", isDebugEnabled)
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex){
+			String exceptionMessage = "Bpmn error encountered in DeleteGenericMacroServiceNetworkVnf flow. Unexpected from method preProcessRequest() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+
+	public void sendSyncResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		utils.log("DEBUG", " ***** Inside sendSyncResponse of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+		try {
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String requestId = execution.getVariable("mso-request-id")
+
+			// RESTResponse (for API Handler (APIH) Reply Task)
+			String syncResponse ="""{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+
+			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
+			sendWorkflowResponse(execution, 202, syncResponse)
+		} catch (Exception ex) {
+			String exceptionMessage = "Bpmn error encountered in DeleteGenericMacroServiceNetworkVnf flow. Unexpected from method sendSyncResponse() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+
+	public void prepareServiceInstanceDelete (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " ***** Inside prepareServiceInstanceDelete() of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		
+		try {
+			
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			
+			// confirm if ServiceInstance was found
+			if ( !execution.getVariable("GENGS_FoundIndicator") )
+			{
+				String exceptionMessage = "Bpmn error encountered in DeleteGenericMacroServiceNetworkVnf flow. Service Instance was not found in AAI by id: " + serviceInstanceId
+				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+			}
+			
+			// get variable within incoming json
+			String DeleteGenericMacroServiceNetworkVnfRequest = execution.getVariable("DeleteGenericMacroServiceNetworkVnfRequest");
+			
+			// get SI extracted by GenericGetService
+			String serviceInstanceAaiRecord = execution.getVariable("GENGS_service");
+			
+			utils.log("DEBUG", "serviceInstanceAaiRecord: "+serviceInstanceAaiRecord, isDebugEnabled)
+			
+			String relationship = ""
+			try {
+				relationship = networkUtils.getFirstNodeXml(serviceInstanceAaiRecord, "relationship-list")
+			} catch (Exception ex) {
+				//no relationships found
+			}
+			utils.log("DEBUG", " relationship string - " + relationship, isDebugEnabled)
+			
+			int vnfsCount = 0
+			int networksCount = 0
+			
+			if (relationship != null && relationship.length() > 0){
+				relationship = relationship.trim().replace("tag0:","").replace(":tag0","")
+				
+				// Check if Network TableREf is present, then build a List of network policy
+				List relatedVnfIdList = networkUtils.getRelatedVnfIdList(relationship)
+				vnfsCount = relatedVnfIdList.size()
+				execution.setVariable("DELVAS_vnfsCount", vnfsCount)
+				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)
+				execution.setVariable("DELVAS_relatedVnfIdList", relatedVnfIdList)
+				
+				// Check if Network TableREf is present, then build a List of network policy
+				List relatedNetworkIdList = networkUtils.getRelatedNetworkIdList(relationship)
+				networksCount = relatedNetworkIdList.size()
+				execution.setVariable("DELVAS_networksCount", networksCount)
+				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)
+				execution.setVariable("DELVAS_relatedNetworkIdList", relatedNetworkIdList)
+			} else {
+				execution.setVariable("DELVAS_vnfsCount", 0)
+				utils.log("DEBUG", " DELVAS_vnfsCount : " + vnfsCount, isDebugEnabled)
+				execution.setVariable("DELVAS_networksCount", 0)
+				utils.log("DEBUG", " DELVAS_networksCount : " + networksCount, isDebugEnabled)
+			}
+			
+			utils.log("DEBUG", " ***** Completed prepareServiceInstanceDelete() of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			sendSyncError(execution)
+		   String exceptionMessage = "Bpmn error encountered in DeleteGenericMacroServiceNetworkVnf flow. prepareServiceInstanceDelete() - " + ex.getMessage()
+		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+	
+	
+	// *******************************
+	//     
+	// *******************************
+	public void prepareVnfAndModulesDelete (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)
+
+			List vnfList = execution.getVariable("DELVAS_relatedVnfIdList")
+			Integer vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")
+			String vnfModelInfoString = ""
+			String vnfId = ""
+			if (vnfList.size() > 0 ) {
+				vnfId = vnfList.get(vnfsDeletedCount.intValue())
+			}
+							
+			execution.setVariable("vnfId", vnfId)
+			utils.log("DEBUG", "need to delete vnfId:" + vnfId, isDebugEnabled)
+
+			utils.log("DEBUG", " ***** Completed prepareVnfAndModulesDelete of DeleteServiceInstanceMacro ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstanceMacro flow. Unexpected Error from method prepareVnfAndModulesDelete() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+	
+	// *******************************
+	//     Validate Vnf request Section -> increment count
+	// *******************************
+	public void validateVnfDelete (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside validateVnfDelete of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			String vnfsDeletedCount = execution.getVariable("DELVAS_vnfsDeletedCount")
+			vnfsDeletedCount++
+			
+			execution.setVariable("DELVAS_vnfsDeletedCount", vnfsDeletedCount)
+			
+			utils.log("DEBUG", " ***** Completed validateVnfDelete of DeleteGenericMacroServiceNetworkVnf ***** "+" vnf # "+vnfsDeletedCount, isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in DeleteGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateVnfDelete() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+	
+	// *******************************
+	//     Generate Network request Section
+	// *******************************
+	public void prepareNetworkDelete (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareNetworkDelete of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			List networkList = execution.getVariable("DELVAS_relatedNetworkIdList")
+			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")
+
+			String networkId = ""
+			if (networkList.size() > 0) {
+				networkId = networkList.get(networksDeletedCount.intValue())
+			}
+							
+			execution.setVariable("networkId", networkId)
+			utils.log("DEBUG", "need to delete networkId:" + networkId, isDebugEnabled)
+			
+			utils.log("DEBUG", " ***** Completed prepareNetworkDelete of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = q"Bpmn error encountered in DeleteGenericMacroServiceNetworkVnf flow. Unexpected Error from method prepareNetworkDelete() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+	
+	// *******************************
+	//     Validate Network request Section
+	// *******************************
+	public void validateNetworkDelete (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+
+		try {
+			utils.log("DEBUG", " ***** Inside validateNetworkDelete of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+			Integer networksDeletedCount = execution.getVariable("DELVAS_networksDeletedCount")
+			networksDeletedCount++
+			
+			execution.setVariable("DELVAS_networksDeletedCount", networksDeletedCount)
+			
+			utils.log("DEBUG", " ***** Completed validateNetworkDelete of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in DeleteGenericMacroServiceNetworkVnf flow. Unexpected Error from method validateNetworkDelete() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	 }
+
+	
+	// *****************************************
+	//     Prepare Completion request Section
+	// *****************************************
+	public void postProcessResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " ***** Inside postProcessResponse of DeleteGenericMacroServiceNetworkVnf ***** ", isDebugEnabled)
+
+		try {
+			String source = execution.getVariable("source")
+			String requestId = execution.getVariable("msoRequestId")
+
+			String msoCompletionRequest =
+					"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+									xmlns:ns="http://org.openecomp/mso/request/types/v1">
+							<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+								<request-id>${requestId}</request-id>
+								<action>DELETE</action>
+								<source>${source}</source>
+							   </request-info>
+							<aetgt:status-message>vIPR ATM Service Instance has been deleted successfully.</aetgt:status-message>
+							   <aetgt:mso-bpel-name>BPMN Service Instance macro action: DELETE</aetgt:mso-bpel-name>
+						</aetgt:MsoCompletionRequest>"""
+
+			// Format Response
+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
+
+			utils.logAudit(xmlMsoCompletionRequest)
+			execution.setVariable("DELVAS_Success", true)
+			execution.setVariable("DELVAS_CompleteMsoProcessRequest", xmlMsoCompletionRequest)
+			utils.log("DEBUG", " SUCCESS flow, going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+		} catch (BpmnError e) {
+		throw e;
+
+		} catch (Exception ex) {
+			// try error in method block
+			String exceptionMessage = "Bpmn error encountered in DeleteServiceInstance flow. Unexpected Error from method postProcessResponse() - " + ex.getMessage()
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		}
+	}
+
+	public void prepareFalloutRequest(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " *** STARTED DeleteGenericMacroServiceNetworkVnf prepareFalloutRequest Process *** ", isDebugEnabled)
+
+		try {
+			WorkflowException wfex = execution.getVariable("WorkflowException")
+			utils.log("DEBUG", " Incoming Workflow Exception: " + wfex.toString(), isDebugEnabled)
+			String requestInfo = execution.getVariable("DELVAS_requestInfo")
+			utils.log("DEBUG", " Incoming Request Info: " + requestInfo, isDebugEnabled)
+
+			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
+
+			execution.setVariable("DELVAS_falloutRequest", falloutRequest)
+		} catch (Exception ex) {
+			utils.log("DEBUG", "Error Occured in DeleteGenericMacroServiceNetworkVnf prepareFalloutRequest Process " + ex.getMessage(), isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DeleteGenericMacroServiceNetworkVnf prepareFalloutRequest Process")
+		}
+		utils.log("DEBUG", "*** COMPLETED DeleteGenericMacroServiceNetworkVnf prepareFalloutRequest Process ***", isDebugEnabled)
+	}
+
+
+	public void sendSyncError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG", " ***** Inside sendSyncError() of DeleteServiceInstanceInfra ***** ", isDebugEnabled)
+
+		try {
+			String errorMessage = ""
+			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
+				WorkflowException wfe = execution.getVariable("WorkflowException")
+				errorMessage = wfe.getErrorMessage()
+			} else {
+				errorMessage = "Sending Sync Error."
+			}
+
+			String buildworkflowException =
+				"""<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+					<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
+					<aetgt:ErrorCode>7000</aetgt:ErrorCode>
+				   </aetgt:WorkflowException>"""
+
+			utils.logAudit(buildworkflowException)
+			sendWorkflowResponse(execution, 500, buildworkflowException)
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
+		}
+	}
+
+	public void processJavaException(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		try{
+			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
+			execution.setVariable("DELVAS_unexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Caught a Java Lang Exception")
+		}catch(BpmnError b){
+			utils.log("ERROR", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			throw b
+		}catch(Exception e){
+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
+			execution.setVariable("DELVAS_unexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildAndThrowWorkflowException(execution, 500, "Exception in processJavaException method")
+		}
+		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)
+	}
+
+
 }
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy
index 9e341da..e18af17 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteNetworkInstance.groovy
@@ -1,417 +1,417 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.bpmn.core.json.JsonUtils;

-import org.openecomp.mso.rest.APIResponse

-import java.util.UUID;

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution

-import org.apache.commons.lang3.*

-import org.apache.commons.codec.binary.Base64;

-import org.springframework.web.util.UriUtils

-import groovy.xml.XmlUtil

-import groovy.json.*

-

-public class DeleteNetworkInstance extends AbstractServiceTaskProcessor {

-	String Prefix="DELNI_"

-	String groovyClassName = "DeleteNetworkInstance"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils(this)

-	NetworkUtils networkUtils = new NetworkUtils()

-

-

-	public InitializeProcessVariables(Execution execution){

-		

-		execution.setVariable(Prefix + "Success", false)

-		

-		execution.setVariable(Prefix + "CompleteMsoProcessRequest", "")

-		execution.setVariable(Prefix + "FalloutHandlerRequest", "")

-		execution.setVariable(Prefix + "isSilentSuccess", false)

-		

-	}

-	

-	// **************************************************

-	//     Pre or Prepare Request Section

-	// **************************************************

-

-	public void preProcessRequest (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-

-		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + groovyClassName + " ***** ", isDebugEnabled)

-

-		try {

-			// initialize flow variables

-			InitializeProcessVariables(execution)

-							

-			String sdncVersion = execution.getVariable("sdncVersion")

-			if (sdncVersion == null || sdncVersion == '1610') {				

-				// 'a-la-cart' default, sdncVersion = '1610' 

-				execution.setVariable("sdncVersion", "1610")

-				String bpmnRequest = execution.getVariable("bpmnRequest")

-				// set 'disableRollback'

-				if (bpmnRequest != null) {

-					String disableRollback = jsonUtil.getJsonValue(bpmnRequest, "requestDetails.requestInfo.suppressRollback")

-					if (disableRollback != null) {

-						execution.setVariable("disableRollback", disableRollback)

-						utils.log("DEBUG", "Received 'suppressRollback': " + disableRollback , isDebugEnabled)

-					} else {

-					    execution.setVariable("disableRollback", false)

-					}

-					utils.log("DEBUG", " Set 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)

-				} else {

-					String dataErrorMessage = " Invalid 'bpmnRequest' request."

-					utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-				}

-

-			} else {

-			    // 'macro' test ONLY, sdncVersion = '1702'

-			    utils.log("DEBUG", " 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)

-			}	

-			

-			// get/set 'msoRequestId' and 'mso-request-id'

-			String requestId = execution.getVariable("msoRequestId")

-			if (requestId != null) {

-				execution.setVariable("mso-request-id", requestId)

-			} else {

-				requestId = execution.getVariable("mso-request-id")

-			}

-			execution.setVariable(Prefix + "requestId", requestId)

-			

-			// get/set 'requestId' 

-		    if (execution.getVariable("requestId") == null) {

-				execution.setVariable("requestId", requestId)

-			}

-			

-			// set action to "DELETE"

-			execution.setVariable("action", "DELETE")

-			

-			//Place holder for additional code.

-

-			// TODO ???

-			// userParams???  1) pre-loads indicator, 2) 'auto-activation'  

-			// Tag/Value parameters

-			//

-			// Map: 'networkInputParams': 'auto-activation''

-			// Sample format? 

-			// "requestParameters": {

-  			//     "userParams": [	

-            //          {

-			//	         "name": "someUserParam1",

-			//	         "value": "someValue1"

-			//          }

-            //     ]

-		    //   }

-			// 

-			// String userParams = //use json util to extract "userParams"// 

-	        // execution.setVariable("networkInputParams", userParams)

-			// else: execution.setVariable("networkInputParams", null)

-			//

-

-

-		} catch (Exception ex){

-			sendSyncError(execution)

-			String exceptionMessage = "Exception Encountered in " + groovyClassName + ", PreProcessRequest() - " + ex.getMessage()

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-

-		}

-

-	}

-

-	public void getNetworkModelInfo (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-

-		utils.log("DEBUG", " ***** Inside getNetworkModelInfo() of DeleteNetworkInstance ***** ", isDebugEnabled)

-		

-		try {

-			

-			// "networkModelInfo" is expected to be sent

-			String networkModelInfo = execution.getVariable("networkModelInfo")

-			utils.log("DEBUG", " networkModelInfo - " + networkModelInfo, isDebugEnabled)

-						 

-										 

-		} catch (Exception ex) {

-			sendSyncError(execution)

-		   String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance flow. getNetworkModelInfo() - " + ex.getMessage()

-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-			

-		}

-

-	}

-	

-	public void sendSyncResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-

-		utils.log("DEBUG", " ***** Inside sendSyncResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)

-

-		try {

-			String requestId = execution.getVariable("mso-request-id")

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-

-			// RESTResponse (for API Handler (APIH) Reply Task)

-			String deleteNetworkRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

-

-			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestRequest, isDebugEnabled)

-

-			sendWorkflowResponse(execution, 202, deleteNetworkRestRequest)

-

-		} catch (Exception ex) {

-			 // caught exception

-			String exceptionMessage = "Exception Encountered in  DeleteNetworkInstance, sendSyncResponse() - " + ex.getMessage()

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-

-		}

-

-	}

-

-	public void prepareCompletion (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-

-		utils.log("DEBUG", " ***** Inside prepareCompletion() of CreateNetworkInstance ***** ", isDebugEnabled)

-

-		try {

-

-			String requestId = execution.getVariable("mso-request-id")

-			String source = execution.getVariable(Prefix + "source")

-

-			String msoCompletionRequest =

-				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-								xmlns:ns="http://org.openecomp/mso/request/types/v1">

-						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-							<request-id>${requestId}</request-id>

-							<action>DELETE</action>

-							<source>VID</source>

-			   			</request-info>

-						<aetgt:status-message>Network has been deleted successfully.</aetgt:status-message>

-			   			<aetgt:mso-bpel-name>BPMN Network action: DELETE</aetgt:mso-bpel-name>

-					</aetgt:MsoCompletionRequest>"""

-

-				// Format Response

-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)

-

-			// normal path

-			execution.setVariable(Prefix + "CompleteMsoProcessRequest", xmlMsoCompletionRequest)

-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)

-		

-		} catch (Exception ex) {

-			String exceptionMessage = " Bpmn error encountered in CreateNetworkInstance flow. prepareCompletion() - " + ex.getMessage()

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-

-		}

-

-

-	}

-	

-	public void prepareDBRequestError (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-

-		try {

-			utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteNetworkInstance ***** ", isDebugEnabled)

-

-			WorkflowException wfe = execution.getVariable("WorkflowException")

-			String statusMessage = wfe.getErrorMessage()

-			String requestId = execution.getVariable(Prefix +"requestId")

-

-			String dbRequest =

-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

-						<soapenv:Header/>

-						<soapenv:Body>

-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-								<requestId>${requestId}</requestId>

-								<lastModifiedBy>BPMN</lastModifiedBy>

-								<statusMessage>${statusMessage}</statusMessage>

-								<responseBody></responseBody>

-								<requestStatus>FAILED</requestStatus>

-								<progress></progress>

-								<vnfOutputs>&lt;network-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"/&gt;</vnfOutputs>

-							</ns:updateInfraRequest>

-					   	</soapenv:Body>

-					   </soapenv:Envelope>"""

-

-		   execution.setVariable(Prefix + "deleteDBRequest", dbRequest)

-		   utils.log("DEBUG", " DB Adapter Request - " + "\n" + dbRequest, isDebugEnabled)

-

-		} catch (Exception ex) {

-			// caught exception

-			String exceptionMessage = "Bpmn error encountered in  DeleteNetworkInstance, prepareDBRequestError() - " + ex.getMessage()

-			logError(exceptionMessage)

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)

-

-		}

-

-	 }

-

-	// **************************************************

-	//     Post or Validate Response Section

-	// **************************************************

-

-	public void postProcessResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-	

-		utils.log("DEBUG", " ***** Inside postProcessResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)

-		

-		try {

-			if (execution.getVariable("CMSO_ResponseCode") == "200") {

-			   execution.setVariable(Prefix + "Success", true)

-			   utils.log("DEBUG", " ***** DeleteNetworkInstance Success ***** ", isDebugEnabled)

-			   //   Place holder for additional code.

-			   

-			} else {

-			   execution.setVariable(Prefix + "Success", false)

-			   utils.log("DEBUG", " ***** DeleteNetworkInstance Failed in CompletionMsoProces flow!. ***** ", isDebugEnabled)

-			

-			}   

-			

-	

-		} catch (Exception ex) {

-			String exceptionMessage = " Bpmn error encountered in DeleteNetworkInstance flow. postProcessResponse() - " + ex.getMessage()

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)

-	

-	    }

-	

-	}

-

-

-	// *******************************

-	//     Build Error Section

-	// *******************************

-

-	// Prepare for FalloutHandler

-	public void buildErrorResponse (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-

-		utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)

-

-		String dbReturnCode = execution.getVariable(Prefix + "dbReturnCode")

-		utils.log("DEBUG", " ***** DB Update Response Code  : " + dbReturnCode, isDebugEnabled)

-		utils.log("DEBUG", " ***** DB Update Response String: " + '\n' + execution.getVariable(Prefix + "deleteDBResponse"), isDebugEnabled)

-

-		String falloutHandlerRequest = ""

-		String requestId = execution.getVariable("mso-request-id")

-		String source = execution.getVariable(Prefix + "source")

-		execution.setVariable(Prefix + "Success", false)

-		try {

-			WorkflowException wfe = execution.getVariable("WorkflowException")

-			String errorCode = String.valueOf(wfe.getErrorCode())

-			String errorMessage = wfe.getErrorMessage()

-

-			falloutHandlerRequest =

-			    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>${requestId}</request-id>

-					      <action>DELETE</action>

-					      <source>${source}</source>

-					   </request-info>

-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>

-							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-					</aetgt:FalloutHandlerRequest>"""

-

-			utils.logAudit(falloutHandlerRequest)

-			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)

-			utils.log("ERROR", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)

-

-		} catch (Exception ex) {

-			// caught exception

-			String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance, buildErrorResponse() - " + ex.getMessage()

-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)

-			falloutHandlerRequest =

-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>${requestId}</request-id>

-					      <action>DELEtE</action>

-					      <source>${source}</source>

-					   </request-info>

-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>${exceptionMessage}</aetgt:ErrorMessage>

-							<aetgt:ErrorCode>9999</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-					</aetgt:FalloutHandlerRequest>"""

-			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)

-			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)

-		}

-	}

-

-

-	public void sendSyncError (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-

-		try {

-			String requestId = execution.getVariable("mso-request-id")

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-

-			// RESTResponse (for API Handler (APIH) Reply Task)

-			String deleteNetworkRestError = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()

-

-			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestError, isDebugEnabled)

-

-			sendWorkflowResponse(execution, 500, deleteNetworkRestError)

-

-		} catch (Exception ex) {

-			utils.log("DEBUG", " Sending Sync Error Activity Failed -  DeleteNetworkInstance, sendSyncError(): " + "\n" + ex.getMessage(), isDebugEnabled)

-		}

-	}

-

-	public void processJavaException(Execution execution){

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		try{

-			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)

-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)

-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)

-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated

-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")

-			

-		}catch(Exception e){

-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)

-			execution.setVariable("UnexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated

-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method")

-		}

-		utils.log("DEBUG", "Completed processJavaException Method of " + Prefix, isDebugEnabled)

-	}

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils;
+import org.openecomp.mso.rest.APIResponse
+import java.util.UUID;
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils
+import groovy.xml.XmlUtil
+import groovy.json.*
+
+public class DeleteNetworkInstance extends AbstractServiceTaskProcessor {
+	String Prefix="DELNI_"
+	String groovyClassName = "DeleteNetworkInstance"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils(this)
+	NetworkUtils networkUtils = new NetworkUtils()
+
+
+	public InitializeProcessVariables(Execution execution){
+		
+		execution.setVariable(Prefix + "Success", false)
+		
+		execution.setVariable(Prefix + "CompleteMsoProcessRequest", "")
+		execution.setVariable(Prefix + "FalloutHandlerRequest", "")
+		execution.setVariable(Prefix + "isSilentSuccess", false)
+		
+	}
+	
+	// **************************************************
+	//     Pre or Prepare Request Section
+	// **************************************************
+
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside preProcessRequest() of " + groovyClassName + " ***** ", isDebugEnabled)
+
+		try {
+			// initialize flow variables
+			InitializeProcessVariables(execution)
+							
+			String sdncVersion = execution.getVariable("sdncVersion")
+			if (sdncVersion == null || sdncVersion == '1610') {				
+				// 'a-la-cart' default, sdncVersion = '1610' 
+				execution.setVariable("sdncVersion", "1610")
+				String bpmnRequest = execution.getVariable("bpmnRequest")
+				// set 'disableRollback'
+				if (bpmnRequest != null) {
+					String disableRollback = jsonUtil.getJsonValue(bpmnRequest, "requestDetails.requestInfo.suppressRollback")
+					if (disableRollback != null) {
+						execution.setVariable("disableRollback", disableRollback)
+						utils.log("DEBUG", "Received 'suppressRollback': " + disableRollback , isDebugEnabled)
+					} else {
+					    execution.setVariable("disableRollback", false)
+					}
+					utils.log("DEBUG", " Set 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
+				} else {
+					String dataErrorMessage = " Invalid 'bpmnRequest' request."
+					utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+				}
+
+			} else {
+			    // 'macro' test ONLY, sdncVersion = '1702'
+			    utils.log("DEBUG", " 'disableRollback' : " + execution.getVariable("disableRollback") , isDebugEnabled)
+			}	
+			
+			// get/set 'msoRequestId' and 'mso-request-id'
+			String requestId = execution.getVariable("msoRequestId")
+			if (requestId != null) {
+				execution.setVariable("mso-request-id", requestId)
+			} else {
+				requestId = execution.getVariable("mso-request-id")
+			}
+			execution.setVariable(Prefix + "requestId", requestId)
+			
+			// get/set 'requestId' 
+		    if (execution.getVariable("requestId") == null) {
+				execution.setVariable("requestId", requestId)
+			}
+			
+			// set action to "DELETE"
+			execution.setVariable("action", "DELETE")
+			
+			//Place holder for additional code.
+
+			// TODO ???
+			// userParams???  1) pre-loads indicator, 2) 'auto-activation'  
+			// Tag/Value parameters
+			//
+			// Map: 'networkInputParams': 'auto-activation''
+			// Sample format? 
+			// "requestParameters": {
+  			//     "userParams": [	
+            //          {
+			//	         "name": "someUserParam1",
+			//	         "value": "someValue1"
+			//          }
+            //     ]
+		    //   }
+			// 
+			// String userParams = //use json util to extract "userParams"// 
+	        // execution.setVariable("networkInputParams", userParams)
+			// else: execution.setVariable("networkInputParams", null)
+			//
+
+
+		} catch (Exception ex){
+			sendSyncError(execution)
+			String exceptionMessage = "Exception Encountered in " + groovyClassName + ", PreProcessRequest() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void getNetworkModelInfo (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Inside getNetworkModelInfo() of DeleteNetworkInstance ***** ", isDebugEnabled)
+		
+		try {
+			
+			// "networkModelInfo" is expected to be sent
+			String networkModelInfo = execution.getVariable("networkModelInfo")
+			utils.log("DEBUG", " networkModelInfo - " + networkModelInfo, isDebugEnabled)
+						 
+										 
+		} catch (Exception ex) {
+			sendSyncError(execution)
+		   String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance flow. getNetworkModelInfo() - " + ex.getMessage()
+		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+			
+		}
+
+	}
+	
+	public void sendSyncResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside sendSyncResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+			String requestId = execution.getVariable("mso-request-id")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			// RESTResponse (for API Handler (APIH) Reply Task)
+			String deleteNetworkRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+
+			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestRequest, isDebugEnabled)
+
+			sendWorkflowResponse(execution, 202, deleteNetworkRestRequest)
+
+		} catch (Exception ex) {
+			 // caught exception
+			String exceptionMessage = "Exception Encountered in  DeleteNetworkInstance, sendSyncResponse() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	}
+
+	public void prepareCompletion (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " ***** Inside prepareCompletion() of CreateNetworkInstance ***** ", isDebugEnabled)
+
+		try {
+
+			String requestId = execution.getVariable("mso-request-id")
+			String source = execution.getVariable(Prefix + "source")
+
+			String msoCompletionRequest =
+				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+								xmlns:ns="http://org.openecomp/mso/request/types/v1">
+						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+							<request-id>${requestId}</request-id>
+							<action>DELETE</action>
+							<source>VID</source>
+			   			</request-info>
+						<aetgt:status-message>Network has been deleted successfully.</aetgt:status-message>
+			   			<aetgt:mso-bpel-name>BPMN Network action: DELETE</aetgt:mso-bpel-name>
+					</aetgt:MsoCompletionRequest>"""
+
+				// Format Response
+			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
+
+			// normal path
+			execution.setVariable(Prefix + "CompleteMsoProcessRequest", xmlMsoCompletionRequest)
+			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+		
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in CreateNetworkInstance flow. prepareCompletion() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+
+	}
+	
+	public void prepareDBRequestError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		try {
+			utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteNetworkInstance ***** ", isDebugEnabled)
+
+			WorkflowException wfe = execution.getVariable("WorkflowException")
+			String statusMessage = wfe.getErrorMessage()
+			String requestId = execution.getVariable(Prefix +"requestId")
+
+			String dbRequest =
+					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+						<soapenv:Header/>
+						<soapenv:Body>
+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+								<requestId>${requestId}</requestId>
+								<lastModifiedBy>BPMN</lastModifiedBy>
+								<statusMessage>${statusMessage}</statusMessage>
+								<responseBody></responseBody>
+								<requestStatus>FAILED</requestStatus>
+								<progress></progress>
+								<vnfOutputs>&lt;network-outputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:aetgt="http://org.openecomp/mso/infra/vnf-request/v1" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"/&gt;</vnfOutputs>
+							</ns:updateInfraRequest>
+					   	</soapenv:Body>
+					   </soapenv:Envelope>"""
+
+		   execution.setVariable(Prefix + "deleteDBRequest", dbRequest)
+		   utils.log("DEBUG", " DB Adapter Request - " + "\n" + dbRequest, isDebugEnabled)
+
+		} catch (Exception ex) {
+			// caught exception
+			String exceptionMessage = "Bpmn error encountered in  DeleteNetworkInstance, prepareDBRequestError() - " + ex.getMessage()
+			logError(exceptionMessage)
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+
+		}
+
+	 }
+
+	// **************************************************
+	//     Post or Validate Response Section
+	// **************************************************
+
+	public void postProcessResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+	
+		utils.log("DEBUG", " ***** Inside postProcessResponse() of DeleteNetworkInstance ***** ", isDebugEnabled)
+		
+		try {
+			if (execution.getVariable("CMSO_ResponseCode") == "200") {
+			   execution.setVariable(Prefix + "Success", true)
+			   utils.log("DEBUG", " ***** DeleteNetworkInstance Success ***** ", isDebugEnabled)
+			   //   Place holder for additional code.
+			   
+			} else {
+			   execution.setVariable(Prefix + "Success", false)
+			   utils.log("DEBUG", " ***** DeleteNetworkInstance Failed in CompletionMsoProces flow!. ***** ", isDebugEnabled)
+			
+			}   
+			
+	
+		} catch (Exception ex) {
+			String exceptionMessage = " Bpmn error encountered in DeleteNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+	
+	    }
+	
+	}
+
+
+	// *******************************
+	//     Build Error Section
+	// *******************************
+
+	// Prepare for FalloutHandler
+	public void buildErrorResponse (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)
+
+		String dbReturnCode = execution.getVariable(Prefix + "dbReturnCode")
+		utils.log("DEBUG", " ***** DB Update Response Code  : " + dbReturnCode, isDebugEnabled)
+		utils.log("DEBUG", " ***** DB Update Response String: " + '\n' + execution.getVariable(Prefix + "deleteDBResponse"), isDebugEnabled)
+
+		String falloutHandlerRequest = ""
+		String requestId = execution.getVariable("mso-request-id")
+		String source = execution.getVariable(Prefix + "source")
+		execution.setVariable(Prefix + "Success", false)
+		try {
+			WorkflowException wfe = execution.getVariable("WorkflowException")
+			String errorCode = String.valueOf(wfe.getErrorCode())
+			String errorMessage = wfe.getErrorMessage()
+
+			falloutHandlerRequest =
+			    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					      <request-id>${requestId}</request-id>
+					      <action>DELETE</action>
+					      <source>${source}</source>
+					   </request-info>
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+					</aetgt:FalloutHandlerRequest>"""
+
+			utils.logAudit(falloutHandlerRequest)
+			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)
+			utils.log("ERROR", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
+
+		} catch (Exception ex) {
+			// caught exception
+			String exceptionMessage = "Bpmn error encountered in DeleteNetworkInstance, buildErrorResponse() - " + ex.getMessage()
+			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+			falloutHandlerRequest =
+			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					      <request-id>${requestId}</request-id>
+					      <action>DELEtE</action>
+					      <source>${source}</source>
+					   </request-info>
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+							<aetgt:ErrorMessage>${exceptionMessage}</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>9999</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+					</aetgt:FalloutHandlerRequest>"""
+			execution.setVariable(Prefix + "FalloutHandlerRequest", falloutHandlerRequest)
+			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
+		}
+	}
+
+
+	public void sendSyncError (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+
+		try {
+			String requestId = execution.getVariable("mso-request-id")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			// RESTResponse (for API Handler (APIH) Reply Task)
+			String deleteNetworkRestError = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
+
+			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + deleteNetworkRestError, isDebugEnabled)
+
+			sendWorkflowResponse(execution, 500, deleteNetworkRestError)
+
+		} catch (Exception ex) {
+			utils.log("DEBUG", " Sending Sync Error Activity Failed -  DeleteNetworkInstance, sendSyncError(): " + "\n" + ex.getMessage(), isDebugEnabled)
+		}
+	}
+
+	public void processJavaException(Execution execution){
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		try{
+			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
+			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
+			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
+			
+		}catch(Exception e){
+			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
+			execution.setVariable("UnexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
+			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method")
+		}
+		utils.log("DEBUG", "Completed processJavaException Method of " + Prefix, isDebugEnabled)
+	}
+
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
index 2d5ddf0..d221d06 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
@@ -1,37 +1,37 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.infrastructure.scripts;

+package org.openecomp.mso.bpmn.infrastructure.scripts;
 
 import groovy.xml.XmlUtil
 import groovy.json.*
-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AaiUtil

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse;

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse;
+import org.openecomp.mso.rest.RESTClient
+import org.openecomp.mso.rest.RESTConfig
 
 import java.util.HashMap;
 import java.util.Map;
@@ -322,7 +322,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 		String networkInputs  = execution.getVariable(Prefix + "networkInputs")
 		String networkName   = utils.getNodeText1(networkInputs, "network-name")
 		networkName = UriUtils.encode(networkName,"UTF-8")
-		String messageId = execution.getVariable("messageId")
 
 		// Prepare AA&I url with network-name
 		String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -333,14 +332,8 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 		execution.setVariable(Prefix + "queryNameAAIRequest", queryAAINameRequest)
 		utils.log("DEBUG", Prefix + "queryNameAAIRequest - " + "\n" + queryAAINameRequest, isDebugEnabled)
 
-		RESTConfig config = new RESTConfig(queryAAINameRequest);
-
 		try {
-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-													  .addHeader("X-FromAppId", "MSO")
-													  .addHeader("Content-Type", "application/xml")
-													  .addHeader("Accept","application/xml");
-			APIResponse response = client.get()
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryAAINameRequest)
 			String returnCode = response.getStatusCode()
 			execution.setVariable(Prefix + "aaiNameReturnCode", returnCode)
 			utils.log("DEBUG", " ***** AAI Query Name Response Code  : " + returnCode, isDebugEnabled)
@@ -483,7 +476,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			execution.setVariable(Prefix + "networkName", networkName)
 			
 			networkId = UriUtils.encode(networkId,"UTF-8")
-			String messageId = execution.getVariable(Prefix + "messageId")
 
 			// Prepare AA&I url
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -494,12 +486,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			execution.setVariable(Prefix + "queryIdAAIRequest", queryIdAAIRequest)
 			utils.log("DEBUG", Prefix + "queryIdAAIRequest - " + "\n" + queryIdAAIRequest, isDebugEnabled)
 
-			RESTConfig config = new RESTConfig(queryIdAAIRequest);
-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-													  .addHeader("X-FromAppId", "MSO")
-													  .addHeader("Content-Type", "application/xml")
-													  .addHeader("Accept","application/xml");
-			APIResponse response = client.get()
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryIdAAIRequest)
 			String returnCode = response.getStatusCode()
 			execution.setVariable(Prefix + "aaiIdReturnCode", returnCode)
 
@@ -562,7 +549,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			String networkId   = execution.getVariable(Prefix + "networkId")
 			String netId = networkId 
 			networkId = UriUtils.encode(networkId,"UTF-8")
-			String messageId = execution.getVariable(Prefix + "messageId")
 
 			// Prepare AA&I url
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -573,12 +559,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			execution.setVariable(Prefix + "requeryIdAAIRequest", requeryIdAAIRequest)
 			utils.log("DEBUG", Prefix + "requeryIdAAIRequest - " + "\n" + requeryIdAAIRequest, isDebugEnabled)
 
-			RESTConfig config = new RESTConfig(requeryIdAAIRequest);
-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-													  .addHeader("X-FromAppId", "MSO")
-													  .addHeader("Content-Type", "application/xml")
-													  .addHeader("Accept","application/xml");
-			APIResponse response = client.get()
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, requeryIdAAIRequest)
 			String returnCode = response.getStatusCode()
 			execution.setVariable(Prefix + "aaiRequeryIdReturnCode", returnCode)
 			utils.log("DEBUG", " ***** AAI ReQuery Response Code  : " + returnCode, isDebugEnabled)
@@ -642,7 +623,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 		try {
 
 			// get variables
-			String messageId = execution.getVariable(Prefix + "messageId")
 			String queryIdAAIResponse   = execution.getVariable(Prefix + "queryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
 			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
 			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
@@ -693,12 +673,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 					execution.setVariable(Prefix + "queryVpnBindingAAIRequest", queryVpnBindingAAIRequest)
 					utils.log("DEBUG", Prefix + "queryVpnBindingAAIRequest, , vpnBinding #" + counting + " : " + "\n" + queryVpnBindingAAIRequest, isDebugEnabled)
 
-					RESTConfig config = new RESTConfig(queryVpnBindingAAIRequest);
-					RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-															  .addHeader("X-FromAppId", "MSO")
-															  .addHeader("Content-Type", "application/xml")
-															  .addHeader("Accept","application/xml");
-					APIResponse response = client.get()
+					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryVpnBindingAAIRequest)
 					String returnCode = response.getStatusCode()
 					execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", returnCode)
 					utils.log("DEBUG", " ***** AAI query vpn binding Response Code, vpnBinding #" + counting + " : " + returnCode, isDebugEnabled)
@@ -747,7 +722,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 				// reset return code to success
 				execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")
 			    String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 			    String aaiStubResponse =
 					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
 							<vpn-binding xmlns="${schemaVersion}">
@@ -781,7 +756,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 
 		try {
 			// get variables
-			String messageId = execution.getVariable(Prefix + "messageId")
 			String queryIdAAIResponse   = execution.getVariable(Prefix + "queryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
 			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
 			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
@@ -835,12 +809,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 					execution.setVariable(Prefix + "queryNetworkPolicyAAIRequest", queryNetworkPolicyAAIRequest)
 					utils.log("DEBUG", Prefix + "queryNetworkPolicyAAIRequest, , NetworkPolicy #" + counting + " : " + "\n" + queryNetworkPolicyAAIRequest, isDebugEnabled)
 
-					RESTConfig config = new RESTConfig(queryNetworkPolicyAAIRequest);
-					RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-															  .addHeader("X-FromAppId", "MSO")
-															  .addHeader("Content-Type", "application/xml")
-															  .addHeader("Accept","application/xml");
-					APIResponse response = client.get()
+					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkPolicyAAIRequest)
 					String returnCode = response.getStatusCode()
 					execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", returnCode)
 					utils.log("DEBUG", " ***** AAI query network policy Response Code, NetworkPolicy #" + counting + " : " + returnCode, isDebugEnabled)
@@ -889,7 +858,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 				// reset return code to success
 				execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
 				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 				String aaiStubResponse =
 					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
 							<network-policy xmlns="${schemaVersion}">
@@ -923,7 +892,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 
 		try {
 			// get variables
-			String messageId = execution.getVariable(Prefix + "messageId")
 			String queryIdAAIResponse   = execution.getVariable(Prefix + "queryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
 			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
 			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
@@ -977,12 +945,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 					execution.setVariable(Prefix + "queryNetworkTableRefAAIRequest", queryNetworkTableRefAAIRequest)
 					utils.log("DEBUG", Prefix + "queryNetworkTableRefAAIRequest, , NetworkTableRef #" + counting + " : " + "\n" + queryNetworkTableRefAAIRequest, isDebugEnabled)
 
-					RESTConfig config = new RESTConfig(queryNetworkTableRefAAIRequest);
-					RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-															  .addHeader("X-FromAppId", "MSO")
-															  .addHeader("Content-Type", "application/xml")
-															  .addHeader("Accept","application/xml");
-					APIResponse response = client.get()
+					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkTableRefAAIRequest)
 					String returnCode = response.getStatusCode()
 					execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", returnCode)
 					utils.log("DEBUG", " ***** AAI query network Table Reference Response Code, NetworkTableRef #" + counting + " : " + returnCode, isDebugEnabled)
@@ -1031,7 +994,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 				// reset return code to success
 				execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
 				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 				String aaiStubResponse =
 					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
 							<route-table-references xmlns="${schemaVersion}">
@@ -1070,7 +1033,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			networkId = UriUtils.encode(networkId,"UTF-8")
 			String requeryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse")
 			String createNetworkResponse   = execution.getVariable(Prefix + "createNetworkResponse")
-			String messageId = execution.getVariable(Prefix + "messageId")
 
 			// Prepare url
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -1083,7 +1045,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			utils.log("DEBUG", Prefix + "updateContrailAAIUrlRequest - " + "\n" + updateContrailAAIUrlRequest, isDebugEnabled)
 
 			//Prepare payload (PUT)
-			String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+			String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 			String payload = networkUtils.ContrailNetworkCreatedUpdate(requeryIdAAIResponse, createNetworkResponse, schemaVersion)
 			String payloadXml = utils.formatXml(payload)
 			utils.logAudit(payloadXml)
@@ -1096,7 +1058,6 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", returnCode)
 			utils.log("DEBUG", " ***** AAI Update Contrail Response Code  : " + returnCode, isDebugEnabled)
 			String aaiUpdateContrailResponseAsString = response.getResponseBodyAsString()
-
 			if (returnCode=='200') {
 				utils.logAudit(aaiUpdateContrailResponseAsString)
 				execution.setVariable(Prefix + "updateContrailAAIResponse", aaiUpdateContrailResponseAsString)
@@ -1125,7 +1086,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 							// aai all errors
 							String errorMessage = "Unexpected Response from UpdateContrailAAINetwork - " + returnCode
 							utils.log("DEBUG", errorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, "2500", errorMessage)
+							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
 					  }
 				}
 			}
@@ -1153,7 +1114,7 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			// get variables
 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId == null) {
-				requestId = execution.getVariable("mso-request-id") 

+				requestId = execution.getVariable("mso-request-id") 
 			}
 			String messageId = execution.getVariable(Prefix + "messageId")
 			String source    = execution.getVariable(Prefix + "source")
@@ -1200,12 +1161,12 @@ public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
 			String networkId = execution.getVariable(Prefix + "networkId")
 			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
 
-			// get/set 'msoRequestId' and 'mso-request-id'

+			// get/set 'msoRequestId' and 'mso-request-id'
 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)

+				execution.setVariable("mso-request-id", requestId)
 			} else {
-			    requestId = execution.getVariable("mso-request-id")

+			    requestId = execution.getVariable("mso-request-id")
 			} 	
 			execution.setVariable(Prefix + "requestId", requestId)
 			
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
index e6276a8..9f28db7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
@@ -1,39 +1,39 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.infrastructure.scripts;

+package org.openecomp.mso.bpmn.infrastructure.scripts;
 
 import static org.apache.commons.lang3.StringUtils.*;
 import groovy.xml.XmlUtil
 import groovy.json.*
 
-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AaiUtil

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.RollbackData

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse;

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.RollbackData
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse;
+import org.openecomp.mso.rest.RESTClient
+import org.openecomp.mso.rest.RESTConfig
 
 import java.util.UUID;
 
@@ -134,14 +134,14 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
 			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
 
-			String personaModelId = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantId")
-			String personaModelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")
+			String modelInvariantId = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantId")
+			String modelVersionId = jsonUtil.getJsonValue(serviceModelInfo, "modelVersionId")
 			
-			if (personaModelId == null) {
-				personaModelId = ""
+			if (modelInvariantId == null) {
+				modelInvariantId = ""
 			}
-			if (personaModelVersion == null) {
-				personaModelVersion = ""
+			if (modelVersionId == null) {
+				modelVersionId = ""
 			}
 			if (serviceInstanceName == null) {
 				execution.setVariable("serviceInstanceName", "")
@@ -155,9 +155,9 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 			String serviceInstanceData =
 					"""<service-instance xmlns=\"${namespace}\">
 					<service-instance-name>${serviceInstanceName}</service-instance-name>
-					<orchestration-status>active</orchestration-status>
-				    <persona-model-id>${personaModelId}</persona-model-id>
-				    <persona-model-version>${personaModelVersion}</persona-model-version>
+					<orchestration-status>Active</orchestration-status>
+				    <model-invariant-id>${modelInvariantId}</model-invariant-id>
+				    <model-version-id>${modelVersionId}</model-version-id>
 					</service-instance>""".trim()
 
 			execution.setVariable("serviceInstanceData", serviceInstanceData)
@@ -362,9 +362,9 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 			}
 
 			String sdncAssignRequest =
-					"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+					"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
 				   <sdncadapter:RequestHeader>
 							<sdncadapter:RequestId>${sdncRequestId}</sdncadapter:RequestId>
 							<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>
@@ -406,12 +406,14 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 			utils.logAudit("sdncAssignRequest:  " + sdncAssignRequest)
 
 			def sdncRequestId2 = UUID.randomUUID().toString()
-			String sdncRollbackRequest = sdncAssignRequest.replace(">assign<", ">delete<").replace(">CreateServiceInstance<", ">DeleteServiceInstance<").replace(">${sdncRequestId}<", ">${sdncRequestId2}<")
+			String sdncDelete = sdncAssignRequest.replace(">assign<", ">delete<").replace(">CreateServiceInstance<", ">DeleteServiceInstance<").replace(">${sdncRequestId}<", ">${sdncRequestId2}<")
+			def sdncRequestId3 = UUID.randomUUID().toString()
+			String sdncDeactivate = sdncDelete.replace(">delete<", ">deactivate<").replace(">${sdncRequestId2}<", ">${sdncRequestId3}<")
 			def rollbackData = execution.getVariable("rollbackData")
-			rollbackData.put("SERVICEINSTANCE", "sdncRollbackRequest", sdncRollbackRequest)
+			rollbackData.put("SERVICEINSTANCE", "sdncDeactivate", sdncDeactivate)
+			rollbackData.put("SERVICEINSTANCE", "sdncDelete", sdncDelete)
 			execution.setVariable("rollbackData", rollbackData)
 			
-			utils.log("DEBUG","sdncRollbackRequest:\n" + sdncRollbackRequest, isDebugEnabled)
 			utils.log("DEBUG","rollbackData:\n" + rollbackData.toString(), isDebugEnabled)
 
 		} catch (BpmnError e) {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
index 1e6541e..0e9fd7f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstanceRollback.groovy
@@ -106,8 +106,12 @@ public class DoCreateServiceInstanceRollback extends AbstractServiceTaskProcesso
 						execution.setVariable("skipRollback", true)

 					}

 

-					def sdncRollbackRequest = rollbackData.get("SERVICEINSTANCE", "sdncRollbackRequest")

-					execution.setVariable("sdncRollbackRequest", sdncRollbackRequest)

+					def sdncDelete = rollbackData.get("SERVICEINSTANCE", "sdncDelete")

+					execution.setVariable("sdncDelete", sdncDelete)

+					def sdncDeactivate = rollbackData.get("SERVICEINSTANCE", "sdncDeactivate")

+					execution.setVariable("sdncDeactivate", sdncDeactivate)

+					utils.log("DEBUG","sdncDeactivate:\n" + sdncDeactivate, isDebugEnabled)

+					utils.log("DEBUG","sdncDelete:\n" + sdncDelete, isDebugEnabled)

 				}

 				else {

 					execution.setVariable("skipRollback", true)

@@ -131,31 +135,33 @@ public class DoCreateServiceInstanceRollback extends AbstractServiceTaskProcesso
 		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

 	}

 

-	public void validateSDNCResponse(Execution execution) {

+	public void validateSDNCResponse(Execution execution, String response, String method) {

 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

 		utils.log("DEBUG"," ***** validateSDNCResponse ***** ", isDebugEnabled)

 		String msg = ""

 		try {

 			WorkflowException workflowException = execution.getVariable("WorkflowException")

-

 			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

-			String response = execution.getVariable("sdncAdapterResponse")

-

+			utils.log("DEBUG", "SDNCResponse: " + response, isDebugEnabled)

+			utils.log("DEBUG", "workflowException: " + workflowException, isDebugEnabled)

+			

 			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

 			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

 

 			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){

-				utils.log("DEBUG", "SDNC Adapter for service-instance delete for rollback successful. response", isDebugEnabled)

+				msg = "SDNC Adapter service-instance rollback successful for " + method

+				utils.log("DEBUG", msg, isDebugEnabled)

 			}else{

 				execution.setVariable("rolledBack", false)

-				execution.setVariable("rollbackError", "Error Response from SDNC Adapter for service-instance delete for rollback")

-				utils.log("DEBUG","Error Response from SDNC Adapter for service-instance delete for rollback", isDebugEnabled)

+				msg =  "Error Response from SDNC Adapter service-instance rollback for " + method

+				execution.setVariable("rollbackError", msg)

+				utils.log("DEBUG", msg, isDebugEnabled)

 				throw new BpmnError("MSOWorkflowException")

 			}

 		} catch (BpmnError e) {

 			throw e;

 		} catch (Exception ex){

-			msg = "Exception in Create ServiceInstance Rollback validateSDNCResponse " + ex.getMessage()

+			msg = "Exception in Create ServiceInstance rollback for "  + method  + " Exception:" + ex.getMessage()

 			utils.log("DEBUG", msg, isDebugEnabled)

 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

 		}

@@ -187,7 +193,7 @@ public class DoCreateServiceInstanceRollback extends AbstractServiceTaskProcesso
 			utils.log("DEBUG","*** Exit postProcessRequest ***", isDebugEnabled)

 

 		} catch (BpmnError e) {

-			msg = "Exception in Create ServiceInstance Rollback postProcessRequest. " + ex.getMessage()

+			msg = "Exception in Create ServiceInstance Rollback postProcessRequest. " + e.getMessage()

 			utils.log("DEBUG", msg, isDebugEnabled)

 		} catch (Exception ex) {

 			msg = "Exception in Create ServiceInstance Rollback postProcessRequest. " + ex.getMessage()

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy
index 269cb80..1fd5ab0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModule.groovy
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-

+
 package org.openecomp.mso.bpmn.infrastructure.scripts;
-

-import javax.xml.parsers.DocumentBuilder

-import javax.xml.parsers.DocumentBuilderFactory

-

+
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
+
 import org.apache.commons.lang3.*
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
@@ -37,15 +37,15 @@ import org.openecomp.mso.bpmn.core.json.JsonUtils
 import org.openecomp.mso.rest.APIResponse
 import org.openecomp.mso.rest.RESTClient
 import org.openecomp.mso.rest.RESTConfig
-import org.springframework.web.util.UriUtils

-import org.w3c.dom.Document

-import org.w3c.dom.Element

-import org.w3c.dom.NamedNodeMap

-import org.w3c.dom.Node

+import org.springframework.web.util.UriUtils
+import org.w3c.dom.Document
+import org.w3c.dom.Element
+import org.w3c.dom.NamedNodeMap
+import org.w3c.dom.Node
 import org.w3c.dom.NodeList
-import org.xml.sax.InputSource

-

-

+import org.xml.sax.InputSource
+
+
 
 public class DoCreateVfModule extends VfModuleBase {
 
@@ -140,7 +140,7 @@ public class DoCreateVfModule extends VfModuleBase {
 				def requestId = execution.getVariable("msoRequestId")
 				execution.setVariable("DCVFM_requestId", requestId)
 				logDebug("requestId: " + requestId, isDebugLogEnabled)
-				// Set mso-request-id to request-id for VNF Adapter interface				
+				// Set mso-request-id to request-id for VNF Adapter interface
 				execution.setVariable("mso-request-id", requestId)
 				//serviceId
 				def serviceId = execution.getVariable("serviceId")
@@ -175,7 +175,7 @@ public class DoCreateVfModule extends VfModuleBase {
 				//personaModelId
 				execution.setVariable("DCVFM_personaModelId", jsonUtil.getJsonValue(vfModuleModelInfo, "modelInvariantId"))
 				//personaModelVersion
-				execution.setVariable("DCVFM_personaModelVersion", jsonUtil.getJsonValue(vfModuleModelInfo, "modelVersion"))
+				execution.setVariable("DCVFM_personaModelVersion", jsonUtil.getJsonValue(vfModuleModelInfo, "modelVersionId"))
 				//vfModuleLabel
 				def vfModuleLabel = execution.getVariable("vfModuleLabel")
 				if (vfModuleLabel != null) {
@@ -665,7 +665,7 @@ public class DoCreateVfModule extends VfModuleBase {
 			
 			String uuid = execution.getVariable('testReqId') // for junits
 			if(uuid==null){
-				uuid = execution.getVariable("mso-request-id") + "-" + System.currentTimeMillis()
+				uuid = execution.getVariable("mso-request-id") + "-" +  System.currentTimeMillis()
 			}
 					
 			def callbackUrl = execution.getVariable("DCVFM_sdncCallbackUrl")
@@ -680,6 +680,14 @@ public class DoCreateVfModule extends VfModuleBase {
 			else {
 				svcInstId = serviceInstanceId
 			}
+			
+			def msoAction = ""
+			if (!sdncVersion.equals("1707")) {
+				msoAction = "mobility"
+			}
+			else {
+				msoAction = "vfmodule"
+			}
 			// For VNF, serviceOperation (URI for topology GET) will be retrieved from "selflink" element 
 			// in the response from GenericGetVnf
 			// For VF Module, in 1707 serviceOperation will be retrieved from "object-path" element
@@ -723,7 +731,7 @@ public class DoCreateVfModule extends VfModuleBase {
 					<sdncadapter:SvcAction>query</sdncadapter:SvcAction>
 					<sdncadapter:SvcOperation>${serviceOperation}</sdncadapter:SvcOperation>
 					<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
-					<sdncadapter:MsoAction>mobility</sdncadapter:MsoAction>
+					<sdncadapter:MsoAction>${msoAction}</sdncadapter:MsoAction>
 				</sdncadapter:RequestHeader>
 					<sdncadapterworkflow:SDNCRequestData></sdncadapterworkflow:SDNCRequestData>
 				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
@@ -902,13 +910,13 @@ public class DoCreateVfModule extends VfModuleBase {
 			def requestId = execution.getVariable("mso-request-id")
 
 			if (requestId == null) {
-				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request has no mso-request-id")

+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request has no mso-request-id")
 			}
 
 			def serviceInstanceId = execution.getVariable("mso-service-instance-id")
 
 			if (serviceInstanceId == null) {
-				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")

+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, processKey + " request message has no mso-service-instance-id")
 			}
 
 			utils.logContext(requestId, serviceInstanceId)
@@ -1014,9 +1022,9 @@ public class DoCreateVfModule extends VfModuleBase {
 		if (!sdncVersion.equals("1707")) {
 
 			sdncRequest =
-        """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                                                    xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                                                    xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+		"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
 	   <sdncadapter:RequestHeader>
 				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
 				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
@@ -1057,14 +1065,14 @@ public class DoCreateVfModule extends VfModuleBase {
 		else {	
 			
 			sdncRequest =
-        """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-                                                    xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-                                                    xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
 	   <sdncadapter:RequestHeader>
 				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
 				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
 				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
-				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+				<sdncadapter:SvcOperation>vf-module-topology-operation</sdncadapter:SvcOperation>
 				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
 				<sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>
 		</sdncadapter:RequestHeader>
@@ -1081,10 +1089,7 @@ public class DoCreateVfModule extends VfModuleBase {
 			${serviceEcompModelInformation}
 			<service-instance-id>${svcInstId}</service-instance-id>
 			<global-customer-id>${globalSubscriberId}</global-customer-id>			
-		</service-information>
-		<vnf-request-information>
-			<vnf-type>${vfModuleModelName}</vnf-type>
-		</vnf-request-information>
+		</service-information>		
 		<vnf-information>
 			<vnf-id>${vnfId}</vnf-id>
 			<vnf-type>${vnfType}</vnf-type>
@@ -1095,11 +1100,10 @@ public class DoCreateVfModule extends VfModuleBase {
 			<vf-module-type>${vfModuleModelName}</vf-module-type>
 			${vfModuleEcompModelInformation}			
 		</vf-module-information>
-		<vf-module-request-input>
-			<request-version>${sdncVersion}</request-version>
+		<vf-module-request-input>			
 			<vf-module-name>${vfModuleName}</vf-module-name>
 			<tenant>${tenantId}</tenant>
-			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>				
+			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>			
 		${sdncVNFParamsXml}
 		</vf-module-request-input>
 	  </sdncadapterworkflow:SDNCRequestData>
@@ -1108,9 +1112,9 @@ public class DoCreateVfModule extends VfModuleBase {
 			
 			/*
 			sdncRequest =
-			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
 	   <sdncadapter:RequestHeader>
 				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
 				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
@@ -1142,8 +1146,7 @@ public class DoCreateVfModule extends VfModuleBase {
 			<vf-module-type>${vfModuleModelName}</vf-module-type>
 			${vfModuleEcompModelInformation}			
 		</vf-module-information>
-		<vf-module-request-input>
-			<request-version>${sdncVersion}</request-version>
+		<vf-module-request-input>			
 			<vf-module-name>${vfModuleName}</vf-module-name>
 			<tenant>${tenantId}</tenant>
 			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>				
@@ -1662,7 +1665,7 @@ public class DoCreateVfModule extends VfModuleBase {
 						   def networkPolicyId = UUID.randomUUID().toString()
 						   logDebug("Adding network-policy with network-policy-id " + networkPolicyId, isDebugLogEnabled)
 
-						   String aaiNamespace = aaiUriUtil.getNamespaceFromUri(aai_uri)
+						   String aaiNamespace = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 						   logDebug('AAI namespace is: ' + aaiNamespace, isDebugLogEnabled)
 						   String payload = """<network-policy xmlns="${aaiNamespace}">
 							   	<network-policy-id>${networkPolicyId}</network-policy-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy
index 8ca749d..af1161b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleRollback.groovy
@@ -1,33 +1,33 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-
-package org.openecomp.mso.bpmn.infrastructure.scripts

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse
+import org.springframework.web.util.UriUtils
 
 
 
@@ -72,7 +72,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		execution.setVariable("DCVFMR_cloudSiteId", cloudSiteId)
 		String heatStackId = rollbackData.get("VFMODULE", "heatstackid")
 		execution.setVariable("DCVFMR_heatStackId", heatStackId)
-		String requestId = rollbackData.get("VFMODULE", "msorequestid")

+		String requestId = rollbackData.get("VFMODULE", "attmsorequestid")
 		execution.setVariable("DCVFMR_requestId", requestId)
 		List createdNetworkPolicyFqdnList = []
 		int i = 0
@@ -92,7 +92,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		execution.setVariable("DCVFMR_oamManagementV4Address", oamManagementV4Address)
 		String oamManagementV6Address = rollbackData.get("VFMODULE", "oamManagementV6Address")
 		execution.setVariable("DCVFMR_oamManagementV6Address", oamManagementV6Address)
-		//String serviceInstanceId = rollbackData.get("VFMODULE", "msoserviceinstanceid")

+		//String serviceInstanceId = rollbackData.get("VFMODULE", "attmsoserviceinstanceid")
 		//execution.setVariable("DCVFMR_serviceInstanceId", serviceInstanceId)
 		execution.setVariable("DCVFMR_rollbackPrepareUpdateVfModule", rollbackData.get("VFMODULE", "rollbackPrepareUpdateVfModule"))
 		execution.setVariable("DCVFMR_rollbackUpdateAAIVfModule", rollbackData.get("VFMODULE", "rollbackUpdateAAIVfModule"))
@@ -159,9 +159,9 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 			return
 
 
-		String request = """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

-												xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-												xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

+		String request = """<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
 						      <sdncadapter:RequestHeader>
 						         <sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
 						         <sdncadapter:SvcInstanceId>${vfModuleId}</sdncadapter:SvcInstanceId>
@@ -214,7 +214,7 @@ public class DoCreateVfModuleRollback extends AbstractServiceTaskProcessor{
 		String vfModuleId = execution.getVariable("DCVFMR_vfModuleId")
 		String vfModuleStackId = execution.getVariable("DCVFMR_heatStackId")
 		String tenantId = execution.getVariable("DCVFMR_tenantId")
-		def messageId = execution.getVariable('mso-request-id') + '-' +

+		def messageId = execution.getVariable('mso-request-id') + '-' +
 			System.currentTimeMillis()
 		def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)
 		def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV1.groovy
index f54fa5c..8e54024 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV1.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV1.groovy
@@ -303,7 +303,7 @@ class DoCreateVfModuleVolumeV1 extends VfModuleBase {
 		def vnfId = utils.getNodeText1(aaiGenericVnfResponse, 'vnf-id')
 		def vnfName = utils.getNodeText1(aaiGenericVnfResponse, 'vnf-name')
 		def modelCustomizationId = getNodeTextForce(volumeRequest, "model-customization-id")
-		
+				
 		String messageId = UUID.randomUUID()
 		utils.log("DEBUG", "messageId to be used is generated: " + messageId, isDebugEnabled)
 
@@ -502,6 +502,9 @@ class DoCreateVfModuleVolumeV1 extends VfModuleBase {
 		utils.logAudit("AAI query generic vnf return code: " + returnCode)
 		utils.logAudit("AAI query generic vnf response: " + aaiResponseAsString)
 
+		//utils.log("DEBUG", "AAI query generic vnf return code: " + returnCode, isDebugEnabled)
+		//utils.log("DEBUG", "AAI query generic vnf response: " + aaiResponseAsString, isDebugEnabled)
+		
 		ExceptionUtil exceptionUtil = new ExceptionUtil()
 		
 		if (returnCode=='200') {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy
index 55d56a6..8a6cac4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnf.groovy
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- */

+ */
 package org.openecomp.mso.bpmn.infrastructure.scripts
-

+
 import static org.apache.commons.lang3.StringUtils.*
-import org.openecomp.mso.bpmn.core.RollbackData

-import org.camunda.bpm.engine.delegate.BpmnError

+import org.openecomp.mso.bpmn.core.RollbackData
+import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.openecomp.mso.bpmn.common.scripts.AaiUtil
 import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
@@ -30,429 +30,557 @@ import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
 import org.openecomp.mso.bpmn.common.scripts.VidUtils
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.core.json.JsonUtils
-

-

-/**

- * This class supports the DoCreateVnf building block subflow

- * with the creation of a generic vnf for

- * infrastructure.

- *

- */

-class DoCreateVnf extends AbstractServiceTaskProcessor {

-

-	String Prefix="DoCVNF_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils(this)

-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

-

-	/**

-	 * This method gets and validates the incoming

-	 * request.

-	 *

-	 * @param - execution

-	 *

-	 */

-	public void preProcessRequest(Execution execution) {

-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED DoCreateVnf PreProcessRequest Process*** ", isDebugEnabled)

-	

-		// DISABLE SDNC INTERACTION FOR NOW

-		execution.setVariable("SDNCInteractionEnabled", false)

-		

-		

-		/*******************/

-		try{

-			// Get Variables

-			

-			String cloudConfiguration = execution.getVariable("cloudConfiguration")

-			String vnfModelInfo = execution.getVariable("vnfModelInfo")			

-			String serviceModelInfo = execution.getVariable("serviceModelInfo")

-			

-			String requestId = execution.getVariable("requestId")

-			execution.setVariable("DoCVNF_requestId", requestId)

+
+
+/**
+ * This class supports the DoCreateVnf building block subflow
+ * with the creation of a generic vnf for
+ * infrastructure.
+ *
+ */
+class DoCreateVnf extends AbstractServiceTaskProcessor {
+
+	String Prefix="DoCVNF_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils(this)
+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+
+	/**
+	 * This method gets and validates the incoming
+	 * request.
+	 *
+	 * @param - execution
+	 *
+	 */
+	public void preProcessRequest(Execution execution) {
+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		utils.log("DEBUG", " *** STARTED DoCreateVnf PreProcessRequest Process*** ", isDebugEnabled)
+	
+		// DISABLE SDNC INTERACTION FOR NOW
+		execution.setVariable("SDNCInteractionEnabled", false)
+		
+		
+		/*******************/
+		try{
+			// Get Variables
+						
+			String vnfModelInfo = execution.getVariable("vnfModelInfo")			
+			String serviceModelInfo = execution.getVariable("serviceModelInfo")
+			
+			String requestId = execution.getVariable("msoRequestId")
+			execution.setVariable("DoCVNF_requestId", requestId)
 			execution.setVariable("mso-request-id", requestId)
-			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)

-

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			execution.setVariable("DoCVNF_serviceInstanceId", serviceInstanceId)

-			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-

-			String vnfType = execution.getVariable("vnfType")

-			execution.setVariable("DoCVNF_vnfType", vnfType)

-			utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)

-

-			String vnfName = execution.getVariable("vnfName")

-			execution.setVariable("DoCVNF_vnfName", vnfName)

-			utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)

-

-			String serviceId = execution.getVariable("productFamilyId")

-			execution.setVariable("DoCVNF_serviceId", serviceId)

-			utils.log("DEBUG", "Incoming Service Id is: " + serviceId, isDebugEnabled)

-

-			String source = "VID"

-			execution.setVariable("DoCVNF_source", source)

-			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)

-

-			String suppressRollback = execution.getVariable("disableRollback")

-			execution.setVariable("DoCVNF_suppressRollback", suppressRollback)

-			utils.log("DEBUG", "Incoming Suppress Rollback is: " + suppressRollback, isDebugEnabled)

-			

-			String modelInvariantId = jsonUtil.getJsonValue(vnfModelInfo, "modelInvariantId")

-			execution.setVariable("DoCVNF_modelInvariantId", modelInvariantId)

-			utils.log("DEBUG", "Incoming Invariant Id is: " + modelInvariantId, isDebugEnabled)

-			

-			String modelVersionId = jsonUtil.getJsonValue(vnfModelInfo, "modelVersionId")

-			if (modelVersionId == null) {

-				modelVersionId = ""

-			}

-			execution.setVariable("DoCVNF_modelVersionId", modelVersionId)

-			utils.log("DEBUG", "Incoming Version Id is: " + modelVersionId, isDebugEnabled)

-

-			String modelVersion = jsonUtil.getJsonValue(vnfModelInfo, "modelVersion")

-			execution.setVariable("DoCVNF_modelVersion", modelVersion)

-			utils.log("DEBUG", "Incoming Model Version is: " + modelVersion, isDebugEnabled)

-			

-			String modelName = jsonUtil.getJsonValue(vnfModelInfo, "modelName")

-			execution.setVariable("DoCVNF_modelName", modelName)

-			utils.log("DEBUG", "Incoming Model Name is: " + modelName, isDebugEnabled)

-			

-			String modelCustomizationId = jsonUtil.getJsonValue(vnfModelInfo, "modelCustomizationId")

-			if (modelCustomizationId == null) {

-				modelCustomizationId = ""

-			}

-			execution.setVariable("DoCVNF_modelCustomizationId", modelCustomizationId)

-			utils.log("DEBUG", "Incoming Model Customization Id is: " + modelCustomizationId, isDebugEnabled)

-				

-			String cloudSiteId = jsonUtil.getJsonValue(cloudConfiguration, "lcpCloudRegionId")

-			execution.setVariable("DoCVNF_cloudSiteId", cloudSiteId)

-			utils.log("DEBUG", "Incoming Cloud Site Id is: " + cloudSiteId, isDebugEnabled)

-				

-			String tenantId = jsonUtil.getJsonValue(cloudConfiguration, "tenantId")

-			execution.setVariable("DoCVNF_tenantId", tenantId)

-			utils.log("DEBUG", "Incoming Tenant Id is: " + tenantId, isDebugEnabled)			

-			

-			String globalSubscriberId = execution.getVariable("globalSubscriberId")

-			if (globalSubscriberId == null) {

-				globalSubscriberId = ""

-			}

-			execution.setVariable("DoCVNF_globalSubscriberId", globalSubscriberId)

-			utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)

-			

-			String sdncVersion = execution.getVariable("sdncVersion")

-			if (sdncVersion == null) {

-				sdncVersion = "1702"

-			}

-			execution.setVariable("DoCVNF_sdncVersion", sdncVersion)

-			utils.log("DEBUG", "Incoming Sdnc Version is: " + sdncVersion, isDebugEnabled)

-

-			//For Completion Handler & Fallout Handler

-			String requestInfo =

+			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)
+
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			execution.setVariable("DoCVNF_serviceInstanceId", serviceInstanceId)
+			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
+
+			String vnfType = execution.getVariable("vnfType")
+			execution.setVariable("DoCVNF_vnfType", vnfType)
+			utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)
+
+			String vnfName = execution.getVariable("vnfName")
+			if (vnfName.equals("") || vnfName.equals("null")) {
+				vnfName = null
+			}
+			execution.setVariable("DoCVNF_vnfName", vnfName)
+			utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)
+
+			String serviceId = execution.getVariable("productFamilyId")
+			execution.setVariable("DoCVNF_serviceId", serviceId)
+			utils.log("DEBUG", "Incoming Service Id is: " + serviceId, isDebugEnabled)
+
+			String source = "VID"
+			execution.setVariable("DoCVNF_source", source)
+			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)
+
+			String suppressRollback = execution.getVariable("disableRollback")
+			execution.setVariable("DoCVNF_suppressRollback", suppressRollback)
+			utils.log("DEBUG", "Incoming Suppress Rollback is: " + suppressRollback, isDebugEnabled)
+			
+			String modelInvariantId = jsonUtil.getJsonValue(vnfModelInfo, "modelInvariantId")
+			execution.setVariable("DoCVNF_modelInvariantId", modelInvariantId)
+			utils.log("DEBUG", "Incoming Invariant Id is: " + modelInvariantId, isDebugEnabled)
+			
+			String modelVersionId = jsonUtil.getJsonValue(vnfModelInfo, "modelVersionId")
+			if (modelVersionId == null) {
+				modelVersionId = ""
+			}
+			execution.setVariable("DoCVNF_modelVersionId", modelVersionId)
+			utils.log("DEBUG", "Incoming Version Id is: " + modelVersionId, isDebugEnabled)
+
+			String modelVersion = jsonUtil.getJsonValue(vnfModelInfo, "modelVersion")
+			execution.setVariable("DoCVNF_modelVersion", modelVersion)
+			utils.log("DEBUG", "Incoming Model Version is: " + modelVersion, isDebugEnabled)
+			
+			String modelName = jsonUtil.getJsonValue(vnfModelInfo, "modelName")
+			execution.setVariable("DoCVNF_modelName", modelName)
+			utils.log("DEBUG", "Incoming Model Name is: " + modelName, isDebugEnabled)
+			
+			String modelCustomizationId = jsonUtil.getJsonValue(vnfModelInfo, "modelCustomizationId")
+			if (modelCustomizationId == null) {
+				modelCustomizationId = ""
+			}
+			execution.setVariable("DoCVNF_modelCustomizationId", modelCustomizationId)
+			utils.log("DEBUG", "Incoming Model Customization Id is: " + modelCustomizationId, isDebugEnabled)
+				
+			String cloudSiteId = execution.getVariable("lcpCloudRegionId")
+			execution.setVariable("DoCVNF_cloudSiteId", cloudSiteId)
+			utils.log("DEBUG", "Incoming Cloud Site Id is: " + cloudSiteId, isDebugEnabled)
+				
+			String tenantId = execution.getVariable("tenantId")
+			execution.setVariable("DoCVNF_tenantId", tenantId)
+			utils.log("DEBUG", "Incoming Tenant Id is: " + tenantId, isDebugEnabled)			
+			
+			String globalSubscriberId = execution.getVariable("globalSubscriberId")
+			if (globalSubscriberId == null) {
+				globalSubscriberId = ""
+			}
+			execution.setVariable("DoCVNF_globalSubscriberId", globalSubscriberId)
+			utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
+			
+			String sdncVersion = execution.getVariable("sdncVersion")
+			if (sdncVersion == null) {
+				sdncVersion = "1702"
+			}
+			execution.setVariable("DoCVNF_sdncVersion", sdncVersion)
+			utils.log("DEBUG", "Incoming Sdnc Version is: " + sdncVersion, isDebugEnabled)
+
+			//For Completion Handler & Fallout Handler
+			String requestInfo =
 				"""<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
-					<request-id>${requestId}</request-id>

-					<action>CREATE</action>

-					<source>${source}</source>

-				   </request-info>"""

-

-			execution.setVariable("DoCVNF_requestInfo", requestInfo)

-			//TODO: Orch Status - TBD, will come from SDN-C Response in 1702

-			String orchStatus = "Created"

-			execution.setVariable("DoCVNF_orchStatus", orchStatus)

-

-			//TODO: Equipment Role - Should come from SDN-C Response in 1702

-			String equipmentRole = " "

-			execution.setVariable("DoCVNF_equipmentRole", equipmentRole)

-			String vnfId = execution.getVariable("testVnfId") // for junits

-			if(isBlank(vnfId)){

-				vnfId = execution.getVariable("vnfId")

-				if (isBlank(vnfId)) {

-					vnfId = UUID.randomUUID().toString()

-					utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)

-				}

-			}

-			execution.setVariable("DoCVNF_vnfId", vnfId)

-

-			// Setting for Sub Flow Calls

-			execution.setVariable("DoCVNF_type", "generic-vnf")

-			execution.setVariable("GENGS_type", "service-instance")

-				

-			String sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {

-				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-			execution.setVariable("DoCVNF_sdncCallbackUrl", sdncCallbackUrl)

-			utils.logAudit("SDNC Callback URL: " + sdncCallbackUrl)

-			logDebug("SDNC Callback URL is: " + sdncCallbackUrl, isDebugEnabled)

-			

-			def rollbackData = execution.getVariable("RollbackData")

-			if (rollbackData == null) {

-				rollbackData = new RollbackData()

-			}

-			

-			execution.setVariable("RollbackData", rollbackData)

-			

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error Occured in DoCreateVnf PreProcessRequest method!" + e.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PreProcessRequest Process ***", isDebugEnabled)

-	}

-

-	

-	public void prepareCreateGenericVnf (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-

-		utils.log("DEBUG", " *** STARTED DoCreateVnf PrepareCreateGenericVnf Process *** ", isDebugEnabled)

-		try {

-			//Get Vnf Info

-			String vnfId = execution.getVariable("DoCVNF_vnfId")

-			def vnfName = execution.getVariable("DoCVNF_vnfName")

-			def vnfType = execution.getVariable("DoCVNF_vnfType")

-			def serviceId = execution.getVariable("DoCVNF_serviceId")

-			def orchStatus = execution.getVariable("DoCVNF_orchStatus")

-			def modelInvariantId = execution.getVariable("DoCVNF_modelInvariantId")

-			def modelVersion = execution.getVariable("DoCVNF_modelVersion")

-			def modelCustomizationId = execution.getVariable("DoCVNF_modelCustomizationId")

-			// TODO: 1702 Variable

-			def equipmentRole = execution.getVariable("DoCVNF_equipmentRole")

-

-			//Get Service Instance Info

-			def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")

-			String siRelatedLink = execution.getVariable("GENGS_siResourceLink")

-

-			int custStart = siRelatedLink.indexOf("customer/")

-			int custEnd = siRelatedLink.indexOf("/service-subscriptions")

-			String globalCustId = siRelatedLink.substring(custStart + 9, custEnd)

-			int serviceStart = siRelatedLink.indexOf("service-subscription/")

-			int serviceEnd = siRelatedLink.indexOf("/service-instances/")

-			String serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)

-

-			//Get Namespace

-			AaiUtil aaiUtil = new AaiUtil(this)

-			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)

-			String namespace = aaiUtil.getNamespaceFromUri(aai_uri)

-

-			String payload =

-					"""<generic-vnf xmlns="${namespace}">

-				<vnf-id>${vnfId}</vnf-id>

-				<vnf-name>${vnfName}</vnf-name>

-				<service-id>${serviceId}</service-id>

-				<vnf-type>${vnfType}</vnf-type>

-				<prov-status>PREPROV</prov-status>

-				<orchestration-status>${orchStatus}</orchestration-status>

-				<persona-model-id>${modelInvariantId}</persona-model-id>

-				<persona-model-version>${modelVersion}</persona-model-version>

-				<persona-model-customization-id>${modelCustomizationId}</persona-model-customization-id>

-				<relationship-list>

-					<relationship>

-               		<related-to>service-instance</related-to>

-               		<related-link>${siRelatedLink}</related-link>

-               		<relationship-data>

-                  		<relationship-key>customer.global-customer-id</relationship-key>

-                  		<relationship-value>${globalCustId}</relationship-value>

-              		</relationship-data>

-               		<relationship-data>

-                  		<relationship-key>service-subscription.service-type</relationship-key>

-                  		<relationship-value>${serviceType}</relationship-value>

-               		</relationship-data>

-					<relationship-data>

-                  		<relationship-key>service-instance.service-instance-id</relationship-key>

-                  		<relationship-value>${serviceInstanceId}</relationship-value>

-               		</relationship-data>

-            		</relationship>

-				</relationship-list>

-			</generic-vnf>"""

-

-			execution.setVariable("DoCVNF_genericVnfPayload", payload)

-

-		}catch(Exception ex) {

-			utils.log("DEBUG", "Error Occured in DoCreateVnf PrepareCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PrepareCreateGenericVnf Process")

-		}

-		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PrepareCreateGenericVnf Process ***", isDebugEnabled)

-	}

-	

-	public void postProcessCreateGenericVnf (Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-

-		utils.log("DEBUG", " *** STARTED DoCreateVnf PostProcessCreateGenericVnf Process *** ", isDebugEnabled)

-		try {

-			//Get Vnf Info

-			String vnfId = execution.getVariable("DoCVNF_vnfId")

-			def rollbackData = execution.getVariable("RollbackData")

-			rollbackData.put("VNF", "vnfId", vnfId)

-			execution.setVariable("RollbackData", rollbackData)

-		}catch(Exception ex) {

-			utils.log("DEBUG", "Error Occured in DoCreateVnf PostProcessCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PostProcessCreateGenericVnf Process")

-		}

-		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PostProcessCreateGenericVnf Process ***", isDebugEnabled)

-	}

-	

-	

-	public void preProcessSDNCAssignRequest(Execution execution){

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-		logDebug(" ======== STARTED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

-		def vnfId = execution.getVariable("DoCVNF_vnfId")

-		def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")

-		logDebug("NEW VNF ID: " + vnfId, isDebugLogEnabled)

-		utils.logAudit("NEW VNF ID: " + vnfId)

-

-		try{

-			//Build SDNC Request

-			

-			String assignSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "assign")

-

-			assignSDNCRequest = utils.formatXml(assignSDNCRequest)

-			execution.setVariable("DoCVNF_assignSDNCRequest", assignSDNCRequest)

-			logDebug("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest, isDebugLogEnabled)

-			utils.logAudit("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest)

-

-		}catch(Exception e){

-			utils.log("ERROR", "Exception Occured Processing preProcessSDNCAssignRequest. Exception is:\n" + e, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessSDNCAssignRequest Method:\n" + e.getMessage())

-		}

-		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

-	}

-	

-	public void preProcessSDNCActivateRequest(Execution execution) {

-		def method = getClass().getSimpleName() + '.preProcessSDNCActivateRequest(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-		execution.setVariable("prefix", Prefix)

-		logDebug(" ======== STARTED preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)

-		try{

-			String vnfId = execution.getVariable("DoCVNF_vnfId")

-			String serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")

-

-			String activateSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "activate")

-

-			execution.setVariable("DoCVNF_activateSDNCRequest", activateSDNCRequest)

-			logDebug("Outgoing CommitSDNCRequest is: \n" + activateSDNCRequest, isDebugLogEnabled)

-			utils.logAudit("Outgoing CommitSDNCRequest is: \n"  + activateSDNCRequest)

-

-		}catch(Exception e){

-			log.debug("Exception Occured Processing preProcessSDNCActivateRequest. Exception is:\n" + e, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occured during  preProcessSDNCActivateRequest Method:\n" + e.getMessage())

-		}

-		logDebug("======== COMPLETED  preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)

-	}

-	

-	public String buildSDNCRequest(Execution execution, String svcInstId, String action){

-		

-				String uuid = execution.getVariable('testReqId') // for junits

-				if(uuid==null){

+					<request-id>${requestId}</request-id>
+					<action>CREATE</action>
+					<source>${source}</source>
+				   </request-info>"""
+
+			execution.setVariable("DoCVNF_requestInfo", requestInfo)
+			//TODO: Orch Status - TBD, will come from SDN-C Response in 1702
+			String orchStatus = "Created"
+			execution.setVariable("DoCVNF_orchStatus", orchStatus)
+
+			//TODO: Equipment Role - Should come from SDN-C Response in 1702
+			String equipmentRole = " "
+			execution.setVariable("DoCVNF_equipmentRole", equipmentRole)
+			String vnfId = execution.getVariable("testVnfId") // for junits
+			if(isBlank(vnfId)){
+				vnfId = execution.getVariable("vnfId")
+				if (isBlank(vnfId)) {
+					vnfId = UUID.randomUUID().toString()
+					utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)
+				}
+			}
+			execution.setVariable("DoCVNF_vnfId", vnfId)
+
+			// Setting for Sub Flow Calls
+			execution.setVariable("DoCVNF_type", "generic-vnf")
+			execution.setVariable("GENGS_type", "service-instance")
+				
+			String sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {
+				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'
+				logError(msg)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+			execution.setVariable("DoCVNF_sdncCallbackUrl", sdncCallbackUrl)
+			utils.logAudit("SDNC Callback URL: " + sdncCallbackUrl)
+			logDebug("SDNC Callback URL is: " + sdncCallbackUrl, isDebugEnabled)
+			
+			def rollbackData = execution.getVariable("RollbackData")
+			if (rollbackData == null) {
+				rollbackData = new RollbackData()
+			}
+			
+			execution.setVariable("RollbackData", rollbackData)
+			
+		}catch(BpmnError b){
+			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			throw b
+		}catch(Exception e){
+			utils.log("DEBUG", " Error Occured in DoCreateVnf PreProcessRequest method!" + e.getMessage(), isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")
+
+		}
+		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PreProcessRequest Process ***", isDebugEnabled)
+	}
+
+	
+	public void prepareCreateGenericVnf (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " *** STARTED DoCreateVnf PrepareCreateGenericVnf Process *** ", isDebugEnabled)
+		try {
+			//Get Vnf Info
+			String vnfId = execution.getVariable("DoCVNF_vnfId")
+			def vnfName = execution.getVariable("DoCVNF_vnfName")
+			if (vnfName == null) {
+				vnfName = "sdncGenerated"
+				utils.log("DEBUG", "Sending a dummy VNF name to AAI - the name will be generated by SDNC: " + vnfName, isDebugEnabled)
+			}
+			def vnfType = execution.getVariable("DoCVNF_vnfType")
+			def serviceId = execution.getVariable("DoCVNF_serviceId")
+			def orchStatus = execution.getVariable("DoCVNF_orchStatus")
+			def modelInvariantId = execution.getVariable("DoCVNF_modelInvariantId")
+			def modelVersionId = execution.getVariable("DoCVNF_modelVersionId")
+			def modelCustomizationId = execution.getVariable("DoCVNF_modelCustomizationId")
+			// TODO: 1702 Variable
+			def equipmentRole = execution.getVariable("DoCVNF_equipmentRole")
+
+			//Get Service Instance Info
+			def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")
+			String siRelatedLink = execution.getVariable("GENGS_siResourceLink")
+
+			int custStart = siRelatedLink.indexOf("customer/")
+			int custEnd = siRelatedLink.indexOf("/service-subscriptions")
+			String globalCustId = siRelatedLink.substring(custStart + 9, custEnd)
+			int serviceStart = siRelatedLink.indexOf("service-subscription/")
+			int serviceEnd = siRelatedLink.indexOf("/service-instances/")
+			String serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)
+
+			//Get Namespace
+			AaiUtil aaiUtil = new AaiUtil(this)
+			def aai_uri = aaiUtil.getNetworkGenericVnfUri(execution)
+			String namespace = aaiUtil.getNamespaceFromUri(execution, aai_uri)
+
+			String payload =
+					"""<generic-vnf xmlns="${namespace}">
+				<vnf-id>${vnfId}</vnf-id>
+				<vnf-name>${vnfName}</vnf-name>
+				<service-id>${serviceId}</service-id>
+				<vnf-type>${vnfType}</vnf-type>
+				<prov-status>PREPROV</prov-status>
+				<orchestration-status>${orchStatus}</orchestration-status>
+				<model-invariant-id>${modelInvariantId}</model-invariant-id>
+				<model-version-id>${modelVersionId}</model-version-id>
+				<model-customization-id>${modelCustomizationId}</model-customization-id>
+				<relationship-list>
+					<relationship>
+               		<related-to>service-instance</related-to>
+               		<related-link>${siRelatedLink}</related-link>
+               		<relationship-data>
+                  		<relationship-key>customer.global-customer-id</relationship-key>
+                  		<relationship-value>${globalCustId}</relationship-value>
+              		</relationship-data>
+               		<relationship-data>
+                  		<relationship-key>service-subscription.service-type</relationship-key>
+                  		<relationship-value>${serviceType}</relationship-value>
+               		</relationship-data>
+					<relationship-data>
+                  		<relationship-key>service-instance.service-instance-id</relationship-key>
+                  		<relationship-value>${serviceInstanceId}</relationship-value>
+               		</relationship-data>
+            		</relationship>
+				</relationship-list>
+			</generic-vnf>"""
+
+			execution.setVariable("DoCVNF_genericVnfPayload", payload)
+
+		}catch(Exception ex) {
+			utils.log("DEBUG", "Error Occured in DoCreateVnf PrepareCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PrepareCreateGenericVnf Process")
+		}
+		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PrepareCreateGenericVnf Process ***", isDebugEnabled)
+	}
+	
+	public void postProcessCreateGenericVnf (Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+
+		utils.log("DEBUG", " *** STARTED DoCreateVnf PostProcessCreateGenericVnf Process *** ", isDebugEnabled)
+		try {
+			//Get Vnf Info
+			String vnfId = execution.getVariable("DoCVNF_vnfId")
+			def rollbackData = execution.getVariable("RollbackData")
+			rollbackData.put("VNF", "vnfId", vnfId)
+			execution.setVariable("RollbackData", rollbackData)
+		}catch(Exception ex) {
+			utils.log("DEBUG", "Error Occured in DoCreateVnf PostProcessCreateGenericVnf Process " + ex.getMessage(), isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PostProcessCreateGenericVnf Process")
+		}
+		utils.log("DEBUG", "*** COMPLETED DoCreateVnf PostProcessCreateGenericVnf Process ***", isDebugEnabled)
+	}
+	
+	
+	public void preProcessSDNCAssignRequest(Execution execution){
+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+		logDebug(" ======== STARTED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
+		def vnfId = execution.getVariable("DoCVNF_vnfId")
+		def serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")
+		logDebug("NEW VNF ID: " + vnfId, isDebugLogEnabled)
+		utils.logAudit("NEW VNF ID: " + vnfId)
+
+		try{
+			//Build SDNC Request
+			
+			String assignSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "assign")
+
+			assignSDNCRequest = utils.formatXml(assignSDNCRequest)
+			execution.setVariable("DoCVNF_assignSDNCRequest", assignSDNCRequest)
+			logDebug("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest, isDebugLogEnabled)
+			utils.logAudit("Outgoing AssignSDNCRequest is: \n" + assignSDNCRequest)
+
+		}catch(Exception e){
+			utils.log("ERROR", "Exception Occured Processing preProcessSDNCAssignRequest. Exception is:\n" + e, isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessSDNCAssignRequest Method:\n" + e.getMessage())
+		}
+		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
+	}
+	
+	public void preProcessSDNCActivateRequest(Execution execution) {
+		def method = getClass().getSimpleName() + '.preProcessSDNCActivateRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+		execution.setVariable("prefix", Prefix)
+		logDebug(" ======== STARTED preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)
+		try{
+			String vnfId = execution.getVariable("DoCVNF_vnfId")
+			String serviceInstanceId = execution.getVariable("DoCVNF_serviceInstanceId")
+
+			String activateSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "activate")
+
+			execution.setVariable("DoCVNF_activateSDNCRequest", activateSDNCRequest)
+			logDebug("Outgoing CommitSDNCRequest is: \n" + activateSDNCRequest, isDebugLogEnabled)
+			utils.logAudit("Outgoing CommitSDNCRequest is: \n"  + activateSDNCRequest)
+
+		}catch(Exception e){
+			log.debug("Exception Occured Processing preProcessSDNCActivateRequest. Exception is:\n" + e, isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occured during  preProcessSDNCActivateRequest Method:\n" + e.getMessage())
+		}
+		logDebug("======== COMPLETED  preProcessSDNCActivateRequest Process ======== ", isDebugLogEnabled)
+	}
+	
+	public String buildSDNCRequest(Execution execution, String svcInstId, String action){
+		
+				String uuid = execution.getVariable('testReqId') // for junits
+				if(uuid==null){
 					uuid = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
-				}

-				def callbackURL = execution.getVariable("DoCVNF_sdncCallbackUrl")

-				def requestId = execution.getVariable("DoCVNF_requestId")

-				def serviceId = execution.getVariable("DoCVNF_serviceId")

-				def vnfType = execution.getVariable("DoCVNF_vnfType")

-				def vnfName = execution.getVariable("DoCVNF_vnfName")

-				def tenantId = execution.getVariable("DoCVNF_tenantId")

-				def source = execution.getVariable("DoCVNF_source")

-				def vnfId = execution.getVariable("DoCVNF_vnfId")

-				def cloudSiteId = execution.getVariable("DoCVNF_cloudSiteId")				

-				def modelCustomizationId = execution.getVariable("DoCVNF_modelCustomizationId")

-				def serviceModelInfo = execution.getVariable("serviceModelInfo")

-				def vnfModelInfo = execution.getVariable("vnfModelInfo")

-				String serviceEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(serviceModelInfo)

-				String vnfEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(vnfModelInfo)				

-				def globalSubscriberId = execution.getVariable("DoCVNF_globalSubscriberId")

-				def sdncVersion = execution.getVariable("DoCVNF_sdncVersion")

-						

-				String sdncVNFParamsXml = ""

-		

-				if(execution.getVariable("DoCVNF_vnfParamsExistFlag") == true){

-					sdncVNFParamsXml = buildSDNCParamsXml(execution)

-				}else{

-					sdncVNFParamsXml = ""

-				}

-		

-				String sdncRequest =

+				}
+				def callbackURL = execution.getVariable("DoCVNF_sdncCallbackUrl")
+				def requestId = execution.getVariable("DoCVNF_requestId")
+				def serviceId = execution.getVariable("DoCVNF_serviceId")
+				def vnfType = execution.getVariable("DoCVNF_vnfType")
+				def vnfName = execution.getVariable("DoCVNF_vnfName")
+				// Only send vnfName to SDNC if it is not null, otherwise it will get generated by SDNC on Assign
+				String vnfNameString = ""
+				if (vnfName != null) {
+					vnfNameString = """<vnf-name>${vnfName}</vnf-name>"""					
+				}
+				def tenantId = execution.getVariable("DoCVNF_tenantId")
+				def source = execution.getVariable("DoCVNF_source")
+				def vnfId = execution.getVariable("DoCVNF_vnfId")
+				def cloudSiteId = execution.getVariable("DoCVNF_cloudSiteId")				
+				def modelCustomizationId = execution.getVariable("DoCVNF_modelCustomizationId")
+				def serviceModelInfo = execution.getVariable("serviceModelInfo")
+				def vnfModelInfo = execution.getVariable("vnfModelInfo")
+				String serviceEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(serviceModelInfo)
+				String vnfEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(vnfModelInfo)				
+				def globalSubscriberId = execution.getVariable("DoCVNF_globalSubscriberId")
+				def sdncVersion = execution.getVariable("DoCVNF_sdncVersion")
+						
+				String sdncVNFParamsXml = ""
+		
+				if(execution.getVariable("DoCVNF_vnfParamsExistFlag") == true){
+					sdncVNFParamsXml = buildSDNCParamsXml(execution)
+				}else{
+					sdncVNFParamsXml = ""
+				}
+		
+				String sdncRequest =
 				"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
 													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
 													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-	   <sdncadapter:RequestHeader>

-				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>

-				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>

-				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>

-				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>

-				<sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>

-		</sdncadapter:RequestHeader>

-	<sdncadapterworkflow:SDNCRequestData>

-		<request-information>

-			<request-id>${requestId}</request-id>

-			<request-action>CreateVnfInstance</request-action>

-			<source>${source}</source>

-			<notification-url/>

-			<order-number/>

-			<order-version/>

-		</request-information>

-		<service-information>

-			<service-id>${serviceId}</service-id>

-			<subscription-service-type>${serviceId}</subscription-service-type>

-			${serviceEcompModelInformation}			

-			<service-instance-id>${svcInstId}</service-instance-id>

-			<global-customer-id>${globalSubscriberId}</global-customer-id>			

-		</service-information>

-		<vnf-information>

-			<vnf-id>${vnfId}</vnf-id>

-			<vnf-type>${vnfType}</vnf-type>

-			${vnfEcompModelInformation}			

-		</vnf-information>

-		<vnf-request-input>

-			<request-version>${sdncVersion}</request-version>

-			<vnf-name></vnf-name>

-			<tenant>${tenantId}</tenant>		

-			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>			

-			${sdncVNFParamsXml}

-		</vnf-request-input>

-	</sdncadapterworkflow:SDNCRequestData>

-	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""

-		

-			utils.logAudit("sdncRequest:  " + sdncRequest)

-			return sdncRequest

-	}

-		

-	public void validateSDNCResponse(Execution execution, String response, String method){

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

-

-		WorkflowException workflowException = execution.getVariable("WorkflowException")

-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

-

-		utils.logAudit("workflowException: " + workflowException)

-

-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

-

-		utils.logAudit("SDNCResponse: " + response)

-

-		String sdncResponse = response

-		if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){

-			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)

-			

-		}else{

-			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)

-			throw new BpmnError("MSOWorkflowException")

-		}

-		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

-	}

-

-	

-}

+	   <sdncadapter:RequestHeader>
+				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
+				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
+				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
+				<sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>
+		</sdncadapter:RequestHeader>
+	<sdncadapterworkflow:SDNCRequestData>
+		<request-information>
+			<request-id>${requestId}</request-id>
+			<request-action>CreateVnfInstance</request-action>
+			<source>${source}</source>
+			<notification-url/>
+			<order-number/>
+			<order-version/>
+		</request-information>
+		<service-information>
+			<service-id>${serviceId}</service-id>
+			<subscription-service-type>${serviceId}</subscription-service-type>
+			${serviceEcompModelInformation}			
+			<service-instance-id>${svcInstId}</service-instance-id>
+			<global-customer-id>${globalSubscriberId}</global-customer-id>			
+		</service-information>
+		<vnf-information>
+			<vnf-id>${vnfId}</vnf-id>
+			<vnf-type>${vnfType}</vnf-type>
+			${vnfEcompModelInformation}			
+		</vnf-information>
+		<vnf-request-input>			
+			${vnfNameString}
+			<tenant>${tenantId}</tenant>		
+			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>			
+			${sdncVNFParamsXml}
+		</vnf-request-input>
+	</sdncadapterworkflow:SDNCRequestData>
+	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+		
+			utils.logAudit("sdncRequest:  " + sdncRequest)
+			return sdncRequest
+	}
+		
+	public void validateSDNCResponse(Execution execution, String response, String method){
+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
+
+		WorkflowException workflowException = execution.getVariable("WorkflowException")
+		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+
+		utils.logAudit("workflowException: " + workflowException)
+
+		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+
+		utils.logAudit("SDNCResponse: " + response)
+
+		String sdncResponse = response
+		if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
+			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)
+			if(method.equals("get")){
+				String topologyGetResponse = execution.getVariable("DoCVNF_getSDNCAdapterResponse")
+				String data = utils.getNodeXml(topologyGetResponse, "response-data")
+				data = data.replaceAll("&lt;", "<")
+				data = data.replaceAll("&gt;", ">")
+				utils.log("DEBUG", "topologyGetResponseData: " + data, isDebugLogEnabled)
+				String vnfName = utils.getNodeText1(data, "vnf-name")
+				utils.log("DEBUG", "vnfName received from SDNC: " + vnfName, isDebugLogEnabled)
+				execution.setVariable("vnfName", vnfName)
+				execution.setVariable("DoCVNF_vnfName", vnfName)
+			}
+			
+		}else{
+			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)
+			throw new BpmnError("MSOWorkflowException")
+		}
+		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
+	}
+	
+	public void preProcessSDNCGetRequest(Execution execution){
+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+		utils.log("DEBUG", " ======== STARTED preProcessSDNCGetRequest Process ======== ", isDebugLogEnabled)
+		try{
+			def serviceInstanceId = execution.getVariable('DoCVNF_serviceInstanceId')
+			
+			String uuid = execution.getVariable('testReqId') // for junits
+			if(uuid==null){
+				uuid = execution.getVariable("mso-request-id") + "-" +  System.currentTimeMillis()
+			}
+					
+			def callbackUrl = execution.getVariable("DoCVFM_sdncCallbackUrl")
+			utils.logAudit("callbackUrl:" + callbackUrl)
+			
+			def vnfId = execution.getVariable('DCVFM_vnfId')
+			
+			def svcInstId = ""
+			if (serviceInstanceId == null || serviceInstanceId.isEmpty()) {
+				svcInstId = vnfId
+			}
+			else {
+				svcInstId = serviceInstanceId
+			}
+			// serviceOperation will be retrieved from "object-path" element
+			// in SDNC Assign Response for VNF
+			String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")
+			utils.logAudit("DoCVNF_assignSDNCAdapterResponse is: \n" + response)
+			
+			String serviceOperation = ""
+			
+			String data = utils.getNodeXml(response, "response-data")
+			data = data.replaceAll("&lt;", "<")
+			data = data.replaceAll("&gt;", ">")
+			utils.log("DEBUG", "responseData: " + data, isDebugLogEnabled)
+			serviceOperation = utils.getNodeText1(data, "object-path")
+			utils.log("DEBUG", "VNF with sdncVersion of 1707 or later - service operation: " + serviceOperation, isDebugLogEnabled)			
+			
+
+			//!!!! TEMPORARY WORKAROUND FOR SDNC REPLICATION ISSUE
+			sleep(5000)
+
+			String SDNCGetRequest =
+					"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+											xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+											xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+					<sdncadapter:RequestId>${uuid}</sdncadapter:RequestId>
+					<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
+					<sdncadapter:SvcAction>query</sdncadapter:SvcAction>
+					<sdncadapter:SvcOperation>${serviceOperation}</sdncadapter:SvcOperation>
+					<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
+					<sdncadapter:MsoAction>vfmodule</sdncadapter:MsoAction>
+				</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData></sdncadapterworkflow:SDNCRequestData>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+
+			utils.logAudit("SDNCGetRequest: \n" + SDNCGetRequest)
+			execution.setVariable("DoCVNF_getSDNCRequest", SDNCGetRequest)
+			utils.log("DEBUG", "Outgoing GetSDNCRequest is: \n" + SDNCGetRequest, isDebugLogEnabled)
+
+		}catch(Exception e){
+			utils.log("ERROR", "Exception Occurred Processing preProcessSDNCGetRequest. Exception is:\n" + e, isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occured during prepareProvision Method:\n" + e.getMessage())
+		}
+		utils.log("DEBUG", "======== COMPLETED preProcessSDNCGetRequest Process ======== ", isDebugLogEnabled)
+	}
+	
+	/**
+	 * Prepare a Request for invoking the UpdateAAIGenericVnf subflow.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepUpdateAAIGenericVnf(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepUpdateAAIGenericVnf(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+ 
+		try {
+			def vnfId = execution.getVariable('DoCVNF_vnfId')
+			logDebug("VNF ID: " + vnfId, isDebugLogEnabled)		
+ 
+			String updateAAIGenericVnfRequest = """
+					<UpdateAAIGenericVnfRequest>
+						<vnf-id>${vnfId}</vnf-id>
+						<orchestration-status>Active</orchestration-status>						
+					</UpdateAAIGenericVnfRequest>
+				"""
+				updateAAIGenericVnfRequest = utils.formatXml(updateAAIGenericVnfRequest)
+				execution.setVariable('DoCVNF_updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)
+				utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)
+				logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)
+ 
+ 
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())
+		}
+	}
+ 
+
+
+	
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
index 861da52..daae3d7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
@@ -1,285 +1,369 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.openecomp.mso.bpmn.infrastructure.scripts

-

-import java.util.UUID;

-

-import org.json.JSONObject;

-import org.json.JSONArray;

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution;

-

-import static org.apache.commons.lang3.StringUtils.*;

-

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.RollbackData

-import org.openecomp.mso.bpmn.core.WorkflowException

-

-

-

-/**

-* This class supports the macro VID Flow

-* with the creation of a generic vnf and related VF modules.

-*/

-class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {

-

-   String Prefix="DCVAM_"

-   ExceptionUtil exceptionUtil = new ExceptionUtil()

-   JsonUtils jsonUtil = new JsonUtils()

-   VidUtils vidUtils = new VidUtils(this)

-   CatalogDbUtils cutils = new CatalogDbUtils()

-

-   /**

-	* This method gets and validates the incoming

-	* request.

-	*

-	* @param - execution

-	*/

-   public void preProcessRequest(Execution execution) {

-	   def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

-	   execution.setVariable("prefix",Prefix)

-	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)

-

-	   try{

-		   // Get Variables

-		   

-		   

-		   String cloudConfiguration = execution.getVariable("cloudConfiguration")

-		   String vnfModelInfo = execution.getVariable("vnfModelInfo")

-		   

-		   String requestId = execution.getVariable("requestId")

-			execution.setVariable("mso-request-id", requestId)

-		   utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)

-

-		   String serviceInstanceId = execution.getVariable("serviceInstanceId")

-		   utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-

-		   String vnfType = execution.getVariable("vnfType")

-		   utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)

-

-		   String vnfName = execution.getVariable("vnfName")

-		   execution.setVariable("CREVI_vnfName", vnfName)

-		   utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)

-

-		   String productFamilyId = execution.getVariable("productFamilyId")

-		   utils.log("DEBUG", "Incoming Product Family Id is: " + productFamilyId, isDebugEnabled)

-

-		   String source = "VID"

-		   execution.setVariable("source", source)

-		   utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)

-

-		   String disableRollback = execution.getVariable("disableRollback")

-		   utils.log("DEBUG", "Incoming Disable Rollback is: " + disableRollback, isDebugEnabled)

-		   

-		   String asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")

-		   utils.log("DEBUG", "Incoming asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugEnabled)

-

-		   String vnfId = execution.getVariable("testVnfId") // for junits

-		   if(isBlank(vnfId)){

-			   vnfId = execution.getVariable("vnfId")

-			   if (isBlank(vnfId)) {

-				   vnfId = UUID.randomUUID().toString()

-				   utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)

-			   }

-		   }

-		   execution.setVariable("vnfId", vnfId)

-		   

-		   def rollbackData = execution.getVariable("RollbackData")

-		   if (rollbackData == null) {

-			   rollbackData = new RollbackData()

-		   }

-		   

-		   execution.setVariable("numOfCreatedAddOnModules", 0)

-		   

-		   rollbackData.put("VNFANDMODULES", "numOfCreatedAddOnModules", 0)

-		   execution.setVariable("RollbackData", rollbackData)

-		   

-	   }catch(BpmnError b){

-		   utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-		   throw b

-	   }catch(Exception e){

-		   utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")

-

-	   }

-	   utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)

-   }

-

-   

-   public void queryCatalogDB (Execution execution) {

-	   def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-	   execution.setVariable("prefix",Prefix)

-

-	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules QueryCatalogDB Process *** ", isDebugEnabled)

-	   try {

-		   //Get Vnf Info

-		   String vnfModelInfo = execution.getVariable("vnfModelInfo")

-		   String vnfModelCustomizationUuid = jsonUtil.getJsonValueForKey(vnfModelInfo, "modelCustomizationId")

-		   utils.log("DEBUG", "querying Catalog DB by vnfModelCustomizationUuid: " + vnfModelCustomizationUuid)

-		   String catalogDbEndpoint = execution.getVariable("URN_mso_catalog_db_endpoint")

-		   

-		   JSONArray vnfs = cutils.getAllVnfsByVnfModelCustomizationUuid(catalogDbEndpoint,

-						   vnfModelCustomizationUuid)

-		   utils.log("DEBUG", "obtained VNF list")

-		   // Only one match here

-		   JSONObject vnf = vnfs[0]

-		   JSONArray vfModules = vnf.getJSONArray("vfModules")

-		   JSONArray addOnModules = new JSONArray()

-		   

-		   // Set up base Vf Module info

-		   for (int i = 0; i < vfModules.length(); i++) {

-			   utils.log("DEBUG", "handling VF Module ")

-			   JSONObject vfModule = vfModules[i]

-			   String isBase = jsonUtil.getJsonValueForKey(vfModule, "isBase")

-			   if (isBase.equals("true")) {

-				   JSONObject baseVfModuleModelInfoObject = vfModule.getJSONObject("modelInfo")

-				   String baseVfModuleModelInfo = baseVfModuleModelInfoObject.toString()

-				   execution.setVariable("baseVfModuleModelInfo", baseVfModuleModelInfo)

-				   String baseVfModuleLabel = jsonUtil.getJsonValueForKey(vfModule, "vfModuleLabel")

-				   execution.setVariable("baseVfModuleLabel", baseVfModuleLabel)

-				   String basePersonaModelId = jsonUtil.getJsonValueForKey(baseVfModuleModelInfoObject, "modelInvariantId")

-				   execution.setVariable("basePersonaModelId", basePersonaModelId)

-			   }

-			   else {

-				   addOnModules.add(vfModules[i])

-			   }

-		   }

-		   

-		   execution.setVariable("addOnModules", addOnModules)

-		   execution.setVariable("addOnModulesToDeploy", addOnModules.length())

-		   execution.setVariable("addOnModulesDeployed", 0)

-		   

-	   }catch(Exception ex) {

-		   utils.log("DEBUG", "Error Occured in DoCreateVnfAndModules QueryCatalogDB Process " + ex.getMessage(), isDebugEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnfAndModules QueryCatalogDB Process")

-	   }

-	   

-	   // Generate vfModuleId for base VF Module

-	   def baseVfModuleId = UUID.randomUUID().toString()

-	   execution.setVariable("baseVfModuleId", baseVfModuleId)

-	   utils.log("DEBUG", "*** COMPLETED CreateVnfInfra PrepareCreateGenericVnf Process ***", isDebugEnabled)

-   }

-   

-   public void preProcessAddOnModule(Execution execution){

-	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-	   execution.setVariable("prefix", Prefix)

-	   logDebug(" ======== STARTED preProcessAddOnModule ======== ", isDebugLogEnabled)

-	   

-	   try {

-		   JSONArray addOnModules = (JSONArray) execution.getVariable("addOnModules")

-		   int addOnIndex = (int) execution.getVariable("addOnModulesDeployed")

-		   

-		   JSONObject addOnModule = addOnModules[addOnIndex]

-		   

-		   def newVfModuleId = UUID.randomUUID().toString()

-		   execution.setVariable("addOnVfModuleId", newVfModuleId)

-		   

-		   execution.setVariable("instancesOfThisModelDeployed", 0)

-		   

-		   JSONObject addOnVfModuleModelInfoObject = jsonUtil.getJsonValueForKey(addOnModule, "modelInfo")

-		   String addOnVfModuleModelInfo = addOnVfModuleModelInfoObject.toString()

-		   execution.setVariable("addOnVfModuleModelInfo", addOnVfModuleModelInfo)

-		   String addOnVfModuleLabel = jsonUtil.getJsonValueForKey(addOnModule, "vfModuleLabel")

-		   execution.setVariable("addOnVfModuleLabel", addOnVfModuleLabel)

-		   String addOnPersonaModelId = jsonUtil.getJsonValueForKey(addOnVfModuleModelInfoObject, "modelInvariantId")

-		   execution.setVariable("addOnPersonaModelId", addOnPersonaModelId)

-		   String addOnInitialCount = jsonUtil.getJsonValueForKey(addOnModule, "initialCount")

-		   execution.setVariable("initialCount", addOnInitialCount)

-				   

-	   

-	   }catch(Exception e){

-		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

-	   }

-	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

-   }

-   

-   public void validateBaseModule(Execution execution){

-	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-	   execution.setVariable("prefix", Prefix)

-	   logDebug(" ======== STARTED validateBaseModule ======== ", isDebugLogEnabled)

-	   

-	   try {

-		   def baseRollbackData = execution.getVariable("DCVAM_baseRollbackData")

-		   def rollbackData = execution.getVariable("RollbackData")

-		   

-		   def baseModuleMap = baseRollbackData.get("VFMODULE")

-		   baseModuleMap.each{ k, v -> rollbackData.put("VFMODULE_BASE", "${k}","${v}") }

-		   execution.setVariable("RollbackData", rollbackData)

-		   

-	   }catch(Exception e){

-		   utils.log("ERROR", "Exception Occured Processing validateBaseModule. Exception is:\n" + e, isDebugLogEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during validateBaseModule Method:\n" + e.getMessage())

-	   }

-	   logDebug("======== COMPLETED validateBaseModule ======== ", isDebugLogEnabled)

-   }

-   

-   public void validateAddOnModule(Execution execution){

-	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-	   execution.setVariable("prefix", Prefix)

-	   logDebug(" ======== STARTED validateAddOnModule ======== ", isDebugLogEnabled)

-	   

-	   try {

-		   int instancesOfThisModuleDeployed = execution.getVariable("instancesOfThisModuleDeployed")

-		   int numOfCreatedAddOnModules = execution.getVariable("numOfCreatedAddOnModules")

-		   def addOnRollbackData = execution.getVariable("DCVAM_addOnRollbackData")

-		   def rollbackData = execution.getVariable("RollbackData")

-		   

-		   def addOnModuleMap = addOnRollbackData.get("VFMODULE")

-		   numOfCreatedAddOnModules = numOfCreatedAddOnModules + 1

-		   addOnModuleMap.each{ k, v -> rollbackData.put("VFMODULE_ADDON_" + numOfCreatedAddOnModules, "${k}","${v}") }

-		   

-		   execution.setVariable("DCVAM_addOnRollbackData", null)

-		   

-		   execution.setVariable("instancesOfThisModuleDeployed", instancesOfThisModuleDeployed + 1)

-		   

-		   execution.setVariable("numOfCreatedAddOnModules", numOfCreatedAddOnModules)

-		   rollbackData.put("VNFANDMODULES", "numOfCreatedAddOnModules", numOfCreatedAddOnModules)

-		   execution.setVariable("RollbackData", rollbackData)

-	   }catch(Exception e){

-		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

-	   }

-	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

-   }

-   

-   public void finishProcessingInitialCountDeployment(Execution execution){

-	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-	   execution.setVariable("prefix", Prefix)

-	   logDebug(" ======== STARTED finishProcessingInitialCountDeployment ======== ", isDebugLogEnabled)

-	   

-	   try {

-		   int addOnModulesDeployed = execution.getVariable("addOnModulesDeployed")

-		   execution.setVariable("addOnModulesDeployed", addOnModulesDeployed + 1)

-	   }catch(Exception e){

-		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

-		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

-	   }

-	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

-   }

-   

-   

-   

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import java.util.UUID;
+
+import org.json.JSONObject;
+import org.json.JSONArray;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution;
+
+import static org.apache.commons.lang3.StringUtils.*;
+
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.RollbackData
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.decomposition.ModelInfo
+import org.openecomp.mso.bpmn.core.decomposition.ModuleResource
+import org.openecomp.mso.bpmn.core.decomposition.ServiceDecomposition
+import org.openecomp.mso.bpmn.core.decomposition.VnfResource
+
+
+
+/**
+* This class supports the macro VID Flow
+* with the creation of a generic vnf and related VF modules.
+*/
+class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
+
+   String Prefix="DCVAM_"
+   ExceptionUtil exceptionUtil = new ExceptionUtil()
+   JsonUtils jsonUtil = new JsonUtils()
+   VidUtils vidUtils = new VidUtils(this)
+   CatalogDbUtils cutils = new CatalogDbUtils()
+
+   /**
+	* This method gets and validates the incoming
+	* request.
+	*
+	* @param - execution
+	*/
+   public void preProcessRequest(Execution execution) {
+	   def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+	   execution.setVariable("prefix",Prefix)
+	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)
+
+	   try{
+		   // Get Variables
+
+		   ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+
+		   String vnfModelInfo = execution.getVariable("vnfModelInfo")
+
+		   String requestId = execution.getVariable("msoRequestId")
+		   execution.setVariable("requestId", requestId)
+		   execution.setVariable("mso-request-id", requestId)
+		   utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)
+
+		   String serviceInstanceId = execution.getVariable("serviceInstanceId")
+		   utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
+
+		   String vnfType = execution.getVariable("vnfType")
+		   utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)
+
+		   String vnfName = execution.getVariable("vnfName")
+		   execution.setVariable("CREVI_vnfName", vnfName)
+		   utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)
+
+		   String productFamilyId = execution.getVariable("productFamilyId")
+		   utils.log("DEBUG", "Incoming Product Family Id is: " + productFamilyId, isDebugEnabled)
+
+		   String source = "VID"
+		   execution.setVariable("source", source)
+		   utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)
+
+		   String lcpCloudRegionId = execution.getVariable("lcpCloudRegionId")
+		   utils.log("DEBUG", "Incoming LCP Cloud Region Id is: " + lcpCloudRegionId)
+
+		   String tenantId = execution.getVariable("tenantId")
+		   utils.log("DEBUG", "Incoming Tenant Id is: " + tenantId)
+
+		   String disableRollback = execution.getVariable("disableRollback")
+		   utils.log("DEBUG", "Incoming Disable Rollback is: " + disableRollback, isDebugEnabled)
+
+		   String asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")
+		   utils.log("DEBUG", "Incoming asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugEnabled)
+
+		   String vnfId = execution.getVariable("testVnfId") // for junits
+		   if(isBlank(vnfId)){
+			   vnfId = execution.getVariable("vnfId")
+			   if (isBlank(vnfId)) {
+				   vnfId = UUID.randomUUID().toString()
+				   utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)
+			   }
+		   }
+		   execution.setVariable("vnfId", vnfId)
+
+		   def rollbackData = execution.getVariable("RollbackData")
+		   if (rollbackData == null) {
+			   rollbackData = new RollbackData()
+		   }
+
+		   execution.setVariable("numOfCreatedAddOnModules", 0)
+
+		   rollbackData.put("VNFANDMODULES", "numOfCreatedAddOnModules", "0")
+		   execution.setVariable("RollbackData", rollbackData)
+
+		   sleep (20000)
+
+
+	   }catch(BpmnError b){
+		   utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+		   throw b
+	   }catch(Exception e){
+		   utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")
+
+	   }
+	   utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)
+   }
+
+
+   public void queryCatalogDB (Execution execution) {
+	   def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+	   execution.setVariable("prefix",Prefix)
+
+	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules QueryCatalogDB Process *** ", isDebugEnabled)
+	   try {
+		   ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
+		   // if serviceDecomposition is specified, get info from serviceDecomposition
+		   if (serviceDecomposition != null) {
+			   utils.log("DEBUG", "Getting Catalog DB data from ServiceDecomposition object: " + serviceDecomposition.toJsonString(), isDebugEnabled)
+			   List<VnfResource> vnfs = serviceDecomposition.getServiceVnfs()
+			   utils.log("DEBUG", "Read vnfs", isDebugEnabled)
+			   if (vnfs == null) {
+				   utils.log("DEBUG", "Error - vnfs are empty in serviceDecomposition object", isDebugEnabled)
+				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf queryCatalogDB, vnfs are empty")
+			   }
+			   VnfResource vnf = vnfs[0]
+			   utils.log("DEBUG", "Read vnfResource", isDebugEnabled)
+			   if (vnf == null) {
+				   utils.log("DEBUG", "Error - vnf is empty in serviceDecomposition object", isDebugEnabled)
+				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf queryCatalogDB, vnf is null")
+			   }
+
+			   List<ModuleResource> vfModules = vnf.getAllVfModuleObjects()
+			   utils.log("DEBUG", "Read vfModules", isDebugEnabled)
+			   if (vfModules == null) {
+				   utils.log("DEBUG", "Error - vfModules are empty in serviceDecomposition object", isDebugEnabled)
+				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf queryCatalogDB, vf modules are empty")
+			   }
+			   JSONArray addOnModules = new JSONArray()
+
+			   for (int i = 0; i < vfModules.size; i++) {
+				   utils.log("DEBUG", "handling VF Module ", isDebugEnabled)
+				   ModuleResource vfModule = vfModules[i]
+				   boolean isBase = vfModule.getIsBase()
+				   if (isBase) {
+					   ModelInfo baseVfModuleModelInfoObject = vfModule.getModelInfo()
+					   String baseVfModuleModelInfoWithRoot = baseVfModuleModelInfoObject.toString()
+					   String baseVfModuleModelInfo = jsonUtil.getJsonValue(baseVfModuleModelInfoWithRoot, "modelInfo")
+					   execution.setVariable("baseVfModuleModelInfo", baseVfModuleModelInfo)
+					   String baseVfModuleLabel = vfModule.getVfModuleLabel()
+					   execution.setVariable("baseVfModuleLabel", baseVfModuleLabel)
+					   String basePersonaModelId = baseVfModuleModelInfoObject.getModelInvariantId()
+					   execution.setVariable("basePersonaModelId", basePersonaModelId)
+				   }
+				   else {
+					   addOnModules.put(vfModules[i])
+				   }
+			   }
+
+			   execution.setVariable("addOnModules", addOnModules)
+			   execution.setVariable("addOnModulesToDeploy", addOnModules.length())
+			   execution.setVariable("addOnModulesDeployed", 0)
+
+		   }
+		   else {
+			   //Get Vnf Info
+			   String vnfModelInfo = execution.getVariable("vnfModelInfo")
+			   utils.log("DEBUG", "vnfModelInfo: " + vnfModelInfo, isDebugEnabled)
+			   String vnfModelCustomizationUuid = jsonUtil.getJsonValueForKey(vnfModelInfo, "modelCustomizationId")
+			   if (vnfModelCustomizationUuid == null) {
+				   vnfModelCustomizationUuid = jsonUtil.getJsonValueForKey(vnfModelInfo, "modelCustomizationUuid")
+			   }
+			   utils.log("DEBUG", "querying Catalog DB by vnfModelCustomizationUuid: " + vnfModelCustomizationUuid, isDebugEnabled)
+			   String catalogDbEndpoint = execution.getVariable("URN_mso_catalog_db_endpoint")
+
+			   JSONArray vnfs = cutils.getAllVnfsByVnfModelCustomizationUuid(catalogDbEndpoint,
+							   vnfModelCustomizationUuid)
+			   utils.log("DEBUG", "obtained VNF list")
+			   // Only one match here
+			   JSONObject vnf = vnfs[0]
+			   JSONArray vfModules = vnf.getJSONArray("vfModules")
+			   JSONArray addOnModules = new JSONArray()
+
+			   // Set up base Vf Module info
+			   for (int i = 0; i < vfModules.length(); i++) {
+				   utils.log("DEBUG", "handling VF Module ")
+				   JSONObject vfModule = vfModules[i]
+				   String isBase = jsonUtil.getJsonValueForKey(vfModule, "isBase")
+				   if (isBase.equals("true")) {
+					   JSONObject baseVfModuleModelInfoObject = vfModule.getJSONObject("modelInfo")
+					   String baseVfModuleModelInfo = baseVfModuleModelInfoObject.toString()					  
+					   execution.setVariable("baseVfModuleModelInfo", baseVfModuleModelInfo)
+					   String baseVfModuleLabel = jsonUtil.getJsonValueForKey(vfModule, "vfModuleLabel")
+					   execution.setVariable("baseVfModuleLabel", baseVfModuleLabel)
+					   String basePersonaModelId = jsonUtil.getJsonValueForKey(baseVfModuleModelInfoObject, "modelInvariantId")
+					   execution.setVariable("basePersonaModelId", basePersonaModelId)
+				   }
+				   else {
+					   addOnModules.put(vfModules[i])
+				   }
+			   }
+
+			   execution.setVariable("addOnModules", addOnModules)
+			   execution.setVariable("addOnModulesToDeploy", addOnModules.length())
+			   execution.setVariable("addOnModulesDeployed", 0)
+		   }
+
+	   }catch(Exception ex) {
+		   utils.log("DEBUG", "Error Occured in DoCreateVnfAndModules QueryCatalogDB Process " + ex.getMessage(), isDebugEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnfAndModules QueryCatalogDB Process")
+	   }
+
+	   // Generate vfModuleId for base VF Module
+	   def baseVfModuleId = UUID.randomUUID().toString()
+	   execution.setVariable("baseVfModuleId", baseVfModuleId)
+	   // For JUnits
+	   String requestId = execution.getVariable("requestId")
+	   if (requestId.equals("testRequestId123")) {
+		   execution.setVariable("vnfId", "skask")
+	   }
+
+	   utils.log("DEBUG", "*** COMPLETED CreateVnfInfra PrepareCreateGenericVnf Process ***", isDebugEnabled)
+   }
+
+   public void preProcessAddOnModule(Execution execution){
+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+	   execution.setVariable("prefix", Prefix)
+	   logDebug(" ======== STARTED preProcessAddOnModule ======== ", isDebugLogEnabled)
+
+	   try {
+		   JSONArray addOnModules = (JSONArray) execution.getVariable("addOnModules")
+		   int addOnIndex = (int) execution.getVariable("addOnModulesDeployed")
+
+		   JSONObject addOnModule = addOnModules[addOnIndex]
+
+		   def newVfModuleId = UUID.randomUUID().toString()
+		   execution.setVariable("addOnVfModuleId", newVfModuleId)
+
+		   execution.setVariable("instancesOfThisModelDeployed", 0)
+
+		   JSONObject addOnVfModuleModelInfoObject = jsonUtil.getJsonValueForKey(addOnModule, "modelInfo")
+		   String addOnVfModuleModelInfoWithRoot = addOnVfModuleModelInfoObject.toString()		   
+		   String addOnVfModuleModelInfo = jsonUtil.getJsonValue(addOnVfModuleModelInfoWithRoot, "modelInfo")
+		   execution.setVariable("addOnVfModuleModelInfo", addOnVfModuleModelInfo)
+		   String addOnVfModuleLabel = jsonUtil.getJsonValueForKey(addOnModule, "vfModuleLabel")
+		   execution.setVariable("addOnVfModuleLabel", addOnVfModuleLabel)
+		   String addOnPersonaModelId = jsonUtil.getJsonValueForKey(addOnVfModuleModelInfoObject, "modelInvariantId")
+		   execution.setVariable("addOnPersonaModelId", addOnPersonaModelId)
+		   String addOnInitialCount = jsonUtil.getJsonValueForKey(addOnModule, "initialCount")
+		   execution.setVariable("initialCount", addOnInitialCount)
+
+
+	   }catch(Exception e){
+		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())
+	   }
+	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
+   }
+
+   public void validateBaseModule(Execution execution){
+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+	   execution.setVariable("prefix", Prefix)
+	   logDebug(" ======== STARTED validateBaseModule ======== ", isDebugLogEnabled)
+
+	   try {
+		   def baseRollbackData = execution.getVariable("DCVAM_baseRollbackData")
+		   def rollbackData = execution.getVariable("RollbackData")
+
+		   def baseModuleMap = baseRollbackData.get("VFMODULE")
+		   baseModuleMap.each{ k, v -> rollbackData.put("VFMODULE_BASE", "${k}","${v}") }
+		   execution.setVariable("RollbackData", rollbackData)
+		   logDebug("addOnModulesDeployed: " + execution.getVariable("addOnModulesDeployed"), isDebugLogEnabled)
+		   logDebug("addOnModulesToDeploy: " + execution.getVariable("addOnModulesToDeploy"), isDebugLogEnabled)
+		   if (execution.getVariable("addOnModulesDeployed") <  execution.getVariable("addOnModulesToDeploy")) {
+			   logDebug("More add on modules to deploy", isDebugLogEnabled)
+		   }
+		   else {
+			   logDebug("No more add on modules to deploy", isDebugLogEnabled)
+		   }
+
+	   }catch(Exception e){
+		   utils.log("ERROR", "Exception Occured Processing validateBaseModule. Exception is:\n" + e, isDebugLogEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during validateBaseModule Method:\n" + e.getMessage())
+	   }
+	   logDebug("======== COMPLETED validateBaseModule ======== ", isDebugLogEnabled)
+   }
+
+   public void validateAddOnModule(Execution execution){
+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+	   execution.setVariable("prefix", Prefix)
+	   logDebug(" ======== STARTED validateAddOnModule ======== ", isDebugLogEnabled)
+
+	   try {
+		   int instancesOfThisModuleDeployed = execution.getVariable("instancesOfThisModuleDeployed")
+		   int numOfCreatedAddOnModules = execution.getVariable("numOfCreatedAddOnModules")
+		   def addOnRollbackData = execution.getVariable("DCVAM_addOnRollbackData")
+		   def rollbackData = execution.getVariable("RollbackData")
+
+		   def addOnModuleMap = addOnRollbackData.get("VFMODULE")
+		   numOfCreatedAddOnModules = numOfCreatedAddOnModules + 1
+		   addOnModuleMap.each{ k, v -> rollbackData.put("VFMODULE_ADDON_" + numOfCreatedAddOnModules, "${k}","${v}") }
+
+		   execution.setVariable("DCVAM_addOnRollbackData", null)
+
+		   execution.setVariable("instancesOfThisModuleDeployed", instancesOfThisModuleDeployed + 1)
+
+		   execution.setVariable("numOfCreatedAddOnModules", numOfCreatedAddOnModules)
+		   rollbackData.put("VNFANDMODULES", "numOfCreatedAddOnModules", "${numOfCreatedAddOnModules}")
+		   execution.setVariable("RollbackData", rollbackData)
+	   }catch(Exception e){
+		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())
+	   }
+	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
+   }
+
+   public void finishProcessingInitialCountDeployment(Execution execution){
+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+	   execution.setVariable("prefix", Prefix)
+	   logDebug(" ======== STARTED finishProcessingInitialCountDeployment ======== ", isDebugLogEnabled)
+
+	   try {
+		   int addOnModulesDeployed = execution.getVariable("addOnModulesDeployed")
+		   execution.setVariable("addOnModulesDeployed", addOnModulesDeployed + 1)
+	   }catch(Exception e){
+		   utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
+		   exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())
+	   }
+	   logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
+   }
+
+
+
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
index 76a86ff..2bf3e55 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
@@ -1,35 +1,35 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AaiUtil

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse;

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse;
+import org.openecomp.mso.rest.RESTClient
+import org.openecomp.mso.rest.RESTConfig
 
 import java.util.UUID;
 
@@ -239,7 +239,6 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 		String networkInputs  = execution.getVariable(Prefix + "networkInputs")
 		String networkId   = utils.getNodeText(networkInputs, "network-id")
 		networkId = UriUtils.encode(networkId,"UTF-8")
-		String messageId = execution.getVariable(Prefix + "messageId")
 
 		// Prepare AA&I url
 		String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -255,11 +254,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 		ExceptionUtil exceptionUtil = new ExceptionUtil()
 		Boolean isVfRelationshipExist = false
 		try {
-			RESTClient client = new RESTClient(config).addHeader("X-TransactionId", messageId)
-													  .addHeader("X-FromAppId", "MSO")
-													  .addHeader("Content-Type", "application/xml")
-													  .addHeader("Accept","application/xml");
-			APIResponse response = client.get()
+			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryAAIRequest)
 			String returnCode = response.getStatusCode()
 			execution.setVariable(Prefix + "aaiReturnCode", returnCode)
 
@@ -520,15 +515,14 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			
 			String serviceInstanceId = utils.getNodeText1(deleteNetworkInput, "service-instance-id")
 
-			// get/set 'msoRequestId' and 'mso-request-id'

+			// get/set 'msoRequestId' and 'mso-request-id'
 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)

+				execution.setVariable("mso-request-id", requestId)
 			} else {
-			    requestId = execution.getVariable("mso-request-id")

+			    requestId = execution.getVariable("mso-request-id")
 			} 	
 			execution.setVariable(Prefix + "requestId", requestId)
-			

 			utils.log("DEBUG", Prefix + "requestId " + requestId, isDebugEnabled)
 			String queryAAIResponse = execution.getVariable(Prefix + "queryAAIResponse")
 			
@@ -655,7 +649,7 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 					execution.setVariable(Prefix + "rollbackNetworkRequest", "")
 				} else {
 				    String rollbackNetwork =
-					  """<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">

+					  """<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">
 						  	${rollbackData}
 						 </NetworkAdapter:rollbackNetwork>"""
 				    String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
@@ -996,12 +990,12 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 			
 			String serviceInstanceId = utils.getNodeText1(deleteNetworkInput, "service-instance-id")
 
-			// get/set 'msoRequestId' and 'mso-request-id'

+			// get/set 'msoRequestId' and 'mso-request-id'
 			String requestId = execution.getVariable("msoRequestId")
 			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)

+				execution.setVariable("mso-request-id", requestId)
 			} else {
-			    requestId = execution.getVariable("mso-request-id")

+			    requestId = execution.getVariable("mso-request-id")
 			} 	
 			execution.setVariable(Prefix + "requestId", requestId)
 			
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
index 6daec69..32197c1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
@@ -1,420 +1,420 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import static org.apache.commons.lang3.StringUtils.*;

-import groovy.xml.XmlUtil

-import groovy.json.*

-

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.rest.APIResponse;

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

-

-import java.util.UUID;

-import javax.xml.parsers.DocumentBuilder

-import javax.xml.parsers.DocumentBuilderFactory

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution

-import org.json.JSONObject;

-import org.apache.commons.lang3.*

-import org.apache.commons.codec.binary.Base64;

-import org.springframework.web.util.UriUtils;

-import org.w3c.dom.Document

-import org.w3c.dom.Element

-import org.w3c.dom.Node

-import org.w3c.dom.NodeList

-import org.xml.sax.InputSource

-

-/**

- * This groovy class supports the <class>DoDeleteServiceInstance.bpmn</class> process.

- * 

- * Inputs:

- * @param - msoRequestId

- * @param - globalSubscriberId - O

- * @param - subscriptionServiceType - O

- * @param - serviceInstanceId

- * @param - serviceInstanceName - O

- * @param - serviceModelInfo - O

- * @param - productFamilyId

- * @param - sdncVersion 

- * @param - failNotFound - TODO

- * @param - serviceInputParams - TODO

- *

- * Outputs:

- * @param - WorkflowException

- * 

- * Rollback - Deferred

- */

-public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {

-

-	String Prefix="DDELSI_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils()

-

-	public void preProcessRequest (Execution execution) {

-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)

-		String msg = ""

-

-		try {

-			String requestId = execution.getVariable("msoRequestId")

-			execution.setVariable("prefix",Prefix)

-

-			//Inputs

-			//requestDetails.subscriberInfo. for AAI GET & PUT & SDNC assignToplology

-			String globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId

-			if (globalSubscriberId == null)

-			{

-				execution.setVariable("globalSubscriberId", "")

-			}

-

-			//requestDetails.requestParameters. for AAI PUT & SDNC assignTopology

-			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")

-			if (subscriptionServiceType == null)

-			{

-				execution.setVariable("subscriptionServiceType", "")

-			}

-

-			//Generated in parent for AAI PUT

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			if (isBlank(serviceInstanceId)){

-				msg = "Input serviceInstanceId is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			}

-

-			String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			if (isBlank(sdncCallbackUrl)) {

-				msg = "URN_mso_workflow_sdncadapter_callback is null"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-			}

-			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)

-			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)

-

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex){

-			msg = "Exception in preProcessRequest " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)

-	}

-

-	public void preProcessSDNCDelete (Execution execution) {

-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG"," ***** preProcessSDNCDelete *****", isDebugEnabled)

-		String msg = ""

-

-		try {

-			/*

-			 String uuid = execution.getVariable('testReqId') // for junits

-			 if(uuid==null){

-			 uuid = execution.getVariable("msoRequestId") + "-" +  	System.currentTimeMillis()

-			 }

-			 */

-			def serviceInstanceId = execution.getVariable("serviceInstanceId")

-			def serviceInstanceName = execution.getVariable("serviceInstanceName")

-			def callbackURL = execution.getVariable("sdncCallbackUrl")

-			def requestId = execution.getVariable("msoRequestId")

-			def serviceId = execution.getVariable("productFamilyId")

-			def subscriptionServiceType = execution.getVariable("subscriptionServiceType")

-			def globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId

-

-			String serviceModelInfo = execution.getVariable("serviceModelInfo")

-			def modelInvariantId = ""

-			def modelVersion = ""

-			def modelUUId = ""

-			def modelName = ""

-			if (!isBlank(serviceModelInfo))

-			{

-				modelInvariantId = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantId")

-				modelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")

-				modelUUId = jsonUtil.getJsonValue(serviceModelInfo, "modelVersionId")

-				modelName = jsonUtil.getJsonValue(serviceModelInfo, "modelName")

-				

-				if (modelInvariantId == null) {

-					modelInvariantId = ""

-				}

-				if (modelVersion == null) {

-					modelVersion = ""

-				}

-				if (modelUUId == null) {

-					modelUUId = ""

-				}

-				if (modelName == null) {

-					modelName = ""

-				}

-			}

-			if (serviceInstanceName == null) {

-				serviceInstanceName = ""

-			}

-			if (serviceId == null) {

-				serviceId = ""

-			}

-			

-			def sdncRequestId = UUID.randomUUID().toString()

-

-			String sdncDelete =

-			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"

-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-				   <sdncadapter:RequestHeader>

-							<sdncadapter:RequestId>${sdncRequestId}</sdncadapter:RequestId>

-							<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

-							<sdncadapter:SvcAction>delete</sdncadapter:SvcAction>

-							<sdncadapter:SvcOperation>service-topology-operation</sdncadapter:SvcOperation>

-							<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>

-					</sdncadapter:RequestHeader>

-				<sdncadapterworkflow:SDNCRequestData>

-					<request-information>

-						<request-id>${requestId}</request-id>

-						<source>MSO</source>

-						<notification-url/>

-						<order-number/>

-						<order-version/>

-						<request-action>DeleteServiceInstance</request-action>

-					</request-information>

-					<service-information>

-						<service-id>${serviceId}</service-id>

-						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>

-						<ecomp-model-information>

-					         <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>

-					         <model-uuid>${modelUUId}</model-uuid>

-					         <model-version>${modelVersion}</model-version>

-					         <model-name>${modelName}</model-name>

-					    </ecomp-model-information>

-						<service-instance-id>${serviceInstanceId}</service-instance-id>

-						<subscriber-name/>

-						<global-customer-id>${globalSubscriberId}</global-customer-id>

-					</service-information>

-					<service-request-input>

-						<service-instance-name>${serviceInstanceName}</service-instance-name>

-					</service-request-input>

-				</sdncadapterworkflow:SDNCRequestData>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""

-

-			utils.log("DEBUG","sdncDelete:\n" + sdncDelete, isDebugEnabled)

-			sdncDelete = utils.formatXml(sdncDelete)

-			execution.setVariable("sdncDelete", sdncDelete)

-			utils.logAudit("sdncDelete:  " + sdncDelete)

-

-

-		} catch (BpmnError e) {

-			throw e;

-		} catch(Exception ex) {

-			msg = "Exception in preProcessSDNCDelete. " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())

-		}

-		utils.log("DEBUG"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)

-	}

-

-	public void postProcessSDNCDelete(Execution execution) {

-

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG"," ***** postProcessSDNCDelete ***** ", isDebugEnabled)

-		String msg = ""

-

-		try {

-			WorkflowException workflowException = execution.getVariable("WorkflowException")

-			utils.logAudit("workflowException: " + workflowException)

-

-			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

-			String response = execution.getVariable("sdncAdapterResponse")

-			utils.logAudit("SDNCResponse: " + response)

-

-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

-			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

-

-			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){

-				utils.log("DEBUG","Good response from SDNC Adapter for service-instance  topology assign: \n" + response, isDebugEnabled)

-

-			}else{

-				msg = "Bad Response from SDNC Adapter for service-instance delete"

-				utils.log("DEBUG", msg, isDebugEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 3500, msg)

-			}

-		} catch (BpmnError e) {

-			throw e;

-		} catch(Exception ex) {

-			msg = "Exception in postProcessSDNCDelete. " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())

-		}

-		utils.log("DEBUG"," *** Exit postProcessSDNCDelete *** ", isDebugEnabled)

-	}

-

-	public void postProcessAAIGET(Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG"," ***** postProcessAAIGET ***** ", isDebugEnabled)

-		String msg = ""

-

-		try {

-

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")

-

-			if(foundInAAI == true){

-				utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)

-

-				//Extract GlobalSubscriberId

-				String siRelatedLink = execution.getVariable("GENGS_siResourceLink")

-				if (isBlank(siRelatedLink))

-				{

-					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId

-					utils.log("DEBUG", msg, isDebugEnabled)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-				}

-				else

-				{

-					utils.log("DEBUG","Found Service-instance in AAI. link: " + siRelatedLink, isDebugEnabled)

-					String  globalSubscriberId = execution.getVariable("globalSubscriberId")

-					if(isBlank(globalSubscriberId)){

-						int custStart = siRelatedLink.indexOf("customer/")

-						int custEnd = siRelatedLink.indexOf("/service-subscriptions")

-						globalSubscriberId = siRelatedLink.substring(custStart + 9, custEnd)

-						execution.setVariable("globalSubscriberId", globalSubscriberId)

-					}

-

-					//Extract Service Type if not provided on request

-					String serviceType = execution.getVariable("subscriptionServiceType")

-					if(isBlank(serviceType)){

-						int serviceStart = siRelatedLink.indexOf("service-subscription/")

-						int serviceEnd = siRelatedLink.indexOf("/service-instances/")

-						String serviceTypeEncoded = siRelatedLink.substring(serviceStart + 21, serviceEnd)

-						serviceType = UriUtils.decode(serviceTypeEncoded, "UTF-8")

-						execution.setVariable("subscriptionServiceType", serviceType)

-					}

-

-					if (isBlank(globalSubscriberId) || isBlank(serviceType))

-					{

-						msg = "Could not retrive global-customer-id & service-type from AAI to delete id:" + serviceInstanceId

-						utils.log("DEBUG", msg, isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-					}

-				}

-

-				String siData = execution.getVariable("GENGS_service")

-				utils.log("DEBUG", "SI Data", isDebugEnabled)

-				if (isBlank(siData))

-				{

-					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId

-					utils.log("DEBUG", msg, isDebugEnabled)

-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)

-				}

-				else

-				{

-					utils.log("DEBUG", "SI Data" + siData, isDebugEnabled)

-					//Confirm there are no related service instances (vnf/network or volume)

-					if (utils.nodeExists(siData, "relationship-list")) {

-						utils.log("DEBUG", "SI Data relationship-list exists:", isDebugEnabled)

-						InputSource source = new InputSource(new StringReader(siData));

-						DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

-						DocumentBuilder docBuilder = docFactory.newDocumentBuilder()

-						Document serviceXml = docBuilder.parse(source)

-

-						NodeList nodeList = serviceXml.getElementsByTagName("relationship")

-						for (int x = 0; x < nodeList.getLength(); x++) {

-							Node node = nodeList.item(x)

-							if (node.getNodeType() == Node.ELEMENT_NODE) {

-								Element eElement = (Element) node

-								def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()

-								if(e.equals("generic-vnf") || e.equals("l3-network")){

-									utils.log("DEBUG", "ServiceInstance still has relationship(s) to generic-vnfs or l3-networks", isDebugEnabled)

-									execution.setVariable("siInUse", true)

-									//there are relationship dependencies to this Service Instance

-									msg = " Stopped deleting Service Instance, it has dependencies. Service instance id: " + serviceInstanceId

-									utils.log("DEBUG", msg, isDebugEnabled)

-									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)

-								}else{

-									utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)

-								}

-							}

-						}

-					}

-				}

-			}else{

-				boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")

-				if(succInAAI != true){

-					utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)

-					WorkflowException workflowException = execution.getVariable("WorkflowException")

-					utils.logAudit("workflowException: " + workflowException)

-					if(workflowException != null){

-						exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())

-					}

-					else

-					{

-						msg = "Failure in postProcessAAIGET GENGS_SuccessIndicator:" + succInAAI

-						utils.log("DEBUG", msg, isDebugEnabled)

-						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)

-					}

-				}

-				utils.log("DEBUG","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)

-			}

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex) {

-			msg = "Exception in DoDeleteServiceInstance.postProcessAAIGET. " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," *** Exit postProcessAAIGET *** ", isDebugEnabled)

-	}

-	

-	public void postProcessAAIDEL(Execution execution) {

-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")

-		utils.log("DEBUG"," ***** postProcessAAIDEL ***** ", isDebugEnabled)

-		String msg = ""

-		try {

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")

-			boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")

-			if(succInAAI != true){

-				msg = "Error deleting Service-instance in AAI" + serviceInstanceId

-				utils.log("DEBUG", msg, isDebugEnabled)

-				WorkflowException workflowException = execution.getVariable("WorkflowException")

-				utils.logAudit("workflowException: " + workflowException)

-				if(workflowException != null){

-					exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())

-				}

-				else

-				{

-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)

-				}

-			}

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception ex) {

-			msg = "Exception in DoDeleteServiceInstance.postProcessAAIDEL. " + ex.getMessage()

-			utils.log("DEBUG", msg, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)

-		}

-		utils.log("DEBUG"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)

-	}

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts;
+
+import static org.apache.commons.lang3.StringUtils.*;
+import groovy.xml.XmlUtil
+import groovy.json.*
+
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.rest.APIResponse;
+import org.openecomp.mso.rest.RESTClient
+import org.openecomp.mso.rest.RESTConfig
+
+import java.util.UUID;
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.json.JSONObject;
+import org.apache.commons.lang3.*
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.util.UriUtils;
+import org.w3c.dom.Document
+import org.w3c.dom.Element
+import org.w3c.dom.Node
+import org.w3c.dom.NodeList
+import org.xml.sax.InputSource
+
+/**
+ * This groovy class supports the <class>DoDeleteServiceInstance.bpmn</class> process.
+ * 
+ * Inputs:
+ * @param - msoRequestId
+ * @param - globalSubscriberId - O
+ * @param - subscriptionServiceType - O
+ * @param - serviceInstanceId
+ * @param - serviceInstanceName - O
+ * @param - serviceModelInfo - O
+ * @param - productFamilyId
+ * @param - sdncVersion 
+ * @param - failNotFound - TODO
+ * @param - serviceInputParams - TODO
+ *
+ * Outputs:
+ * @param - WorkflowException
+ * 
+ * Rollback - Deferred
+ */
+public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {
+
+	String Prefix="DDELSI_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils()
+
+	public void preProcessRequest (Execution execution) {
+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)
+		String msg = ""
+
+		try {
+			String requestId = execution.getVariable("msoRequestId")
+			execution.setVariable("prefix",Prefix)
+
+			//Inputs
+			//requestDetails.subscriberInfo. for AAI GET & PUT & SDNC assignToplology
+			String globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId
+			if (globalSubscriberId == null)
+			{
+				execution.setVariable("globalSubscriberId", "")
+			}
+
+			//requestDetails.requestParameters. for AAI PUT & SDNC assignTopology
+			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
+			if (subscriptionServiceType == null)
+			{
+				execution.setVariable("subscriptionServiceType", "")
+			}
+
+			//Generated in parent for AAI PUT
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			if (isBlank(serviceInstanceId)){
+				msg = "Input serviceInstanceId is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			}
+
+			String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			if (isBlank(sdncCallbackUrl)) {
+				msg = "URN_mso_workflow_sdncadapter_callback is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			}
+			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
+			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex){
+			msg = "Exception in preProcessRequest " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+	}
+
+	public void preProcessSDNCDelete (Execution execution) {
+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** preProcessSDNCDelete *****", isDebugEnabled)
+		String msg = ""
+
+		try {
+			/*
+			 String uuid = execution.getVariable('testReqId') // for junits
+			 if(uuid==null){
+			 uuid = execution.getVariable("msoRequestId") + "-" +  	System.currentTimeMillis()
+			 }
+			 */
+			def serviceInstanceId = execution.getVariable("serviceInstanceId")
+			def serviceInstanceName = execution.getVariable("serviceInstanceName")
+			def callbackURL = execution.getVariable("sdncCallbackUrl")
+			def requestId = execution.getVariable("msoRequestId")
+			def serviceId = execution.getVariable("productFamilyId")
+			def subscriptionServiceType = execution.getVariable("subscriptionServiceType")
+			def globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId
+
+			String serviceModelInfo = execution.getVariable("serviceModelInfo")
+			def modelInvariantId = ""
+			def modelVersion = ""
+			def modelUUId = ""
+			def modelName = ""
+			if (!isBlank(serviceModelInfo))
+			{
+				modelInvariantId = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantId")
+				modelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")
+				modelUUId = jsonUtil.getJsonValue(serviceModelInfo, "modelVersionId")
+				modelName = jsonUtil.getJsonValue(serviceModelInfo, "modelName")
+				
+				if (modelInvariantId == null) {
+					modelInvariantId = ""
+				}
+				if (modelVersion == null) {
+					modelVersion = ""
+				}
+				if (modelUUId == null) {
+					modelUUId = ""
+				}
+				if (modelName == null) {
+					modelName = ""
+				}
+			}
+			if (serviceInstanceName == null) {
+				serviceInstanceName = ""
+			}
+			if (serviceId == null) {
+				serviceId = ""
+			}
+			
+			def sdncRequestId = UUID.randomUUID().toString()
+
+			String sdncDelete =
+			"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+				   <sdncadapter:RequestHeader>
+							<sdncadapter:RequestId>${sdncRequestId}</sdncadapter:RequestId>
+							<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>
+							<sdncadapter:SvcAction>delete</sdncadapter:SvcAction>
+							<sdncadapter:SvcOperation>service-topology-operation</sdncadapter:SvcOperation>
+							<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
+					</sdncadapter:RequestHeader>
+				<sdncadapterworkflow:SDNCRequestData>
+					<request-information>
+						<request-id>${requestId}</request-id>
+						<source>MSO</source>
+						<notification-url/>
+						<order-number/>
+						<order-version/>
+						<request-action>DeleteServiceInstance</request-action>
+					</request-information>
+					<service-information>
+						<service-id>${serviceId}</service-id>
+						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
+						<ecomp-model-information>
+					         <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
+					         <model-uuid>${modelUUId}</model-uuid>
+					         <model-version>${modelVersion}</model-version>
+					         <model-name>${modelName}</model-name>
+					    </ecomp-model-information>
+						<service-instance-id>${serviceInstanceId}</service-instance-id>
+						<subscriber-name/>
+						<global-customer-id>${globalSubscriberId}</global-customer-id>
+					</service-information>
+					<service-request-input>
+						<service-instance-name>${serviceInstanceName}</service-instance-name>
+					</service-request-input>
+				</sdncadapterworkflow:SDNCRequestData>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+
+			sdncDelete = utils.formatXml(sdncDelete)
+			def sdncRequestId2 = UUID.randomUUID().toString()
+			String sdncDeactivate = sdncDelete.replace(">delete<", ">deactivate<").replace(">${sdncRequestId}<", ">${sdncRequestId2}<")
+			execution.setVariable("sdncDelete", sdncDelete)
+			execution.setVariable("sdncDeactivate", sdncDeactivate)
+			utils.log("DEBUG","sdncDeactivate:\n" + sdncDeactivate, isDebugEnabled)
+			utils.log("DEBUG","sdncDelete:\n" + sdncDelete, isDebugEnabled)
+
+		} catch (BpmnError e) {
+			throw e;
+		} catch(Exception ex) {
+			msg = "Exception in preProcessSDNCDelete. " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())
+		}
+		utils.log("DEBUG"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)
+	}
+
+	public void postProcessSDNCDelete(Execution execution, String response, String method) {
+
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** postProcessSDNC " + method + " *****", isDebugEnabled)
+		String msg = ""
+
+		try {
+			WorkflowException workflowException = execution.getVariable("WorkflowException")
+			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+			utils.log("DEBUG", "SDNCResponse: " + response, isDebugEnabled)
+			utils.log("DEBUG", "workflowException: " + workflowException, isDebugEnabled)
+			
+			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+
+			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
+				utils.log("DEBUG","Good response from SDNC Adapter for service-instance " + method + "response:\n" + response, isDebugEnabled)
+
+			}else{
+				msg = "Bad Response from SDNC Adapter for service-instance " + method
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 3500, msg)
+			}
+		} catch (BpmnError e) {
+			throw e;
+		} catch(Exception ex) {
+			msg = "Exception in postProcessSDNC " + method + " Exception:" + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," *** Exit postProcessSDNC " + method + " ***", isDebugEnabled)
+	}
+
+	public void postProcessAAIGET(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** postProcessAAIGET ***** ", isDebugEnabled)
+		String msg = ""
+
+		try {
+
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
+
+			if(foundInAAI == true){
+				utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)
+
+				//Extract GlobalSubscriberId
+				String siRelatedLink = execution.getVariable("GENGS_siResourceLink")
+				if (isBlank(siRelatedLink))
+				{
+					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
+					utils.log("DEBUG", msg, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+				}
+				else
+				{
+					utils.log("DEBUG","Found Service-instance in AAI. link: " + siRelatedLink, isDebugEnabled)
+					String  globalSubscriberId = execution.getVariable("globalSubscriberId")
+					if(isBlank(globalSubscriberId)){
+						int custStart = siRelatedLink.indexOf("customer/")
+						int custEnd = siRelatedLink.indexOf("/service-subscriptions")
+						globalSubscriberId = siRelatedLink.substring(custStart + 9, custEnd)
+						execution.setVariable("globalSubscriberId", globalSubscriberId)
+					}
+
+					//Extract Service Type if not provided on request
+					String serviceType = execution.getVariable("subscriptionServiceType")
+					if(isBlank(serviceType)){
+						int serviceStart = siRelatedLink.indexOf("service-subscription/")
+						int serviceEnd = siRelatedLink.indexOf("/service-instances/")
+						String serviceTypeEncoded = siRelatedLink.substring(serviceStart + 21, serviceEnd)
+						serviceType = UriUtils.decode(serviceTypeEncoded, "UTF-8")
+						execution.setVariable("subscriptionServiceType", serviceType)
+					}
+
+					if (isBlank(globalSubscriberId) || isBlank(serviceType))
+					{
+						msg = "Could not retrive global-customer-id & service-type from AAI to delete id:" + serviceInstanceId
+						utils.log("DEBUG", msg, isDebugEnabled)
+						exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+					}
+				}
+
+				String siData = execution.getVariable("GENGS_service")
+				utils.log("DEBUG", "SI Data", isDebugEnabled)
+				if (isBlank(siData))
+				{
+					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
+					utils.log("DEBUG", msg, isDebugEnabled)
+					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+				}
+				else
+				{
+					utils.log("DEBUG", "SI Data" + siData, isDebugEnabled)
+					//Confirm there are no related service instances (vnf/network or volume)
+					if (utils.nodeExists(siData, "relationship-list")) {
+						utils.log("DEBUG", "SI Data relationship-list exists:", isDebugEnabled)
+						InputSource source = new InputSource(new StringReader(siData));
+						DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+						DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
+						Document serviceXml = docBuilder.parse(source)
+
+						NodeList nodeList = serviceXml.getElementsByTagName("relationship")
+						for (int x = 0; x < nodeList.getLength(); x++) {
+							Node node = nodeList.item(x)
+							if (node.getNodeType() == Node.ELEMENT_NODE) {
+								Element eElement = (Element) node
+								def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()
+								if(e.equals("generic-vnf") || e.equals("l3-network")){
+									utils.log("DEBUG", "ServiceInstance still has relationship(s) to generic-vnfs or l3-networks", isDebugEnabled)
+									execution.setVariable("siInUse", true)
+									//there are relationship dependencies to this Service Instance
+									msg = " Stopped deleting Service Instance, it has dependencies. Service instance id: " + serviceInstanceId
+									utils.log("DEBUG", msg, isDebugEnabled)
+									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
+								}else{
+									utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)
+								}
+							}
+						}
+					}
+				}
+			}else{
+				boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
+				if(succInAAI != true){
+					utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
+					WorkflowException workflowException = execution.getVariable("WorkflowException")
+					utils.logAudit("workflowException: " + workflowException)
+					if(workflowException != null){
+						exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())
+					}
+					else
+					{
+						msg = "Failure in postProcessAAIGET GENGS_SuccessIndicator:" + succInAAI
+						utils.log("DEBUG", msg, isDebugEnabled)
+						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
+					}
+				}
+				utils.log("DEBUG","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)
+			}
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex) {
+			msg = "Exception in DoDeleteServiceInstance.postProcessAAIGET. " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
+	}
+	
+	public void postProcessAAIDEL(Execution execution) {
+		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+		utils.log("DEBUG"," ***** postProcessAAIDEL ***** ", isDebugEnabled)
+		String msg = ""
+		try {
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")
+			if(succInAAI != true){
+				msg = "Error deleting Service-instance in AAI" + serviceInstanceId
+				utils.log("DEBUG", msg, isDebugEnabled)
+				WorkflowException workflowException = execution.getVariable("WorkflowException")
+				utils.logAudit("workflowException: " + workflowException)
+				if(workflowException != null){
+					exceptionUtil.buildAndThrowWorkflowException(execution, workflowException.getErrorCode(), workflowException.getErrorMessage())
+				}
+				else
+				{
+					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
+				}
+			}
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception ex) {
+			msg = "Exception in DoDeleteServiceInstance.postProcessAAIDEL. " + ex.getMessage()
+			utils.log("DEBUG", msg, isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+		}
+		utils.log("DEBUG"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)
+	}
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
index 92456b0..208caa7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
@@ -1,256 +1,484 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.openecomp.mso.bpmn.infrastructure.scripts

-

-import java.util.UUID;

-

-import org.json.JSONObject;

-import org.json.JSONArray;

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution;

-

-import static org.apache.commons.lang3.StringUtils.*;

-

-import org.openecomp.mso.bpmn.core.json.JsonUtils

-import org.openecomp.mso.rest.APIResponse

-import org.openecomp.mso.rest.RESTClient

-import org.openecomp.mso.rest.RESTConfig

-import org.openecomp.mso.bpmn.common.scripts.AaiUtil

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.VidUtils

-import org.openecomp.mso.bpmn.core.RollbackData

-import org.openecomp.mso.bpmn.core.WorkflowException

-

-/**

- * This class supports the macro VID Flow

- * with the deletion of a generic vnf and related VF modules.

- */

-class DoDeleteVnfAndModules extends AbstractServiceTaskProcessor {

-

-	String Prefix="DDVAM_"

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-	VidUtils vidUtils = new VidUtils(this)	

-

-	/**

-	 * This method gets and validates the incoming

-	 * request.

-	 *

-	 * @param - execution

-	 *	

-	 */

-	public void preProcessRequest(Execution execution) {

-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix",Prefix)

-		utils.log("DEBUG", " *** STARTED DoDeleteVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)

-

-		try{

-			// Get Variables				

-			

-			String cloudConfiguration = execution.getVariable("cloudConfiguration")			

-			

-			String requestId = execution.getVariable("requestId")

-			execution.setVariable("mso-request-id", requestId)

-			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)

-

-			String serviceInstanceId = execution.getVariable("serviceInstanceId")			

-			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)

-

-			String vnfId = execution.getVariable("vnfId")			

-			utils.log("DEBUG", "Incoming Vnf Id is: " + vnfId, isDebugEnabled)			

-			

-			String source = "VID"

-			execution.setVariable("source", source)

-			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)

-			

-			execution.setVariable("DDVAM_moduleCount", 0)

-			execution.setVariable("DDVAM_nextModule", 0)

-			

-			

-		}catch(BpmnError b){

-			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)

-			throw b

-		}catch(Exception e){

-			utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")

-

-		}

-		utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)

-	}	

-

-	

-	

-	public void preProcessAddOnModule(Execution execution){

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-		logDebug(" ======== STARTED preProcessAddOnModule ======== ", isDebugLogEnabled)

-		

-		try {			

-			JSONArray addOnModules = (JSONArray) execution.getVariable("addOnModules")

-			int addOnIndex = (int) execution.getVariable("addOnModulesDeployed")

-			

-			JSONObject addOnModule = addOnModules[addOnIndex]

-			

-			def newVfModuleId = UUID.randomUUID().toString()

-			execution.setVariable("addOnVfModuleId", newVfModuleId)

-			

-			execution.setVariable("instancesOfThisModelDeployed", 0)

-			

-			JSONObject addOnVfModuleModelInfoObject = jsonUtil.getJsonValueForKey(addOnModule, "modelInfo")

-			String addOnVfModuleModelInfo = addOnVfModuleModelInfoObject.toString()

-			execution.setVariable("addOnVfModuleModelInfo", addOnVfModuleModelInfo)

-			String addOnVfModuleLabel = jsonUtil.getJsonValueForKey(addOnModule, "vfModuleLabel")

-			execution.setVariable("addOnVfModuleLabel", addOnVfModuleLabel)

-			String addOnPersonaModelId = jsonUtil.getJsonValueForKey(addOnVfModuleModelInfoObject, "modelInvariantId")

-			execution.setVariable("addOnPersonaModelId", addOnPersonaModelId)

-			String addOnInitialCount = jsonUtil.getJsonValueForKey(addOnModule, "initialCount")

-			execution.setVariable("initialCount", addOnInitialCount)

-					

-		

-		}catch(Exception e){

-			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

-		}

-		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

-	}

-	

-	/**

-	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VNF info.

-	 * A 200 response is expected with the VNF info in the response body. Will find out the base module info.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void queryAAIVfModule(Execution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def method = getClass().getSimpleName() + '.queryAAIVfModule(' +

-			'execution=' + execution.getId() +

-			')'

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('DvnfId')

-			

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

-

-			String endPoint = execution.getVariable("URN_aai_endpoint") + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"

-			utils.logAudit("AAI endPoint: " + endPoint)

-

-			try {

-				RESTConfig config = new RESTConfig(endPoint);

-				def responseData = ''

-				def aaiRequestId = UUID.randomUUID().toString()

-				RESTClient client = new RESTClient(config).

-					addHeader('X-TransactionId', aaiRequestId).

-					addHeader('X-FromAppId', 'MSO').

-					addHeader('Content-Type', 'application/xml').

-					addHeader('Accept','application/xml');

-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

-				APIResponse response = client.httpGet()

-				utils.logAudit("createVfModule - invoking httpGet() to AAI")

-

-				responseData = response.getResponseBodyAsString()

-				if (responseData != null) {

-					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)

-

-				}

-

-				utils.logAudit("createVfModule - queryAAIVfModule Response: " + responseData)

-				utils.logAudit("createVfModule - queryAAIVfModule ResponseCode: " + response.getStatusCode())

-

-				execution.setVariable('DCVFM_queryAAIVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('DCVFM_queryAAIVfModuleResponse', responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-				//Map<String, String>[] vfModules = new HashMap<String,String>[]

-				List<Map<String,String>> vfModulesList = new ArrayList<Map<String,String>>();

-				if (response.getStatusCode() == 200) {

-					// Parse the VNF record from A&AI to find base module info

-					logDebug('Parsing the VNF data to find base module info', isDebugLogEnabled)

-					if (responseData != null) {

-						def vfModulesText = utils.getNodeXml(responseData, "vf-modules")

-						def xmlVfModules= new XmlSlurper().parseText(vfModulesText)

-						def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}

-						execution.setVariable("DDVAM_moduleCount", vfModules.size())

-						int vfModulesSize = 0

-						for (i in 0..vfModules.size()-1) {

-							def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

-							

-							Map<String, String> vfModuleEntry = new HashMap<String, String>()

-							def vfModuleId = utils.getNodeText1(vfModuleXml, "vf-module-id")

-							vfModuleEntry.put("vfModuleId", vfModuleName)

-							def vfModuleName = utils.getNodeText1(vfModuleXml, "vf-module-name")

-							vfModuleEntry.put("vfModuleName", vfModuleName)		

-							vfModulesList.add(vfModuleEntry)					

-						}

-						

-					}					

-				}

-				execution.setVariable("DDVAM_vfModules", vfModules)

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())

-			}

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIVfModule(): ' + e.getMessage())

-		}

-	}

-	

-	public void prepareNextModuleToDelete(Execution execution){

-		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")

-		execution.setVariable("prefix", Prefix)

-		logDebug(" ======== STARTED prepareNextModuleToDelete ======== ", isDebugLogEnabled)

-		

-		try {

-			int i = execution.getVariable("DDVAM_nextModule")

-			def vfModules = execution.getVariable("DDVAM_vfModules")

-			def vfModule = vfModules[i]

-			

-			def vfModuleId = vfModule.get("vfModuleId")

-			execution.setVariable("DDVAM_vfModuleId", vfModuleId)

-			

-			def vfModuleName = vfModule.get("vfModuleName")

-			execution.setVariable("DDVAM_vfModuleName", vfModuleName)

-			

-			

-			// HARDCODED FOR NOW

-			def vfModuleModelInfo = ""

-			execution.setVariable("DDVAM_vfModuleModelInfo", vfModuleModelInfo)			

-			

-		}catch(Exception e){

-			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())

-		}

-		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)

-	}

-	

-	

-	

-	

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import java.util.UUID;
+
+import org.json.JSONObject;
+import org.json.JSONArray;
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution;
+
+import static org.apache.commons.lang3.StringUtils.*;
+
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.rest.APIResponse
+import org.openecomp.mso.rest.RESTClient
+import org.openecomp.mso.rest.RESTConfig
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.CatalogDbUtils
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+import org.openecomp.mso.bpmn.core.RollbackData
+import org.openecomp.mso.bpmn.core.WorkflowException
+
+/**
+ * This class supports the macro VID Flow
+ * with the deletion of a generic vnf and related VF modules.
+ */
+class DoDeleteVnfAndModules extends AbstractServiceTaskProcessor {
+
+	String Prefix="DDVAM_"
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+	JsonUtils jsonUtil = new JsonUtils()
+	VidUtils vidUtils = new VidUtils(this)
+	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+
+	/**
+	 * This method gets and validates the incoming
+	 * request.
+	 *
+	 * @param - execution
+	 *	
+	 */
+	public void preProcessRequest(Execution execution) {
+		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		utils.log("DEBUG", " *** STARTED DoDeleteVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)
+
+		try{
+			// Get Variables				
+			
+			String cloudConfiguration = execution.getVariable("cloudConfiguration")			
+			
+			String requestId = execution.getVariable("msoRequestId")
+			execution.setVariable("requestId", requestId)			
+			execution.setVariable("mso-request-id", requestId)
+			utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)
+
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")			
+			utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
+
+			String vnfId = execution.getVariable("vnfId")			
+			utils.log("DEBUG", "Incoming Vnf Id is: " + vnfId, isDebugEnabled)			
+			
+			String source = "VID"
+			execution.setVariable("DDVAM_source", source)
+			utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)
+			
+			String sdncVersion = execution.getVariable("sdncVersion")
+			if (sdncVersion == null) {
+				sdncVersion = "1702"
+			}
+			execution.setVariable("DDVAM_sdncVersion", sdncVersion)
+			utils.log("DEBUG", "Incoming Sdnc Version is: " + sdncVersion, isDebugEnabled)
+			
+			String sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {
+				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'
+				logError(msg)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
+			utils.logAudit("SDNC Callback URL: " + sdncCallbackUrl)
+			logDebug("SDNC Callback URL is: " + sdncCallbackUrl, isDebugEnabled)
+			
+			if (!sdncVersion.equals("1702")) {
+				//String vnfModelInfo = execution.getVariable("vnfModelInfo")
+				//String serviceModelInfo = execution.getVariable("serviceModelInfo")
+				
+				String serviceId = execution.getVariable("productFamilyId")
+				execution.setVariable("DDVAM_serviceId", serviceId)
+				utils.log("DEBUG", "Incoming Service Id is: " + serviceId, isDebugEnabled)
+				
+					
+				//String modelInvariantId = jsonUtil.getJsonValue(vnfModelInfo, "modelInvariantId")
+				//execution.setVariable("DDVAM_modelInvariantId", modelInvariantId)
+				//utils.log("DEBUG", "Incoming Invariant Id is: " + modelInvariantId, isDebugEnabled)
+				
+				//String modelVersionId = jsonUtil.getJsonValue(vnfModelInfo, "modelVersionId")
+				//if (modelVersionId == null) {
+				//	modelVersionId = ""
+				//}
+				//execution.setVariable("DDVAM_modelVersionId", modelVersionId)
+				//utils.log("DEBUG", "Incoming Version Id is: " + modelVersionId, isDebugEnabled)
+	
+				//String modelVersion = jsonUtil.getJsonValue(vnfModelInfo, "modelVersion")
+				//execution.setVariable("DDVAM_modelVersion", modelVersion)
+				//utils.log("DEBUG", "Incoming Model Version is: " + modelVersion, isDebugEnabled)
+				
+				//String modelName = jsonUtil.getJsonValue(vnfModelInfo, "modelName")
+				//execution.setVariable("DDVAM_modelName", modelName)
+				//utils.log("DEBUG", "Incoming Model Name is: " + modelName, isDebugEnabled)
+				
+				//String modelCustomizationId = jsonUtil.getJsonValue(vnfModelInfo, "modelCustomizationId")
+				//if (modelCustomizationId == null) {
+				//	modelCustomizationId = ""
+				//}
+				//execution.setVariable("DDVAM_modelCustomizationId", modelCustomizationId)
+				//utils.log("DEBUG", "Incoming Model Customization Id is: " + modelCustomizationId, isDebugEnabled)
+					
+				String cloudSiteId = execution.getVariable("lcpCloudRegionId")
+				execution.setVariable("DDVAM_cloudSiteId", cloudSiteId)
+				utils.log("DEBUG", "Incoming Cloud Site Id is: " + cloudSiteId, isDebugEnabled)
+					
+				String tenantId = execution.getVariable("tenantId")
+				execution.setVariable("DDVAM_tenantId", tenantId)
+				utils.log("DEBUG", "Incoming Tenant Id is: " + tenantId, isDebugEnabled)
+				
+				String globalSubscriberId = execution.getVariable("globalSubscriberId")
+				if (globalSubscriberId == null) {
+					globalSubscriberId = ""
+				}
+				execution.setVariable("DDVAM_globalSubscriberId", globalSubscriberId)
+				utils.log("DEBUG", "Incoming Global Subscriber Id is: " + globalSubscriberId, isDebugEnabled)
+			}
+			execution.setVariable("DDVAM_moduleCount", 0)
+			execution.setVariable("DDVAM_nextModule", 0)
+			
+			
+		}catch(BpmnError b){
+			utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+			throw b
+		}catch(Exception e){
+			utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")
+
+		}
+		utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)
+	}	
+
+	
+	
+	public void preProcessAddOnModule(Execution execution){
+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+		logDebug(" ======== STARTED preProcessAddOnModule ======== ", isDebugLogEnabled)
+		
+		try {			
+			JSONArray addOnModules = (JSONArray) execution.getVariable("addOnModules")
+			int addOnIndex = (int) execution.getVariable("addOnModulesDeployed")
+			
+			JSONObject addOnModule = addOnModules[addOnIndex]
+			
+			def newVfModuleId = UUID.randomUUID().toString()
+			execution.setVariable("addOnVfModuleId", newVfModuleId)
+			
+			execution.setVariable("instancesOfThisModelDeployed", 0)
+			
+			JSONObject addOnVfModuleModelInfoObject = jsonUtil.getJsonValueForKey(addOnModule, "modelInfo")
+			String addOnVfModuleModelInfo = addOnVfModuleModelInfoObject.toString()
+			execution.setVariable("addOnVfModuleModelInfo", addOnVfModuleModelInfo)
+			String addOnVfModuleLabel = jsonUtil.getJsonValueForKey(addOnModule, "vfModuleLabel")
+			execution.setVariable("addOnVfModuleLabel", addOnVfModuleLabel)
+			String addOnPersonaModelId = jsonUtil.getJsonValueForKey(addOnVfModuleModelInfoObject, "modelInvariantId")
+			execution.setVariable("addOnPersonaModelId", addOnPersonaModelId)
+			String addOnInitialCount = jsonUtil.getJsonValueForKey(addOnModule, "initialCount")
+			execution.setVariable("initialCount", addOnInitialCount)
+					
+		
+		}catch(Exception e){
+			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessAddOnModule Method:\n" + e.getMessage())
+		}
+		logDebug("======== COMPLETED preProcessSDNCAssignRequest ======== ", isDebugLogEnabled)
+	}
+	
+	/**
+	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VNF info.
+	 * A 200 response is expected with the VNF info in the response body. Will find out the base module info.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void queryAAIVfModule(Execution execution) {
+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
+		def method = getClass().getSimpleName() + '.queryAAIVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def vnfId = execution.getVariable('vnfId')
+			
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)
+
+			String endPoint = execution.getVariable("URN_aai_endpoint") + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"
+			utils.logAudit("AAI endPoint: " + endPoint)
+
+			try {
+				RESTConfig config = new RESTConfig(endPoint);
+				def responseData = ''
+				def aaiRequestId = UUID.randomUUID().toString()
+				RESTClient client = new RESTClient(config).
+					addHeader('X-TransactionId', aaiRequestId).
+					addHeader('X-FromAppId', 'MSO').
+					addHeader('Content-Type', 'application/xml').
+					addHeader('Accept','application/xml');
+				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)
+				APIResponse response = client.httpGet()
+				utils.logAudit("createVfModule - invoking httpGet() to AAI")
+
+				responseData = response.getResponseBodyAsString()
+				if (responseData != null) {
+					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)
+
+				}
+
+				utils.logAudit("createVfModule - queryAAIVfModule Response: " + responseData)
+				utils.logAudit("createVfModule - queryAAIVfModule ResponseCode: " + response.getStatusCode())
+
+				execution.setVariable('DCVFM_queryAAIVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('DCVFM_queryAAIVfModuleResponse', responseData)
+				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)
+				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)
+				//Map<String, String>[] vfModules = new HashMap<String,String>[]
+				def vfModulesList = new ArrayList<Map<String,String>>()
+				def vfModules = null
+				def vfModuleBaseEntry = null
+				if (response.getStatusCode() == 200) {
+					// Parse the VNF record from A&AI to find base module info
+					logDebug('Parsing the VNF data to find base module info', isDebugLogEnabled)
+					if (responseData != null) {
+						def vfModulesText = utils.getNodeXml(responseData, "vf-modules")
+						logDebug("vModulesText: " + vfModulesText, isDebugLogEnabled)
+						if (vfModulesText != null && !vfModulesText.trim().isEmpty()) {
+							def xmlVfModules= new XmlSlurper().parseText(vfModulesText)
+							vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}
+							execution.setVariable("DDVAM_moduleCount", vfModules.size())
+							int vfModulesSize = 0
+							for (i in 0..vfModules.size()-1) {
+								def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])
+							
+								Map<String, String> vfModuleEntry = new HashMap<String, String>()
+								def vfModuleId = utils.getNodeText1(vfModuleXml, "vf-module-id")
+								vfModuleEntry.put("vfModuleId", vfModuleId)
+								def vfModuleName = utils.getNodeText1(vfModuleXml, "vf-module-name")
+								vfModuleEntry.put("vfModuleName", vfModuleName)
+								
+								def isBaseVfModule = utils.getNodeText(vfModuleXml, "is-base-vf-module")
+								// Save base vf module for last
+								if (isBaseVfModule == "true") {
+									vfModuleBaseEntry = vfModuleEntry
+								}
+								else {						
+									vfModulesList.add(vfModuleEntry)
+								}
+							}
+							if (vfModuleBaseEntry != null) {
+								vfModulesList.add(vfModuleBaseEntry)
+							}					
+						}
+						
+					}					
+				}
+				execution.setVariable("DDVAM_vfModules", vfModulesList)
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())
+			}
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIVfModule(): ' + e.getMessage())
+		}
+	}
+	
+	public void prepareNextModuleToDelete(Execution execution){
+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+		logDebug(" ======== STARTED prepareNextModuleToDelete ======== ", isDebugLogEnabled)
+		
+		try {
+			int i = execution.getVariable("DDVAM_nextModule")
+			def vfModules = execution.getVariable("DDVAM_vfModules")
+			def vfModule = vfModules[i]
+			
+			def vfModuleId = vfModule.get("vfModuleId")
+			execution.setVariable("DDVAM_vfModuleId", vfModuleId)
+			
+			def vfModuleName = vfModule.get("vfModuleName")
+			execution.setVariable("DDVAM_vfModuleName", vfModuleName)
+			
+			
+			// HARDCODED FOR NOW
+			def vfModuleModelInfo = ""
+			execution.setVariable("DDVAM_vfModuleModelInfo", vfModuleModelInfo)			
+			
+		}catch(Exception e){
+			utils.log("ERROR", "Exception Occured Processing preProcessAddOnModule. Exception is:\n" + e, isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during prepareNextModuleToDelete Method:\n" + e.getMessage())
+		}
+		logDebug("======== COMPLETED prepareNextModuleToDelete ======== ", isDebugLogEnabled)
+	}
+	
+	public void preProcessSDNCDeactivateRequest(Execution execution){
+		def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix", Prefix)
+		logDebug(" ======== STARTED preProcessSDNCDeactivateRequest ======== ", isDebugLogEnabled)
+		def vnfId = execution.getVariable("vnfId")
+		def serviceInstanceId = execution.getVariable("serviceInstanceId")		
+
+		try{
+			//Build SDNC Request
+			
+			String deactivateSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "deactivate")
+
+			deactivateSDNCRequest = utils.formatXml(deactivateSDNCRequest)
+			execution.setVariable("DDVAM_deactivateSDNCRequest", deactivateSDNCRequest)
+			logDebug("Outgoing DeactivateSDNCRequest is: \n" + deactivateSDNCRequest, isDebugLogEnabled)
+			utils.logAudit("Outgoing DeactivateSDNCRequest is: \n" + deactivateSDNCRequest)
+
+		}catch(Exception e){
+			utils.log("ERROR", "Exception Occured Processing preProcessSDNCDeactivateRequest. Exception is:\n" + e, isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occurred during preProcessSDNCDeactivateRequest Method:\n" + e.getMessage())
+		}
+		logDebug("======== COMPLETED preProcessSDNCDeactivateRequest ======== ", isDebugLogEnabled)
+	}
+	
+	public void preProcessSDNCUnassignRequest(Execution execution) {
+		def method = getClass().getSimpleName() + '.preProcessSDNCUnassignRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+		execution.setVariable("prefix", Prefix)
+		logDebug(" ======== STARTED preProcessSDNCUnassignRequest Process ======== ", isDebugLogEnabled)
+		try{
+			String vnfId = execution.getVariable("vnfId")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+			String unassignSDNCRequest = buildSDNCRequest(execution, serviceInstanceId, "unassign")
+
+			execution.setVariable("DDVAM_unassignSDNCRequest", unassignSDNCRequest)
+			logDebug("Outgoing UnassignSDNCRequest is: \n" + unassignSDNCRequest, isDebugLogEnabled)
+			utils.logAudit("Outgoing UnassignSDNCRequest is: \n"  + unassignSDNCRequest)
+
+		}catch(Exception e){
+			log.debug("Exception Occured Processing preProcessSDNCUnassignRequest. Exception is:\n" + e, isDebugLogEnabled)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, "Error Occured during  preProcessSDNCUnassignRequest Method:\n" + e.getMessage())
+		}
+		logDebug("======== COMPLETED  preProcessSDNCUnassignRequest Process ======== ", isDebugLogEnabled)
+	}
+	
+	public String buildSDNCRequest(Execution execution, String svcInstId, String action){
+		
+				String uuid = execution.getVariable('testReqId') // for junits
+				if(uuid==null){
+					uuid = execution.getVariable("mso-request-id") + "-" +  	System.currentTimeMillis()
+				}
+				def callbackURL = execution.getVariable("sdncCallbackUrl")
+				def requestId = execution.getVariable("msoRequestId")
+				def serviceId = execution.getVariable("DDVAM_serviceId")				
+				def tenantId = execution.getVariable("DDVAM_tenantId")
+				def source = execution.getVariable("DDVAM_source")
+				def vnfId = execution.getVariable("vnfId")
+				def serviceInstanceId = execution.getVariable("serviceInstanceId")
+				def cloudSiteId = execution.getVariable("DDVAM_cloudSiteId")				
+				def modelCustomizationId = execution.getVariable("DDVAM_modelCustomizationId")
+				//def serviceModelInfo = execution.getVariable("serviceModelInfo")
+				//def vnfModelInfo = execution.getVariable("vnfModelInfo")
+				//String serviceEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(serviceModelInfo)
+				//String vnfEcompModelInformation = sdncAdapterUtils.modelInfoToEcompModelInformation(vnfModelInfo)				
+				def globalSubscriberId = execution.getVariable("DDVAM_globalSubscriberId")
+				def sdncVersion = execution.getVariable("DDVAM_sdncVersion")						
+				
+				String sdncRequest =
+				"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
+													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+	   <sdncadapter:RequestHeader>
+				<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+				<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
+				<sdncadapter:SvcAction>${action}</sdncadapter:SvcAction>
+				<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+				<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
+				<sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>
+		</sdncadapter:RequestHeader>
+	<sdncadapterworkflow:SDNCRequestData>
+		<request-information>
+			<request-id>${requestId}</request-id>
+			<request-action>DeleteVnfInstance</request-action>
+			<source>${source}</source>
+			<notification-url/>
+			<order-number/>
+			<order-version/>
+		</request-information>
+		<service-information>
+			<service-id/>
+			<subscription-service-type/>			
+			<service-instance-id>${serviceInstanceId}</service-instance-id>
+			<global-customer-id/>
+		</service-information>
+		<vnf-information>
+			<vnf-id>${vnfId}</vnf-id>
+			<vnf-type/>			
+		</vnf-information>
+		<vnf-request-input>			
+			<vnf-name/>
+			<tenant>${tenantId}</tenant>
+			<aic-cloud-region>${cloudSiteId}</aic-cloud-region>			
+		</vnf-request-input>
+	</sdncadapterworkflow:SDNCRequestData>
+	</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
+		
+			utils.logAudit("sdncRequest:  " + sdncRequest)
+			return sdncRequest
+	}
+		
+	public void validateSDNCResponse(Execution execution, String response, String method){
+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
+		execution.setVariable("prefix",Prefix)
+		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
+
+		WorkflowException workflowException = execution.getVariable("WorkflowException")
+		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+
+		utils.logAudit("workflowException: " + workflowException)
+
+		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+
+		utils.logAudit("SDNCResponse: " + response)
+
+		String sdncResponse = response
+		if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
+			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)			
+		}else{
+			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)
+			throw new BpmnError("MSOWorkflowException")
+		}
+		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
+	}
+	
+	
+	
+	
+	
+	
+	
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
index dd35334..5bd9f96 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
@@ -365,7 +365,6 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 			String networkId   = utils.getNodeText1(networkRequest, "network-id")
 			networkId = UriUtils.encode(networkId,"UTF-8")
 			execution.setVariable(Prefix + "networkId", networkId)
-			String messageId = execution.getVariable(Prefix + "messageId")
 
 			// Prepare AA&I url
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -433,7 +432,6 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 			String networkRequest = execution.getVariable(Prefix + "networkRequest")
 			String networkId   = utils.getNodeText1(networkRequest, "network-id")
 			networkId = UriUtils.encode(networkId,"UTF-8")
-			String messageId = execution.getVariable(Prefix + "messageId")
 
 			// Prepare AA&I url
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -509,7 +507,6 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 		try {
 
 			// get variables
-			String messageId = execution.getVariable(Prefix + "messageId")
 			String queryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
 			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
 			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
@@ -609,7 +606,7 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 				// reset return code to success
 				execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")
 				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 			    String aaiStubResponse =
 					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
 							<vpn-binding xmlns="${schemaVersion}">
@@ -643,7 +640,6 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 
 		try {
 			// get variables
-			String messageId = execution.getVariable(Prefix + "messageId")
 			String queryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
 			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
 			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
@@ -746,7 +742,7 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 				// reset return code to success
 				execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
 				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 				String aaiStubResponse =
 					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
 							<network-policy xmlns="${schemaVersion}">
@@ -780,7 +776,6 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 
 		try {
 			// get variables
-			String messageId = execution.getVariable(Prefix + "messageId")
 			String queryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
 			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
 			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
@@ -883,7 +878,7 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 				// reset return code to success
 				execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
 				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+				String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 				String aaiStubResponse =
 					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
 							<route-table-references xmlns="${schemaVersion}">
@@ -922,7 +917,6 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 			networkId = UriUtils.encode(networkId,"UTF-8")
 			String requeryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse")
 			String updateNetworkResponse   = execution.getVariable(Prefix + "updateNetworkResponse")
-			String messageId = execution.getVariable(Prefix + "messageId")
 
 			// Prepare url
 			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
@@ -935,7 +929,7 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 			utils.log("DEBUG", " UPDNETI_updateContrailAAIUrlRequest - " + "\n" + updateContrailAAIUrlRequest, isDebugEnabled)
 
 			//Prepare payload (PUT)
-			String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
+			String schemaVersion = aaiUriUtil.getNamespaceFromUri(execution, aai_uri)
 			String payload = networkUtils.ContrailNetworkCreatedUpdate(requeryIdAAIResponse, updateNetworkResponse, schemaVersion)
 			String payloadXml = utils.formatXml(payload)
 			utils.logAudit(payloadXml)
@@ -973,7 +967,7 @@ public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
 							// aai all errors
 							String errorMessage = "Unexpected Response from UpdateContrailAAINetwork - " + returnCode
 							utils.log("DEBUG", errorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, "2500", errorMessage)
+							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
 					  }
 				}
 			}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy
index 5999857..f07bb0d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateVfModule.groovy
@@ -1,919 +1,921 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts

-

-import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.runtime.Execution

-import org.openecomp.mso.bpmn.common.scripts.AaiUtil

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils

-import org.openecomp.mso.bpmn.common.scripts.VfModule

-import org.openecomp.mso.bpmn.common.scripts.VfModuleBase

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.bpmn.core.json.JsonUtils;

-import org.openecomp.mso.rest.APIResponse

-import org.springframework.web.util.UriUtils

-

-public class DoUpdateVfModule extends VfModuleBase {

-

-	ExceptionUtil exceptionUtil = new ExceptionUtil()

-	JsonUtils jsonUtil = new JsonUtils()

-

-	/**

-	 * Initialize the flow's variables.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void initProcessVariables(Execution execution) {

-		execution.setVariable('prefix', 'DOUPVfMod_')

-		execution.setVariable('DOUPVfMod_requestInfo', null)

-		execution.setVariable('DOUPVfMod_serviceInstanceId', null)

-		execution.setVariable('DOUPVfMod_requestId', null)

-		execution.setVariable('DOUPVfMod_vnfInputs', null)

-		execution.setVariable('DOUPVfMod_vnfId', null)

-		execution.setVariable('DOUPVfMod_vnfName', null)

-		execution.setVariable('DOUPVfMod_vnfNameFromAAI', null)

-		execution.setVariable('DOUPVfMod_vfModuleName', null)

-		execution.setVariable('DOUPVfMod_vfModuleId', null)

-		execution.setVariable('DOUPVfMod_vnfType', null)

-		execution.setVariable('DOUPVfMod_asdcServiceModelVersion', null)

-		execution.setVariable('DOUPVfMod_vfModuleModelName', null)

-		execution.setVariable('DOUPVfMod_modelCustomizationUuid', null)

-		execution.setVariable("DOUPVfMod_isBaseVfModule", "false")

-		execution.setVariable('DOUPVfMod_serviceId', null)

-		execution.setVariable('DOUPVfMod_aicCloudRegion', null)

-		execution.setVariable('DOUPVfMod_tenantId', null)

-		execution.setVariable('DOUPVfMod_volumeGroupId', null)

-		execution.setVariable('DOUPVfMod_vfModule', null)

-		execution.setVariable('DOUPVfMod_vnfParams', null)

-		execution.setVariable("DOUPVfMod_baseVfModuleId", "")

-		execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", "")

-		execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', null)

-		execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', null)

-		execution.setVariable('DOUPVfMod_sdncChangeAssignResponse', null)

-		execution.setVariable('DOUPVfMod_sdncActivateRequest', null)

-		execution.setVariable('DOUPVfMod_sdncActivateResponse', null)

-		execution.setVariable('DOUPVfMod_sdncTopologyRequest', null)

-		execution.setVariable('DOUPVfMod_sdncTopologyResponse', null)

-		execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', null)

-		execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', null)

-		execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', null)

-		execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', false)

-		execution.setVariable('DoUpdateVfModuleSuccessIndicator', false)

-	}

-

-	/**

-	 * Check for missing elements in the received request.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void preProcessRequest(Execution execution) {

-		def method = getClass().getSimpleName() + '.preProcessRequest(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			initProcessVariables(execution)

-			def xml = getVariable(execution, 'DoUpdateVfModuleRequest')

-			utils.logAudit("DoUpdateVfModule request: " + xml)

-			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)

-			

-			if (xml == null || xml.isEmpty()) {

-				// Building Block-type request

-

-				String cloudConfiguration = execution.getVariable("cloudConfiguration")

-				String vfModuleModelInfo = execution.getVariable("vfModuleModelInfo")

-				

-				def serviceModelInfo = execution.getVariable("serviceModelInfo")

-				logDebug("serviceModelInfo: " + serviceModelInfo, isDebugLogEnabled)

-				def vnfModelInfo = execution.getVariable("vnfModelInfo")

-				

-

-				//tenantId

-				def tenantId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.tenantId")

-				execution.setVariable("DOUPVfMod_tenantId", tenantId)

-				

-				//volumeGroupId

-				def volumeGroupId = execution.getVariable("volumeGroupId")

-				execution.setVariable("DOUPVfMod_volumeGroupId", volumeGroupId)

-				//volumeGroupName

-				def volumeGroupName = execution.getVariable("volumeGroupName")

-				execution.setVariable("DOUPVfMod_volumeGroupName", volumeGroupName)

-				//cloudSiteId

-				def cloudSiteId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.lcpCloudRegionId")

-				execution.setVariable("DOUPVfMod_cloudSiteId", cloudSiteId)

-				

-				logDebug("cloudSiteId: " + cloudSiteId, isDebugLogEnabled)

-				//vnfType

-				def vnfType = execution.getVariable("vnfType")

-				execution.setVariable("DOUPVfMod_vnfType", vnfType)

-				

-				logDebug("vnfType: " + vnfType, isDebugLogEnabled)

-				//vnfName

-				def vnfName = execution.getVariable("vnfName")

-				execution.setVariable("DOUPVfMod_vnfName", vnfName)

-				

-				logDebug("vnfName: " + vnfName, isDebugLogEnabled)

-				//vnfId

-				def vnfId = execution.getVariable("vnfId")

-				execution.setVariable("DOUPVfMod_vnfId", vnfId)

-				

-				logDebug("vnfId: " + vnfId, isDebugLogEnabled)

-				//vfModuleName

-				def vfModuleName = execution.getVariable("vfModuleName")

-				execution.setVariable("DOUPVfMod_vfModuleName", vfModuleName)

-				

-				logDebug("vfModuleName: " + vfModuleName, isDebugLogEnabled)

-				//vfModuleModelName

-				def vfModuleModelName = jsonUtil.getJsonValue(vfModuleModelInfo, "modelName")

-				execution.setVariable("DOUPVfMod_vfModuleModelName", vfModuleModelName)

-				

-				logDebug("vfModuleModelName: " + vfModuleModelName, isDebugLogEnabled)

-				//modelCustomizationUuid

-				def modelCustomizationUuid = jsonUtil.getJsonValue(vfModuleModelInfo, "modelCustomizationId")

-				execution.setVariable("DOUPVfMod_modelCustomizationUuid", modelCustomizationUuid)

-				

-				logDebug("modelCustomizationUuid: " + modelCustomizationUuid, isDebugLogEnabled)

-				//vfModuleId

-				def vfModuleId = execution.getVariable("vfModuleId")

-				execution.setVariable("DOUPVfMod_vfModuleId", vfModuleId)

-				logDebug("vfModuleId: " + vfModuleId, isDebugLogEnabled)

-				def requestId = execution.getVariable("requestId")

-				execution.setVariable("DOUPVfMod_requestId", requestId)

-				logDebug("requestId: " + requestId, isDebugLogEnabled)

-				// Set mso-request-id to request-id for VNF Adapter interface

-				execution.setVariable("mso-request-id", requestId)

-				//serviceId

-				def serviceId = execution.getVariable("serviceId")

-				execution.setVariable("DOUPVfMod_serviceId", serviceId)

-				logDebug("serviceId: " + serviceId, isDebugLogEnabled)

-				//serviceInstanceId

-				def serviceInstanceId = execution.getVariable("serviceInstanceId")

-				execution.setVariable("DOUPVfMod_serviceInstanceId", serviceInstanceId)

-				

-				logDebug("serviceInstanceId: " + serviceInstanceId, isDebugLogEnabled)

-				//source - HARDCODED

-				def source = "VID"

-				execution.setVariable("DOUPVfMod_source", source)

-				

-				logDebug("source: " + source, isDebugLogEnabled)

-				//backoutOnFailure

-				def disableRollback = execution.getVariable("disableRollback")

-				def backoutOnFailure = true

-				if (disableRollback != null && disableRollback.equals("true")) {

-					backoutOnFailure = false

-				}

-				execution.setVariable("DOUPVfMod_backoutOnFailure", backoutOnFailure)

-				logDebug("backoutOnFailure: " + backoutOnFailure, isDebugLogEnabled)

-				//isBaseVfModule

-				def isBaseVfModule = execution.getVariable("isBaseVfModule")

-				execution.setVariable("DOUPVfMod_isBaseVfModule", isBaseVfModule)

-				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)

-				//asdcServiceModelVersion

-				def asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")

-				execution.setVariable("DOUPVfMod_asdcServiceModelVersion", asdcServiceModelVersion)

-				logDebug("asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)

-				//personaModelId

-				execution.setVariable("DOUPVfMod_personaModelId", jsonUtil.getJsonValue(vfModuleModelInfo, "modelInvariantId"))

-				//personaModelVersion

-				execution.setVariable("DOUPVfMod_personaModelVersion", jsonUtil.getJsonValue(vfModuleModelInfo, "modelVersion"))

-				//Get or Generate UUID

-				String uuid = execution.getVariable("DOUPVfMod_uuid")

-				if(uuid == null){

-					uuid = UUID.randomUUID()

-					logDebug("Generated messageId (UUID) is: " + uuid, isDebugLogEnabled)

-				}else{

-					logDebug("Found messageId (UUID) is: " + uuid, isDebugLogEnabled)

-				}

-				//isVidRequest

-				String isVidRequest = execution.getVariable("isVidRequest")

-				// default to true

-				if (isVidRequest == null || isVidRequest.isEmpty()) {

-					execution.setVariable("isVidRequest", "true")

-				}

-				//globalSubscriberId

-				String globalSubscriberId = execution.getVariable("globalSubscriberId")

-				execution.setVariable("DOUPVfMod_globalSubscriberId", globalSubscriberId)

-				logDebug("globalSubsrciberId: " + globalSubscriberId, isDebugLogEnabled)

-				//vnfQueryPath

-				String vnfQueryPath = execution.getVariable("vnfQueryPath")

-				execution.setVariable("DOUPVfMod_vnfQueryPath", vnfQueryPath)

-				logDebug("vnfQueryPath: " + vnfQueryPath, isDebugLogEnabled)

-

-				String vnfParamsChildNodes = execution.getVariable("vfModuleInputParams")

-				execution.setVariable('DOUPVfMod_vnfParams', vnfParamsChildNodes)

-			}

-			else {

-

-				def requestInfo = getRequiredNodeXml(execution, xml, 'request-info')

-				execution.setVariable('DOUPVfMod_requestInfo', requestInfo)

-				execution.setVariable('DOUPVfMod_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))

-			def serviceInstanceId = execution.getVariable('mso-service-instance-id')

-				if (serviceInstanceId == null) {

-					serviceInstanceId = ''

-				}

-				execution.setVariable('DOUPVfMod_serviceInstanceId', serviceInstanceId)

-	

-				def vnfInputs = getRequiredNodeXml(execution, xml, 'vnf-inputs')

-				execution.setVariable('DOUPVfMod_vnfInputs', vnfInputs)

-				execution.setVariable('DOUPVfMod_vnfId', getRequiredNodeText(execution, vnfInputs, 'vnf-id'))

-				execution.setVariable('DOUPVfMod_vfModuleId', getRequiredNodeText(execution, vnfInputs, 'vf-module-id'))

-				execution.setVariable('DOUPVfMod_vfModuleName', getNodeTextForce(vnfInputs, 'vf-module-name'))

-				execution.setVariable('DOUPVfMod_vnfType', getNodeTextForce(vnfInputs, 'vnf-type'))

-				execution.setVariable('DOUPVfMod_vnfName', getNodeTextForce(vnfInputs, 'vnf-name'))

-				execution.setVariable('DOUPVfMod_asdcServiceModelVersion', getNodeTextForce(vnfInputs, 'asdc-service-model-version'))

-				execution.setVariable('DOUPVfMod_vfModuleModelName', getRequiredNodeText(execution, vnfInputs, 'vf-module-model-name'))

-				execution.setVariable('DOUPVfMod_modelCustomizationUuid', getNodeTextForce(vnfInputs, 'model-customization-id'))

-				execution.setVariable('DOUPVfMod_serviceId', getRequiredNodeText(execution, vnfInputs, 'service-id'))

-				execution.setVariable('DOUPVfMod_aicCloudRegion', getRequiredNodeText(execution, vnfInputs, 'aic-cloud-region'))

-				execution.setVariable('DOUPVfMod_tenantId', getRequiredNodeText(execution, vnfInputs, 'tenant-id'))

-				//isBaseVfModule

-				def isBaseVfModule = "false"

-				if (utils.nodeExists(xml, "is-base-vf-module")) {

-					isBaseVfModule = utils.getNodeText(xml, "is-base-vf-module")

-					execution.setVariable("DOUPVfMod_isBaseVfModule", isBaseVfModule)

-				}

-				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)

-	

-				NetworkUtils networkUtils = new NetworkUtils()

-				def backoutOnFailure = networkUtils.isRollbackEnabled(execution, xml)

-				execution.setVariable("DOUPVfMod_backoutOnFailure", backoutOnFailure)

-	

-				def String vgi = getNodeTextForce(vnfInputs, 'volume-group-id')

-				execution.setVariable('DOUPVfMod_volumeGroupId', vgi)

-	

-				execution.setVariable('DOUPVfMod_vnfParams', utils.getNodeXml(xml, 'vnf-params', false))

-			}

-

-			def sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {

-				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'

-				logError(msg)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)

-			}

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the PrepareUpdateAAIVfModule subflow.  This will

-	 * set the orchestration-status to 'pending-update'.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepPrepareUpdateAAIVfModule(Execution execution) {

-		def method = getClass().getSimpleName() + '.preparePrepareUpdateAAIVfModule(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

-			def orchestrationStatus = 'pending-update'

-

-			String prepareUpdateAAIVfModuleRequest = """

-				<PrepareUpdateAAIVfModuleRequest>

-					<vnf-id>${vnfId}</vnf-id>

-					<vf-module-id>${vfModuleId}</vf-module-id>

-					<orchestration-status>${orchestrationStatus}</orchestration-status>

-				</PrepareUpdateAAIVfModuleRequest>

-			"""

-			prepareUpdateAAIVfModuleRequest = utils.formatXml(prepareUpdateAAIVfModuleRequest)

-			execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', prepareUpdateAAIVfModuleRequest)

-			utils.logAudit("DoUpdateAAIVfModule request: " + prepareUpdateAAIVfModuleRequest)

-			logDebug('Request for PrepareUpdateAAIVfModule:\n' + prepareUpdateAAIVfModuleRequest, isDebugLogEnabled)

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preparePrepareUpdateAAIVfModule(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the ConfirmVolumeGroupTenant subflow.  Currently,

-	 * there is really nothing to do, so we just log that we're passing through.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepConfirmVolumeGroupTenant(Execution execution) {

-		def method = getClass().getSimpleName() + '.prepConfirmVolumeGroupTenant(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			// Nothing to do - just log that we're passing through here

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepConfirmVolumeGroupTenant(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the SDNC Adapter subflow to perform

-	 * a VNF topology 'changeassign' operation.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepSDNCTopologyChg(Execution execution) {

-		def method = getClass().getSimpleName() + '.prepSDNCTopologyChg(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def requestId = execution.getVariable('DOUPVfMod_requestId')

-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			def serviceId = execution.getVariable('DOUPVfMod_serviceId')

-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

-			def vnfType = execution.getVariable('DOUPVfMod_vnfType')

-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

-			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')

-			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')

-			def vfModuleName = vfModule.getElementText('vf-module-name')

-			def tenantId = execution.getVariable('DOUPVfMod_tenantId')

-			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')

-

-			// Retrieve vnf name from AAI response

-			def vnfName = execution.getVariable('DOUPVfMod_vnfNameFromAAI')

-			execution.setVariable('DOUPVfMod_vnfName', vnfName)

-

-			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')

-			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)

-

-			String sdncTopologyRequest = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest

-						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>changeassign</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

-					</sdncadapter:RequestHeader>

-					<sdncadapterworkflow:SDNCRequestData>

-					      <request-information>

-					         <request-id>${requestId}</request-id>

-					         <request-action>ChangeVNFActivateRequest</request-action>

-					         <source>PORTAL</source>

-					         <notification-url/>

-					         <order-number/>

-					         <order-version/>

-					      </request-information>

-					      <service-information>

-					         <service-type>${serviceId}</service-type>

-					         <service-instance-id>${vnfId}</service-instance-id>

-					         <subscriber-name>dontcare</subscriber-name>

-					      </service-information>

-					      <vnf-request-information>

-					         <vnf-id>${vfModuleId}</vnf-id>

-					         <vnf-type>${vfModuleModelName}</vnf-type>

-					         <vnf-name>${vfModuleName}</vnf-name>

-					         <generic-vnf-id>${vnfId}</generic-vnf-id>

-					         <generic-vnf-name>${vnfName}</generic-vnf-name>

-							 <generic-vnf-type>${vnfType}</generic-vnf-type>

-					         <tenant>${tenantId}</tenant>

-					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>

-					         ${vnfNetworks}

-					      </vnf-request-information>

- 					</sdncadapterworkflow:SDNCRequestData>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)

-			execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', sdncTopologyRequest)

-			utils.logAudit("sdncChangeAssignRequest : " + sdncTopologyRequest)

-			logDebug('Request for SDNCAdapter topology/changeassign:\n' + sdncTopologyRequest, isDebugLogEnabled)

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyChg(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the SDNC Adapter subflow to perform

-	 * a VNF topology 'query' operation.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepSDNCTopologyQuery(Execution execution) {

-		def method = getClass().getSimpleName() + '.prepSDNCTopologyQuery(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def requestId = execution.getVariable('DOUPVfMod_requestId')

-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

-

-			def svcInstId = ""

-			if (serviceInstanceId == null || serviceInstanceId.isEmpty()) {

-				svcInstId = vfModuleId

-			}

-			else {

-				svcInstId = serviceInstanceId

-			}

-

-			//!!!! TEMPORARY WORKAROUND FOR SDNC REPLICATION ISSUE

-			sleep(5000)

-

-			String sdncTopologyRequest = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest

-						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>query</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>/VNF-API:vnfs/vnf-list/${vfModuleId}</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

-						<sdncadapter:MsoAction>mobility</sdncadapter:MsoAction>

-					</sdncadapter:RequestHeader>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)

-			execution.setVariable('DOUPVfMod_sdncTopologyRequest', sdncTopologyRequest)

-			utils.logAudit("sdncTopologyRequest : " + sdncTopologyRequest)

-			logDebug('Request for SDNCAdapter query:\n' + sdncTopologyRequest, isDebugLogEnabled)

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyQuery(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the VnfAdapterRest subflow.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepVnfAdapterRest(Execution execution) {

-		def method = getClass().getSimpleName() + '.prepVnfAdapterRest(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def requestId = execution.getVariable('DOUPVfMod_requestId')

-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

-			def vfModuleName = execution.getVariable('DOUPVfMod_vfModuleName')

-			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')

-			def tenantId = execution.getVariable('DOUPVfMod_tenantId')

-			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')

-			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')

-			def heatStackId = vfModule.getElementText('heat-stack-id')

-			def cloudId = execution.getVariable('DOUPVfMod_aicCloudRegion')

-			def vnfType = execution.getVariable('DOUPVfMod_vnfType')

-			def vnfName = execution.getVariable('DOUPVfMod_vnfName')

-			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')

-			def baseVfModuleId = execution.getVariable("DOUPVfMod_baseVfModuleId")

-			def baseVfModuleStackId = execution.getVariable("DOUPVfMod_baseVfModuleHeatStackId")

-			def asdcServiceModelVersion = execution.getVariable('DOUPVfMod_asdcServiceModelVersion')

-			def modelCustomizationUuid = execution.getVariable('DOUPVfMod_modelCustomizationUuid')

-			def backoutOnFailure = execution.getVariable("DOUPVfMod_backoutOnFailure")

-

-			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')

-			def vfModuleParamsEntries = transformParamsToEntries(vnfParamsXml)

-

-			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()

-			def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)

-			def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")

-			if ('true'.equals(useQualifiedHostName)) {

-					notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)

-			}

-

-			String sdncGetResponse = execution.getVariable('DOUPVfMod_sdncTopologyResponse')

-

-			String vfModuleParams = buildVfModuleParams(vfModuleParamsEntries, sdncGetResponse, vnfId, vnfName,

-					vfModuleId, vfModuleName, null)

-

-

-			String vnfAdapterRestRequest = """

-				<updateVfModuleRequest>

-					<cloudSiteId>${cloudId}</cloudSiteId>

-					<tenantId>${tenantId}</tenantId>

-					<vnfId>${vnfId}</vnfId>

-					<vfModuleId>${vfModuleId}</vfModuleId>

-					<vfModuleStackId>${heatStackId}</vfModuleStackId>

-					<vnfType>${vnfType}</vnfType>

-					<vnfVersion>${asdcServiceModelVersion}</vnfVersion>

-					<modelCustomizationUuid>${modelCustomizationUuid}</modelCustomizationUuid>

-					<vfModuleType>${vfModuleModelName}</vfModuleType>

-					<volumeGroupId>${volumeGroupId}</volumeGroupId>

-					<baseVfModuleId>${baseVfModuleId}</baseVfModuleId>

-    				<baseVfModuleStackId>${baseVfModuleStackId}</baseVfModuleStackId>

-					<skipAAI>true</skipAAI>

-					<backout>${backoutOnFailure}</backout>

-				    <failIfExists>false</failIfExists>

-					<vfModuleParams>

-						${vfModuleParams}

-				    </vfModuleParams>

-				    <msoRequest>

-				        <requestId>${requestId}</requestId>

-				        <serviceInstanceId>${serviceInstanceId}</serviceInstanceId>

-				    </msoRequest>

-				    <messageId>${messageId}</messageId>

-				    <notificationUrl>${notificationUrl}</notificationUrl>

-				</updateVfModuleRequest>

-			"""

-			vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)

-			execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', vnfAdapterRestRequest)

-			utils.logAudit("vnfAdapterRestRequest : " + vnfAdapterRestRequest)

-			logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepVnfAdapterRest(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the UpdateAAIGenericVnf subflow.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepUpdateAAIGenericVnf(Execution execution) {

-		def method = getClass().getSimpleName() + '.prepUpdateAAIGenericVnf(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

-			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')

-

-			def personaModelId = utils.getNodeText1(vnfInputs, 'vnf-persona-model-id')

-			def personaModelVersion = utils.getNodeText1(vnfInputs, 'vnf-persona-model-version')

-			if ((personaModelId == null) || (personaModelVersion == null)) {

-				logDebug('Skipping update for Generic VNF ' + vnfId +

-					' because either \'vnf-persona-model-id\' or \'vnf-persona-model-version\' is absent', isDebugLogEnabled)

-				execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', true)

-			} else {

-				def personaModelIdElement = '<persona-model-id>' + personaModelId + '</persona-model-id>'

-				def personaModelVersionElement = '<persona-model-version>' + personaModelVersion + '</persona-model-version>'

-

-				String updateAAIGenericVnfRequest = """

-					<UpdateAAIGenericVnfRequest>

-						<vnf-id>${vnfId}</vnf-id>

-						${personaModelIdElement}

-						${personaModelVersionElement}

-					</UpdateAAIGenericVnfRequest>

-				"""

-				updateAAIGenericVnfRequest = utils.formatXml(updateAAIGenericVnfRequest)

-				execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)

-				utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)

-				logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)

-			}

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the UpdateAAIVfModule subflow.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepUpdateAAIVfModule(Execution execution) {

-		def method = getClass().getSimpleName() + '.prepUpdateAAIVfModule(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

-			def orchestrationStatus = 'updated'

-			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')

-

-			def volumeGroupIdElement = ''

-			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')

-			if (volumeGroupId != null) {

-				volumeGroupIdElement = '<volume-group-id>' + volumeGroupId + '</volume-group-id>'

-			}

-			def personaModelIdElement = ''

-			def personaModelId = utils.getNodeText1(vnfInputs, 'persona-model-id')

-			if (personaModelId != null) {

-				personaModelIdElement = '<persona-model-id>' + personaModelId + '</persona-model-id>'

-			}

-			def personaModelVersionElement = ''

-			def personaModelVersion = utils.getNodeText1(vnfInputs, 'persona-model-version')

-			if (personaModelVersion != null) {

-				personaModelVersionElement = '<persona-model-version>' + personaModelVersion + '</persona-model-version>'

-			}

-			def contrailServiceInstanceFqdnElement = ''

-			def contrailServiceInstanceFqdn = utils.getNodeText1(vnfInputs, 'contrail-service-instance-fqdn')

-			if (contrailServiceInstanceFqdn != null) {

-				contrailServiceInstanceFqdnElement = '<contrail-service-instance-fqdn>' + contrailServiceInstanceFqdn + '</contrail-service-instance-fqdn>'

-			}

-			def personaModelCustomizationIdElement = ''

-			def modelCustomizationId = execution.getVariable('DOUPVfMod_modelCustomizationUuid')

-			if (modelCustomizationId != null) {

-				personaModelCustomizationIdElement = '<persona-model-customization-id>' + modelCustomizationId + '</persona-model-customization-id>'

-			}

-

-			String updateAAIVfModuleRequest = """

-				<UpdateAAIVfModuleRequest>

-					<vnf-id>${vnfId}</vnf-id>

-					<vf-module-id>${vfModuleId}</vf-module-id>

-					<orchestration-status>${orchestrationStatus}</orchestration-status>

-					${volumeGroupIdElement}

-					${personaModelIdElement}

-					${personaModelVersionElement}

-					${contrailServiceInstanceFqdnElement}

-					${personaModelCustomizationIdElement}

-				</UpdateAAIVfModuleRequest>

-			"""

-			updateAAIVfModuleRequest = utils.formatXml(updateAAIVfModuleRequest)

-			execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', updateAAIVfModuleRequest)

-			utils.logAudit("updateAAIVfModuleRequest : " + updateAAIVfModuleRequest)

-			logDebug('Request for UpdateAAIVfModule:\n' + updateAAIVfModuleRequest, isDebugLogEnabled)

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIVfModule(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Prepare a Request for invoking the SDNC Adapter subflow to perform

-	 * a VNF topology 'activate' operation.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void prepSDNCTopologyAct(Execution execution) {

-		def method = getClass().getSimpleName() + '.prepSDNCTopologyAct(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def requestId = execution.getVariable('DOUPVfMod_requestId')

-			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')

-			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')

-			def serviceId = execution.getVariable('DOUPVfMod_serviceId')

-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

-			def vnfName = execution.getVariable('DOUPVfMod_vnfName')

-			def vnfType = execution.getVariable('DOUPVfMod_vnfType')

-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

-			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')

-			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')

-			def vfModuleName = vfModule.getElementText('vf-module-name')

-			def tenantId = execution.getVariable('DOUPVfMod_tenantId')

-			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')

-

-			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')

-			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)

-

-			String sdncTopologyRequest = """

-				<sdncadapterworkflow:SDNCAdapterWorkflowRequest

-						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-					<sdncadapter:RequestHeader>

-						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>

-						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>

-						<sdncadapter:SvcAction>activate</sdncadapter:SvcAction>

-						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>

-						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>

-					</sdncadapter:RequestHeader>

-					<sdncadapterworkflow:SDNCRequestData>

-					      <request-information>

-					         <request-id>${requestId}</request-id>

-					         <request-action>ChangeVNFActivateRequest</request-action>

-					         <source>PORTAL</source>

-					         <notification-url/>

-					         <order-number/>

-					         <order-version/>

-					      </request-information>

-					      <service-information>

-					         <service-type>${serviceId}</service-type>

-					         <service-instance-id>${vnfId}</service-instance-id>

-					         <subscriber-name>dontcare</subscriber-name>

-					      </service-information>

-					      <vnf-request-information>

-					         <vnf-id>${vfModuleId}</vnf-id>

-					         <vnf-type>${vfModuleModelName}</vnf-type>

-					         <vnf-name>${vfModuleName}</vnf-name>

-					         <generic-vnf-id>${vnfId}</generic-vnf-id>

-					         <generic-vnf-name>${vnfName}</generic-vnf-name>

-							 <generic-vnf-type>${vnfType}</generic-vnf-type>

-					         <tenant>${tenantId}</tenant>

-					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>

-					      </vnf-request-information>

- 					</sdncadapterworkflow:SDNCRequestData>

-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>

-			"""

-			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)

-			execution.setVariable('DOUPVfMod_sdncActivateRequest', sdncTopologyRequest)

-			utils.logAudit("sdncActivateRequest : " + sdncTopologyRequest)

-			logDebug('Request for SDNCAdapter topology/activate:\n' + sdncTopologyRequest, isDebugLogEnabled)

-

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyAct(): ' + e.getMessage())

-		}

-	}

-

-	/**

-	 * Log a WorkflowException that has been created.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void handleWorkflowException(Execution execution) {

-		def method = getClass().getSimpleName() + '.handleWorkflowException(' +

-			'execution=' + execution.getId() +

-			')'

-		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def WorkflowException workflowException = (WorkflowException) execution.getVariable('WorkflowException')

-			logError(method + ' caught WorkflowException: ' + workflowException.getErrorMessage())

-

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildWorkflowException(execution, 1002, 'Error in handleWorkflowException(): ' + e.getMessage())

-		}

-	}

-

-	public void validateSDNCResponse(Execution execution, String response, String method){

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def prefix = execution.getVariable("prefix")

-

-		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

-

-		WorkflowException workflowException = execution.getVariable("WorkflowException")

-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")

-

-		utils.logAudit("workflowException: " + workflowException)

-

-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)

-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)

-

-		utils.logAudit("SDNCResponse: " + response)

-

-		String sdncResponse = response

-		if(execution.getVariable(prefix + 'sdncResponseSuccess') == true){

-			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)

-		}else{

-			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)

-			throw new BpmnError("MSOWorkflowException")

-		}

-		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)

-	}

-

-	/**

-	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VNF info.

-	 * A 200 response is expected with the VNF info in the response body. Will find out the base module info.

-	 *

-	 * @param execution The flow's execution instance.

-	 */

-	public void queryAAIVfModule(Execution execution) {

-		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")

-		def method = getClass().getSimpleName() + '.getVfModule(' +

-			'execution=' + execution.getId() +

-			')'

-		logDebug('Entered ' + method, isDebugLogEnabled)

-

-		try {

-			def vnfId = execution.getVariable('DOUPVfMod_vnfId')

-			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')

-

-			AaiUtil aaiUriUtil = new AaiUtil(this)

-			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)

-			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)

-

-			String endPoint = execution.getVariable("URN_aai_endpoint") + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"

-			utils.logAudit("AAI endPoint: " + endPoint)

-

-			try {

-				def aaiRequestId = UUID.randomUUID().toString()

-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)

-				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)

-				utils.logAudit("createVfModule - invoking httpGet() to AAI")

-

-				def responseData = response.getResponseBodyAsString()

-				if (responseData != null) {

-					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)

-

-				}

-

-				utils.logAudit("createVfModule - queryAAIVfModule Response: " + responseData)

-				utils.logAudit("createVfModule - queryAAIVfModule ResponseCode: " + response.getStatusCode())

-

-				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponseCode', response.getStatusCode())

-				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponse', responseData)

-				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)

-				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)

-				if (response.getStatusCode() == 200) {

-					// Parse the VNF record from A&AI to find base module info

-					logDebug('Parsing the VNF data to find base module info', isDebugLogEnabled)

-					if (responseData != null) {

-						def vfModulesText = utils.getNodeXml(responseData, "vf-modules")

-						def xmlVfModules= new XmlSlurper().parseText(vfModulesText)

-						def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}

-						int vfModulesSize = 0

-						for (i in 0..vfModules.size()-1) {

-							def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])

-							def isBaseVfModule = utils.getNodeText(vfModuleXml, "is-base-vf-module")

-

-							if (isBaseVfModule == "true") {

-							    String baseModuleId = utils.getNodeText1(vfModuleXml, "vf-module-id")

-							    execution.setVariable("DOUPVfMod_baseVfModuleId", baseModuleId)

-							    logDebug('Received baseVfModuleId: ' + baseModuleId, isDebugLogEnabled)

-							    String baseModuleHeatStackId = utils.getNodeText1(vfModuleXml, "heat-stack-id")

-							    execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", baseModuleHeatStackId)

-							    logDebug('Received baseVfModuleHeatStackId: ' + baseModuleHeatStackId, isDebugLogEnabled)

-							}

-						}

-					}

-				}

-			} catch (Exception ex) {

-				ex.printStackTrace()

-				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)

-				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())

-			}

-			logDebug('Exited ' + method, isDebugLogEnabled)

-		} catch (BpmnError e) {

-			throw e;

-		} catch (Exception e) {

-			logError('Caught exception in ' + method, e)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIVfModule(): ' + e.getMessage())

-		}

-	}

-

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.runtime.Execution
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
+import org.openecomp.mso.bpmn.common.scripts.NetworkUtils
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+import org.openecomp.mso.bpmn.common.scripts.VfModule
+import org.openecomp.mso.bpmn.common.scripts.VfModuleBase
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils;
+import org.openecomp.mso.rest.APIResponse
+import org.springframework.web.util.UriUtils
+
+public class DoUpdateVfModule extends VfModuleBase {
+
+	ExceptionUtil exceptionUtil = new ExceptionUtil()
+
+	/**
+	 * Initialize the flow's variables.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void initProcessVariables(Execution execution) {
+		execution.setVariable('prefix', 'DOUPVfMod_')
+		execution.setVariable('DOUPVfMod_requestInfo', null)
+		execution.setVariable('DOUPVfMod_serviceInstanceId', null)
+		execution.setVariable('DOUPVfMod_requestId', null)
+		execution.setVariable('DOUPVfMod_vnfInputs', null)
+		execution.setVariable('DOUPVfMod_vnfId', null)
+		execution.setVariable('DOUPVfMod_vnfName', null)
+		execution.setVariable('DOUPVfMod_vnfNameFromAAI', null)
+		execution.setVariable('DOUPVfMod_vfModuleName', null)
+		execution.setVariable('DOUPVfMod_vfModuleId', null)
+		execution.setVariable('DOUPVfMod_vnfType', null)
+		execution.setVariable('DOUPVfMod_asdcServiceModelVersion', null)
+		execution.setVariable('DOUPVfMod_vfModuleModelName', null)
+		execution.setVariable('DOUPVfMod_modelCustomizationUuid', null)
+		execution.setVariable("DOUPVfMod_isBaseVfModule", "false")
+		execution.setVariable('DOUPVfMod_serviceId', null)
+		execution.setVariable('DOUPVfMod_aicCloudRegion', null)
+		execution.setVariable('DOUPVfMod_tenantId', null)
+		execution.setVariable('DOUPVfMod_volumeGroupId', null)
+		execution.setVariable('DOUPVfMod_vfModule', null)
+		execution.setVariable('DOUPVfMod_vnfParams', null)
+		execution.setVariable("DOUPVfMod_baseVfModuleId", "")
+		execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", "")
+		execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', null)
+		execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', null)
+		execution.setVariable('DOUPVfMod_sdncChangeAssignResponse', null)
+		execution.setVariable('DOUPVfMod_sdncActivateRequest', null)
+		execution.setVariable('DOUPVfMod_sdncActivateResponse', null)
+		execution.setVariable('DOUPVfMod_sdncTopologyRequest', null)
+		execution.setVariable('DOUPVfMod_sdncTopologyResponse', null)
+		execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', null)
+		execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', null)
+		execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', null)
+		execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', false)
+		execution.setVariable('DoUpdateVfModuleSuccessIndicator', false)
+	}
+
+	/**
+	 * Check for missing elements in the received request.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void preProcessRequest(Execution execution) {
+		def method = getClass().getSimpleName() + '.preProcessRequest(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			initProcessVariables(execution)
+			def xml = getVariable(execution, 'DoUpdateVfModuleRequest')
+			utils.logAudit("DoUpdateVfModule request: " + xml)
+			logDebug('Received request xml:\n' + xml, isDebugLogEnabled)
+			
+			if (xml == null || xml.isEmpty()) {
+				// Building Block-type request
+
+				String cloudConfiguration = execution.getVariable("cloudConfiguration")
+				String vfModuleModelInfo = execution.getVariable("vfModuleModelInfo")
+				
+				def serviceModelInfo = execution.getVariable("serviceModelInfo")
+				logDebug("serviceModelInfo: " + serviceModelInfo, isDebugLogEnabled)
+				def vnfModelInfo = execution.getVariable("vnfModelInfo")
+				
+
+				//tenantId
+				def tenantId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.tenantId")
+				execution.setVariable("DOUPVfMod_tenantId", tenantId)
+				
+				//volumeGroupId
+				def volumeGroupId = execution.getVariable("volumeGroupId")
+				execution.setVariable("DOUPVfMod_volumeGroupId", volumeGroupId)
+				//volumeGroupName
+				def volumeGroupName = execution.getVariable("volumeGroupName")
+				execution.setVariable("DOUPVfMod_volumeGroupName", volumeGroupName)
+				//cloudSiteId
+				def cloudSiteId = jsonUtil.getJsonValue(cloudConfiguration, "cloudConfiguration.lcpCloudRegionId")
+				execution.setVariable("DOUPVfMod_cloudSiteId", cloudSiteId)
+				
+				logDebug("cloudSiteId: " + cloudSiteId, isDebugLogEnabled)
+				//vnfType
+				def vnfType = execution.getVariable("vnfType")
+				execution.setVariable("DOUPVfMod_vnfType", vnfType)
+				
+				logDebug("vnfType: " + vnfType, isDebugLogEnabled)
+				//vnfName
+				def vnfName = execution.getVariable("vnfName")
+				execution.setVariable("DOUPVfMod_vnfName", vnfName)
+				
+				logDebug("vnfName: " + vnfName, isDebugLogEnabled)
+				//vnfId
+				def vnfId = execution.getVariable("vnfId")
+				execution.setVariable("DOUPVfMod_vnfId", vnfId)
+				
+				logDebug("vnfId: " + vnfId, isDebugLogEnabled)
+				//vfModuleName
+				def vfModuleName = execution.getVariable("vfModuleName")
+				execution.setVariable("DOUPVfMod_vfModuleName", vfModuleName)
+				
+				logDebug("vfModuleName: " + vfModuleName, isDebugLogEnabled)
+				//vfModuleModelName
+				def vfModuleModelName = jsonUtil.getJsonValue(vfModuleModelInfo, "modelName")
+				execution.setVariable("DOUPVfMod_vfModuleModelName", vfModuleModelName)
+				
+				logDebug("vfModuleModelName: " + vfModuleModelName, isDebugLogEnabled)
+				//modelCustomizationUuid
+				def modelCustomizationUuid = jsonUtil.getJsonValue(vfModuleModelInfo, "modelCustomizationId")
+				execution.setVariable("DOUPVfMod_modelCustomizationUuid", modelCustomizationUuid)
+				
+				logDebug("modelCustomizationUuid: " + modelCustomizationUuid, isDebugLogEnabled)
+				//vfModuleId
+				def vfModuleId = execution.getVariable("vfModuleId")
+				execution.setVariable("DOUPVfMod_vfModuleId", vfModuleId)
+				logDebug("vfModuleId: " + vfModuleId, isDebugLogEnabled)
+				def requestId = execution.getVariable("requestId")
+				execution.setVariable("DOUPVfMod_requestId", requestId)
+				logDebug("requestId: " + requestId, isDebugLogEnabled)
+				// Set mso-request-id to request-id for VNF Adapter interface
+				execution.setVariable("mso-request-id", requestId)
+				//serviceId
+				def serviceId = execution.getVariable("serviceId")
+				execution.setVariable("DOUPVfMod_serviceId", serviceId)
+				logDebug("serviceId: " + serviceId, isDebugLogEnabled)
+				//serviceInstanceId
+				def serviceInstanceId = execution.getVariable("serviceInstanceId")
+				execution.setVariable("DOUPVfMod_serviceInstanceId", serviceInstanceId)
+				
+				logDebug("serviceInstanceId: " + serviceInstanceId, isDebugLogEnabled)
+				//source - HARDCODED
+				def source = "VID"
+				execution.setVariable("DOUPVfMod_source", source)
+				
+				logDebug("source: " + source, isDebugLogEnabled)
+				//backoutOnFailure
+				def disableRollback = execution.getVariable("disableRollback")
+				def backoutOnFailure = true
+				if (disableRollback != null && disableRollback.equals("true")) {
+					backoutOnFailure = false
+				}
+				execution.setVariable("DOUPVfMod_backoutOnFailure", backoutOnFailure)
+				logDebug("backoutOnFailure: " + backoutOnFailure, isDebugLogEnabled)
+				//isBaseVfModule
+				def isBaseVfModule = execution.getVariable("isBaseVfModule")
+				execution.setVariable("DOUPVfMod_isBaseVfModule", isBaseVfModule)
+				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)
+				//asdcServiceModelVersion
+				def asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")
+				execution.setVariable("DOUPVfMod_asdcServiceModelVersion", asdcServiceModelVersion)
+				logDebug("asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)
+				//personaModelId
+				execution.setVariable("DOUPVfMod_personaModelId", jsonUtil.getJsonValue(vfModuleModelInfo, "modelInvariantId"))
+				//personaModelVersion
+				execution.setVariable("DOUPVfMod_personaModelVersion", jsonUtil.getJsonValue(vfModuleModelInfo, "modelVersion"))
+				//Get or Generate UUID
+				String uuid = execution.getVariable("DOUPVfMod_uuid")
+				if(uuid == null){
+					uuid = UUID.randomUUID()
+					logDebug("Generated messageId (UUID) is: " + uuid, isDebugLogEnabled)
+				}else{
+					logDebug("Found messageId (UUID) is: " + uuid, isDebugLogEnabled)
+				}
+				//isVidRequest
+				String isVidRequest = execution.getVariable("isVidRequest")
+				// default to true
+				if (isVidRequest == null || isVidRequest.isEmpty()) {
+					execution.setVariable("isVidRequest", "true")
+				}
+				//globalSubscriberId
+				String globalSubscriberId = execution.getVariable("globalSubscriberId")
+				execution.setVariable("DOUPVfMod_globalSubscriberId", globalSubscriberId)
+				logDebug("globalSubsrciberId: " + globalSubscriberId, isDebugLogEnabled)
+				//vnfQueryPath
+				String vnfQueryPath = execution.getVariable("vnfQueryPath")
+				execution.setVariable("DOUPVfMod_vnfQueryPath", vnfQueryPath)
+				logDebug("vnfQueryPath: " + vnfQueryPath, isDebugLogEnabled)
+				
+				Map<String,String> vfModuleInputParams = execution.getVariable("vfModuleInputParams")
+				if (vfModuleInputParams != null) {
+					execution.setVariable("DOUPVfMod_vnfParamsMap", vfModuleInputParams)					
+				}				
+			}
+			else {
+
+				def requestInfo = getRequiredNodeXml(execution, xml, 'request-info')
+				execution.setVariable('DOUPVfMod_requestInfo', requestInfo)
+				execution.setVariable('DOUPVfMod_requestId', getRequiredNodeText(execution, requestInfo, 'request-id'))
+				def serviceInstanceId = execution.getVariable('mso-service-instance-id')
+				if (serviceInstanceId == null) {
+					serviceInstanceId = ''
+				}
+				execution.setVariable('DOUPVfMod_serviceInstanceId', serviceInstanceId)
+	
+				def vnfInputs = getRequiredNodeXml(execution, xml, 'vnf-inputs')
+				execution.setVariable('DOUPVfMod_vnfInputs', vnfInputs)
+				execution.setVariable('DOUPVfMod_vnfId', getRequiredNodeText(execution, vnfInputs, 'vnf-id'))
+				execution.setVariable('DOUPVfMod_vfModuleId', getRequiredNodeText(execution, vnfInputs, 'vf-module-id'))
+				execution.setVariable('DOUPVfMod_vfModuleName', getNodeTextForce(vnfInputs, 'vf-module-name'))
+				execution.setVariable('DOUPVfMod_vnfType', getNodeTextForce(vnfInputs, 'vnf-type'))
+				execution.setVariable('DOUPVfMod_vnfName', getNodeTextForce(vnfInputs, 'vnf-name'))
+				execution.setVariable('DOUPVfMod_asdcServiceModelVersion', getNodeTextForce(vnfInputs, 'asdc-service-model-version'))
+				execution.setVariable('DOUPVfMod_vfModuleModelName', getRequiredNodeText(execution, vnfInputs, 'vf-module-model-name'))
+				execution.setVariable('DOUPVfMod_modelCustomizationUuid', getNodeTextForce(vnfInputs, 'model-customization-id'))
+				execution.setVariable('DOUPVfMod_serviceId', getRequiredNodeText(execution, vnfInputs, 'service-id'))
+				execution.setVariable('DOUPVfMod_aicCloudRegion', getRequiredNodeText(execution, vnfInputs, 'aic-cloud-region'))
+				execution.setVariable('DOUPVfMod_tenantId', getRequiredNodeText(execution, vnfInputs, 'tenant-id'))
+				//isBaseVfModule
+				def isBaseVfModule = "false"
+				if (utils.nodeExists(xml, "is-base-vf-module")) {
+					isBaseVfModule = utils.getNodeText(xml, "is-base-vf-module")
+					execution.setVariable("DOUPVfMod_isBaseVfModule", isBaseVfModule)
+				}
+				logDebug("isBaseVfModule: " + isBaseVfModule, isDebugLogEnabled)
+	
+				NetworkUtils networkUtils = new NetworkUtils()
+				def backoutOnFailure = networkUtils.isRollbackEnabled(execution, xml)
+				execution.setVariable("DOUPVfMod_backoutOnFailure", backoutOnFailure)
+	
+				def String vgi = getNodeTextForce(vnfInputs, 'volume-group-id')
+				execution.setVariable('DOUPVfMod_volumeGroupId', vgi)
+	
+				execution.setVariable('DOUPVfMod_vnfParams', utils.getNodeXml(xml, 'vnf-params', false))
+			}
+
+			def sdncCallbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			if (sdncCallbackUrl == null || sdncCallbackUrl.trim().isEmpty()) {
+				def msg = 'Required variable \'URN_mso_workflow_sdncadapter_callback\' is missing'
+				logError(msg)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 2000, msg)
+			}
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preProcessRequest(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the PrepareUpdateAAIVfModule subflow.  This will
+	 * set the orchestration-status to 'pending-update'.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepPrepareUpdateAAIVfModule(Execution execution) {
+		def method = getClass().getSimpleName() + '.preparePrepareUpdateAAIVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
+			def orchestrationStatus = 'pending-update'
+
+			String prepareUpdateAAIVfModuleRequest = """
+				<PrepareUpdateAAIVfModuleRequest>
+					<vnf-id>${vnfId}</vnf-id>
+					<vf-module-id>${vfModuleId}</vf-module-id>
+					<orchestration-status>${orchestrationStatus}</orchestration-status>
+				</PrepareUpdateAAIVfModuleRequest>
+			"""
+			prepareUpdateAAIVfModuleRequest = utils.formatXml(prepareUpdateAAIVfModuleRequest)
+			execution.setVariable('DOUPVfMod_prepareUpdateAAIVfModuleRequest', prepareUpdateAAIVfModuleRequest)
+			utils.logAudit("DoUpdateAAIVfModule request: " + prepareUpdateAAIVfModuleRequest)
+			logDebug('Request for PrepareUpdateAAIVfModule:\n' + prepareUpdateAAIVfModuleRequest, isDebugLogEnabled)
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in preparePrepareUpdateAAIVfModule(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the ConfirmVolumeGroupTenant subflow.  Currently,
+	 * there is really nothing to do, so we just log that we're passing through.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepConfirmVolumeGroupTenant(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepConfirmVolumeGroupTenant(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			// Nothing to do - just log that we're passing through here
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepConfirmVolumeGroupTenant(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the SDNC Adapter subflow to perform
+	 * a VNF topology 'changeassign' operation.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepSDNCTopologyChg(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepSDNCTopologyChg(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def requestId = execution.getVariable('DOUPVfMod_requestId')
+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
+			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			def serviceId = execution.getVariable('DOUPVfMod_serviceId')
+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
+			def vnfType = execution.getVariable('DOUPVfMod_vnfType')
+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
+			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')
+			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')
+			def vfModuleName = vfModule.getElementText('vf-module-name')
+			def tenantId = execution.getVariable('DOUPVfMod_tenantId')
+			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')
+
+			// Retrieve vnf name from AAI response
+			def vnfName = execution.getVariable('DOUPVfMod_vnfNameFromAAI')
+			execution.setVariable('DOUPVfMod_vnfName', vnfName)
+
+			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')
+			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)
+
+			String sdncTopologyRequest = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest
+						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>changeassign</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
+					</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData>
+					      <request-information>
+					         <request-id>${requestId}</request-id>
+					         <request-action>ChangeVNFActivateRequest</request-action>
+					         <source>PORTAL</source>
+					         <notification-url/>
+					         <order-number/>
+					         <order-version/>
+					      </request-information>
+					      <service-information>
+					         <service-type>${serviceId}</service-type>
+					         <service-instance-id>${vnfId}</service-instance-id>
+					         <subscriber-name>dontcare</subscriber-name>
+					      </service-information>
+					      <vnf-request-information>
+					         <vnf-id>${vfModuleId}</vnf-id>
+					         <vnf-type>${vfModuleModelName}</vnf-type>
+					         <vnf-name>${vfModuleName}</vnf-name>
+					         <generic-vnf-id>${vnfId}</generic-vnf-id>
+					         <generic-vnf-name>${vnfName}</generic-vnf-name>
+							 <generic-vnf-type>${vnfType}</generic-vnf-type>
+					         <tenant>${tenantId}</tenant>
+					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>
+					         ${vnfNetworks}
+					      </vnf-request-information>
+ 					</sdncadapterworkflow:SDNCRequestData>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)
+			execution.setVariable('DOUPVfMod_sdncChangeAssignRequest', sdncTopologyRequest)
+			utils.logAudit("sdncChangeAssignRequest : " + sdncTopologyRequest)
+			logDebug('Request for SDNCAdapter topology/changeassign:\n' + sdncTopologyRequest, isDebugLogEnabled)
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyChg(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the SDNC Adapter subflow to perform
+	 * a VNF topology 'query' operation.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepSDNCTopologyQuery(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepSDNCTopologyQuery(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def requestId = execution.getVariable('DOUPVfMod_requestId')
+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
+			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
+
+			def svcInstId = ""
+			if (serviceInstanceId == null || serviceInstanceId.isEmpty()) {
+				svcInstId = vfModuleId
+			}
+			else {
+				svcInstId = serviceInstanceId
+			}
+
+			//!!!! TEMPORARY WORKAROUND FOR SDNC REPLICATION ISSUE
+			sleep(5000)
+
+			String sdncTopologyRequest = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest
+						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${svcInstId}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>query</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>/VNF-API:vnfs/vnf-list/${vfModuleId}</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
+						<sdncadapter:MsoAction>mobility</sdncadapter:MsoAction>
+					</sdncadapter:RequestHeader>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)
+			execution.setVariable('DOUPVfMod_sdncTopologyRequest', sdncTopologyRequest)
+			utils.logAudit("sdncTopologyRequest : " + sdncTopologyRequest)
+			logDebug('Request for SDNCAdapter query:\n' + sdncTopologyRequest, isDebugLogEnabled)
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyQuery(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the VnfAdapterRest subflow.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepVnfAdapterRest(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepVnfAdapterRest(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def requestId = execution.getVariable('DOUPVfMod_requestId')
+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
+			def vfModuleName = execution.getVariable('DOUPVfMod_vfModuleName')
+			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')
+			def tenantId = execution.getVariable('DOUPVfMod_tenantId')
+			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')
+			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')
+			def heatStackId = vfModule.getElementText('heat-stack-id')
+			def cloudId = execution.getVariable('DOUPVfMod_aicCloudRegion')
+			def vnfType = execution.getVariable('DOUPVfMod_vnfType')
+			def vnfName = execution.getVariable('DOUPVfMod_vnfName')
+			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')
+			def baseVfModuleId = execution.getVariable("DOUPVfMod_baseVfModuleId")
+			def baseVfModuleStackId = execution.getVariable("DOUPVfMod_baseVfModuleHeatStackId")
+			def asdcServiceModelVersion = execution.getVariable('DOUPVfMod_asdcServiceModelVersion')
+			def modelCustomizationUuid = execution.getVariable('DOUPVfMod_modelCustomizationUuid')
+			def backoutOnFailure = execution.getVariable("DOUPVfMod_backoutOnFailure")
+			
+			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()
+			def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)
+			def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
+			if ('true'.equals(useQualifiedHostName)) {
+					notificationUrl = utils.getQualifiedHostNameForCallback(notificationUrl)
+			}
+			
+			Map<String, String> vnfParamsMap = execution.getVariable("DOUPVfMod_vnfParamsMap")
+
+			String sdncGetResponse = execution.getVariable('DOUPVfMod_sdncTopologyResponse')
+
+			String vfModuleParams = buildVfModuleParams(vnfParamsMap, sdncGetResponse, vnfId, vnfName,
+					vfModuleId, vfModuleName, null)
+
+
+			String vnfAdapterRestRequest = """
+				<updateVfModuleRequest>
+					<cloudSiteId>${cloudId}</cloudSiteId>
+					<tenantId>${tenantId}</tenantId>
+					<vnfId>${vnfId}</vnfId>
+					<vfModuleId>${vfModuleId}</vfModuleId>
+					<vfModuleStackId>${heatStackId}</vfModuleStackId>
+					<vnfType>${vnfType}</vnfType>
+					<vnfVersion>${asdcServiceModelVersion}</vnfVersion>
+					<modelCustomizationUuid>${modelCustomizationUuid}</modelCustomizationUuid>
+					<vfModuleType>${vfModuleModelName}</vfModuleType>
+					<volumeGroupId>${volumeGroupId}</volumeGroupId>
+					<baseVfModuleId>${baseVfModuleId}</baseVfModuleId>
+    				<baseVfModuleStackId>${baseVfModuleStackId}</baseVfModuleStackId>
+					<skipAAI>true</skipAAI>
+					<backout>${backoutOnFailure}</backout>
+				    <failIfExists>false</failIfExists>
+					<vfModuleParams>
+						${vfModuleParams}
+				    </vfModuleParams>
+				    <msoRequest>
+				        <requestId>${requestId}</requestId>
+				        <serviceInstanceId>${serviceInstanceId}</serviceInstanceId>
+				    </msoRequest>
+				    <messageId>${messageId}</messageId>
+				    <notificationUrl>${notificationUrl}</notificationUrl>
+				</updateVfModuleRequest>
+			"""
+			vnfAdapterRestRequest = utils.formatXml(vnfAdapterRestRequest)
+			execution.setVariable('DOUPVfMod_vnfAdapterRestRequest', vnfAdapterRestRequest)
+			utils.logAudit("vnfAdapterRestRequest : " + vnfAdapterRestRequest)
+			logDebug('Request for VNFAdapter Rest:\n' + vnfAdapterRestRequest, isDebugLogEnabled)
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepVnfAdapterRest(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the UpdateAAIGenericVnf subflow.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepUpdateAAIGenericVnf(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepUpdateAAIGenericVnf(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
+			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')
+
+			def personaModelId = utils.getNodeText1(vnfInputs, 'vnf-persona-model-id')
+			def personaModelVersion = utils.getNodeText1(vnfInputs, 'vnf-persona-model-version')
+			if ((personaModelId == null) || (personaModelVersion == null)) {
+				logDebug('Skipping update for Generic VNF ' + vnfId +
+					' because either \'vnf-persona-model-id\' or \'vnf-persona-model-version\' is absent', isDebugLogEnabled)
+				execution.setVariable('DOUPVfMod_skipUpdateGenericVnf', true)
+			} else {
+				def personaModelIdElement = '<model-invariant-id>' + personaModelId + '</model-invariant-id>'
+				def personaModelVersionElement = '<model-version-id>' + personaModelVersion + '</model-version-id>'
+
+				String updateAAIGenericVnfRequest = """
+					<UpdateAAIGenericVnfRequest>
+						<vnf-id>${vnfId}</vnf-id>
+						${personaModelIdElement}
+						${personaModelVersionElement}
+					</UpdateAAIGenericVnfRequest>
+				"""
+				updateAAIGenericVnfRequest = utils.formatXml(updateAAIGenericVnfRequest)
+				execution.setVariable('DOUPVfMod_updateAAIGenericVnfRequest', updateAAIGenericVnfRequest)
+				utils.logAudit("updateAAIGenericVnfRequest : " + updateAAIGenericVnfRequest)
+				logDebug('Request for UpdateAAIGenericVnf:\n' + updateAAIGenericVnfRequest, isDebugLogEnabled)
+			}
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIGenericVnf(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the UpdateAAIVfModule subflow.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepUpdateAAIVfModule(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepUpdateAAIVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
+			def orchestrationStatus = 'updated'
+			def vnfInputs = execution.getVariable('DOUPVfMod_vnfInputs')
+
+			def volumeGroupIdElement = ''
+			def volumeGroupId = execution.getVariable('DOUPVfMod_volumeGroupId')
+			if (volumeGroupId != null) {
+				volumeGroupIdElement = '<volume-group-id>' + volumeGroupId + '</volume-group-id>'
+			}
+			def personaModelIdElement = ''
+			def personaModelId = utils.getNodeText1(vnfInputs, 'persona-model-id')
+			if (personaModelId != null) {
+				personaModelIdElement = '<model-invariant-id>' + personaModelId + '</model-invariant-id>'
+			}
+			def personaModelVersionElement = ''
+			def personaModelVersion = utils.getNodeText1(vnfInputs, 'persona-model-version')
+			if (personaModelVersion != null) {
+				personaModelVersionElement = '<model-version-id>' + personaModelVersion + '</model-version-id>'
+			}
+			def contrailServiceInstanceFqdnElement = ''
+			def contrailServiceInstanceFqdn = utils.getNodeText1(vnfInputs, 'contrail-service-instance-fqdn')
+			if (contrailServiceInstanceFqdn != null) {
+				contrailServiceInstanceFqdnElement = '<contrail-service-instance-fqdn>' + contrailServiceInstanceFqdn + '</contrail-service-instance-fqdn>'
+			}
+			def personaModelCustomizationIdElement = ''
+			def modelCustomizationId = execution.getVariable('DOUPVfMod_modelCustomizationUuid')
+			if (modelCustomizationId != null) {
+				personaModelCustomizationIdElement = '<persona-model-customization-id>' + modelCustomizationId + '</persona-model-customization-id>'
+			}
+
+			String updateAAIVfModuleRequest = """
+				<UpdateAAIVfModuleRequest>
+					<vnf-id>${vnfId}</vnf-id>
+					<vf-module-id>${vfModuleId}</vf-module-id>
+					<orchestration-status>${orchestrationStatus}</orchestration-status>
+					${volumeGroupIdElement}
+					${personaModelIdElement}
+					${personaModelVersionElement}
+					${contrailServiceInstanceFqdnElement}
+					${personaModelCustomizationIdElement}
+				</UpdateAAIVfModuleRequest>
+			"""
+			
+			logDebug('Unformatted updateAAIVfModuleRequest: ' + updateAAIVfModuleRequest, isDebugLogEnabled)
+			updateAAIVfModuleRequest = utils.formatXml(updateAAIVfModuleRequest)
+			execution.setVariable('DOUPVfMod_updateAAIVfModuleRequest', updateAAIVfModuleRequest)
+			utils.logAudit("updateAAIVfModuleRequest : " + updateAAIVfModuleRequest)
+			logDebug('Request for UpdateAAIVfModule:\n' + updateAAIVfModuleRequest, isDebugLogEnabled)
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepUpdateAAIVfModule(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Prepare a Request for invoking the SDNC Adapter subflow to perform
+	 * a VNF topology 'activate' operation.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void prepSDNCTopologyAct(Execution execution) {
+		def method = getClass().getSimpleName() + '.prepSDNCTopologyAct(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def requestId = execution.getVariable('DOUPVfMod_requestId')
+			def serviceInstanceId = execution.getVariable('DOUPVfMod_serviceInstanceId')
+			def callbackUrl = (String) execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			def serviceId = execution.getVariable('DOUPVfMod_serviceId')
+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
+			def vnfName = execution.getVariable('DOUPVfMod_vnfName')
+			def vnfType = execution.getVariable('DOUPVfMod_vnfType')
+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
+			def vfModuleModelName = execution.getVariable('DOUPVfMod_vfModuleModelName')
+			def VfModule vfModule = (VfModule) execution.getVariable('DOUPVfMod_vfModule')
+			def vfModuleName = vfModule.getElementText('vf-module-name')
+			def tenantId = execution.getVariable('DOUPVfMod_tenantId')
+			def aicCloudRegion = execution.getVariable('DOUPVfMod_aicCloudRegion')
+
+			def vnfParamsXml = execution.getVariable('DOUPVfMod_vnfParams')
+			def vnfNetworks = transformNetworkParamsToVnfNetworks(vnfParamsXml)
+
+			String sdncTopologyRequest = """
+				<sdncadapterworkflow:SDNCAdapterWorkflowRequest
+						xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
+					<sdncadapter:RequestHeader>
+						<sdncadapter:RequestId>${requestId}</sdncadapter:RequestId>
+						<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>
+						<sdncadapter:SvcAction>activate</sdncadapter:SvcAction>
+						<sdncadapter:SvcOperation>vnf-topology-operation</sdncadapter:SvcOperation>
+						<sdncadapter:CallbackUrl>${callbackUrl}</sdncadapter:CallbackUrl>
+					</sdncadapter:RequestHeader>
+					<sdncadapterworkflow:SDNCRequestData>
+					      <request-information>
+					         <request-id>${requestId}</request-id>
+					         <request-action>ChangeVNFActivateRequest</request-action>
+					         <source>PORTAL</source>
+					         <notification-url/>
+					         <order-number/>
+					         <order-version/>
+					      </request-information>
+					      <service-information>
+					         <service-type>${serviceId}</service-type>
+					         <service-instance-id>${vnfId}</service-instance-id>
+					         <subscriber-name>dontcare</subscriber-name>
+					      </service-information>
+					      <vnf-request-information>
+					         <vnf-id>${vfModuleId}</vnf-id>
+					         <vnf-type>${vfModuleModelName}</vnf-type>
+					         <vnf-name>${vfModuleName}</vnf-name>
+					         <generic-vnf-id>${vnfId}</generic-vnf-id>
+					         <generic-vnf-name>${vnfName}</generic-vnf-name>
+							 <generic-vnf-type>${vnfType}</generic-vnf-type>
+					         <tenant>${tenantId}</tenant>
+					         <aic-cloud-region>${aicCloudRegion}</aic-cloud-region>
+					      </vnf-request-information>
+ 					</sdncadapterworkflow:SDNCRequestData>
+				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>
+			"""
+			sdncTopologyRequest = utils.formatXml(sdncTopologyRequest)
+			execution.setVariable('DOUPVfMod_sdncActivateRequest', sdncTopologyRequest)
+			utils.logAudit("sdncActivateRequest : " + sdncTopologyRequest)
+			logDebug('Request for SDNCAdapter topology/activate:\n' + sdncTopologyRequest, isDebugLogEnabled)
+
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in prepSDNCTopologyAct(): ' + e.getMessage())
+		}
+	}
+
+	/**
+	 * Log a WorkflowException that has been created.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void handleWorkflowException(Execution execution) {
+		def method = getClass().getSimpleName() + '.handleWorkflowException(' +
+			'execution=' + execution.getId() +
+			')'
+		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def WorkflowException workflowException = (WorkflowException) execution.getVariable('WorkflowException')
+			logError(method + ' caught WorkflowException: ' + workflowException.getErrorMessage())
+
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildWorkflowException(execution, 1002, 'Error in handleWorkflowException(): ' + e.getMessage())
+		}
+	}
+
+	public void validateSDNCResponse(Execution execution, String response, String method){
+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
+		def prefix = execution.getVariable("prefix")
+
+		logDebug(" *** STARTED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
+
+		WorkflowException workflowException = execution.getVariable("WorkflowException")
+		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+
+		utils.logAudit("workflowException: " + workflowException)
+
+		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
+		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+
+		utils.logAudit("SDNCResponse: " + response)
+
+		String sdncResponse = response
+		if(execution.getVariable(prefix + 'sdncResponseSuccess') == true){
+			logDebug("Received a Good Response from SDNC Adapter for " + method + " SDNC Call.  Response is: \n" + sdncResponse, isDebugLogEnabled)
+		}else{
+			logDebug("Received a BAD Response from SDNC Adapter for " + method + " SDNC Call.", isDebugLogEnabled)
+			throw new BpmnError("MSOWorkflowException")
+		}
+		logDebug(" *** COMPLETED ValidateSDNCResponse Process*** ", isDebugLogEnabled)
+	}
+
+	/**
+	 * Using the received vnfId and vfModuleId, query AAI to get the corresponding VNF info.
+	 * A 200 response is expected with the VNF info in the response body. Will find out the base module info.
+	 *
+	 * @param execution The flow's execution instance.
+	 */
+	public void queryAAIVfModule(Execution execution) {
+		def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
+		def method = getClass().getSimpleName() + '.getVfModule(' +
+			'execution=' + execution.getId() +
+			')'
+		logDebug('Entered ' + method, isDebugLogEnabled)
+
+		try {
+			def vnfId = execution.getVariable('DOUPVfMod_vnfId')
+			def vfModuleId = execution.getVariable('DOUPVfMod_vfModuleId')
+
+			AaiUtil aaiUriUtil = new AaiUtil(this)
+			String  aai_uri = aaiUriUtil.getNetworkGenericVnfUri(execution)
+			logDebug('AAI URI is: ' + aai_uri, isDebugLogEnabled)
+
+			String endPoint = execution.getVariable("URN_aai_endpoint") + "${aai_uri}/" + UriUtils.encode(vnfId, "UTF-8") + "?depth=1"
+			utils.logAudit("AAI endPoint: " + endPoint)
+
+			try {
+				def aaiRequestId = UUID.randomUUID().toString()
+				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)
+				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)
+				utils.logAudit("createVfModule - invoking httpGet() to AAI")
+
+				def responseData = response.getResponseBodyAsString()
+				if (responseData != null) {
+					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)
+
+				}
+
+				utils.logAudit("createVfModule - queryAAIVfModule Response: " + responseData)
+				utils.logAudit("createVfModule - queryAAIVfModule ResponseCode: " + response.getStatusCode())
+
+				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponseCode', response.getStatusCode())
+				execution.setVariable('DOUPVfMod_queryAAIVfModuleResponse', responseData)
+				logDebug('Response code:' + response.getStatusCode(), isDebugLogEnabled)
+				logDebug('Response:' + System.lineSeparator() + responseData, isDebugLogEnabled)
+				if (response.getStatusCode() == 200) {
+					// Parse the VNF record from A&AI to find base module info
+					logDebug('Parsing the VNF data to find base module info', isDebugLogEnabled)
+					if (responseData != null) {
+						def vfModulesText = utils.getNodeXml(responseData, "vf-modules")
+						def xmlVfModules= new XmlSlurper().parseText(vfModulesText)
+						def vfModules = xmlVfModules.'**'.findAll {it.name() == "vf-module"}
+						int vfModulesSize = 0
+						for (i in 0..vfModules.size()-1) {
+							def vfModuleXml = groovy.xml.XmlUtil.serialize(vfModules[i])
+							def isBaseVfModule = utils.getNodeText(vfModuleXml, "is-base-vf-module")
+
+							if (isBaseVfModule == "true") {
+							    String baseModuleId = utils.getNodeText1(vfModuleXml, "vf-module-id")
+							    execution.setVariable("DOUPVfMod_baseVfModuleId", baseModuleId)
+							    logDebug('Received baseVfModuleId: ' + baseModuleId, isDebugLogEnabled)
+							    String baseModuleHeatStackId = utils.getNodeText1(vfModuleXml, "heat-stack-id")
+							    execution.setVariable("DOUPVfMod_baseVfModuleHeatStackId", baseModuleHeatStackId)
+							    logDebug('Received baseVfModuleHeatStackId: ' + baseModuleHeatStackId, isDebugLogEnabled)
+							}
+						}
+					}
+				}
+			} catch (Exception ex) {
+				ex.printStackTrace()
+				logDebug('Exception occurred while executing AAI GET:' + ex.getMessage(),isDebugLogEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'AAI GET Failed:' + ex.getMessage())
+			}
+			logDebug('Exited ' + method, isDebugLogEnabled)
+		} catch (BpmnError e) {
+			throw e;
+		} catch (Exception e) {
+			logError('Caught exception in ' + method, e)
+			exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in queryAAIVfModule(): ' + e.getMessage())
+		}
+	}
+
+
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfra.groovy
deleted file mode 100644
index 5f0f65b..0000000
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfra.groovy
+++ /dev/null
@@ -1,1639 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */
-

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil;

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor;

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil;

-import org.openecomp.mso.bpmn.common.scripts.NetworkUtils;

-import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils;

-import org.openecomp.mso.bpmn.common.scripts.VidUtils;

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.bpmn.core.json.JsonUtils;

-import org.openecomp.mso.rest.APIResponse

-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.runtime.Execution
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils
-
-/**
- * This groovy class supports the <class>UpdateNetworkInstanceInfra.bpmn</class> process.
- */
-public class UpdateNetworkInstanceInfra extends AbstractServiceTaskProcessor {
-	String Prefix="UPDNETI_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>UpdateNetworkInstanceInfra.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(Execution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable("UPDNETI_messageId", "")
-		execution.setVariable("BasicAuthHeaderValuePO", "")
-		execution.setVariable("BasicAuthHeaderValueSDNC", "")
-		execution.setVariable("UPDNETI_UpdateNetworkInstanceInfraJsonRequest", "")
-		execution.setVariable("UPDNETI_networkRequest", "")
-		execution.setVariable("UPDNETI_networkInputs", "")
-		execution.setVariable("UPDNETI_networkOutputs", "")
-		execution.setVariable("UPDNETI_requestId", "")
-		execution.setVariable("UPDNETI_source", "")
-		execution.setVariable("UPDNETI_networkId", "")
-
-		execution.setVariable("UPDNETI_CompleteMsoProcessRequest", "")
-		execution.setVariable("UPDNETI_FalloutHandlerRequest", "")
-		execution.setVariable("UPDNETI_isSilentSuccess", false)
-		execution.setVariable("UPDNETI_isPONR", false)    // Point-of-no-return, means, rollback is not needed
-
-		// AAI query Cloud Region
-		execution.setVariable("UPDNETI_queryCloudRegionRequest","")
-		execution.setVariable("UPDNETI_queryCloudRegionReturnCode","")
-		execution.setVariable("UPDNETI_queryCloudRegionResponse","")
-		execution.setVariable("UPDNETI_cloudRegionPo","")
-		execution.setVariable("UPDNETI_cloudRegionSdnc","")
-		execution.setVariable("UPDNETI_isCloudRegionGood", false)
-
-		// AAI query Id
-		execution.setVariable("UPDNETI_queryIdAAIRequest","")
-		execution.setVariable("UPDNETI_queryIdAAIResponse", "")
-		execution.setVariable("UPDNETI_aaiIdReturnCode", "")
-
-		// AAI query vpn binding
-		execution.setVariable("UPDNETI_queryVpnBindingAAIRequest","")
-		execution.setVariable("UPDNETI_queryVpnBindingAAIResponse", "")
-		execution.setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", "")
-		execution.setVariable("UPDNETI_vpnBindings", null)
-		execution.setVariable("UPDNETI_vpnCount", 0)
-		execution.setVariable("UPDNETI_routeCollection", "")
-
-		// AAI query network policy
-		execution.setVariable("UPDNETI_queryNetworkPolicyAAIRequest","")
-		execution.setVariable("UPDNETI_queryNetworkPolicyAAIResponse", "")
-		execution.setVariable("UPDNETI_aaiQqueryNetworkPolicyReturnCode", "")
-		execution.setVariable("UPDNETI_networkPolicyUriList", null)
-		execution.setVariable("UPDNETI_networkPolicyCount", 0)
-		execution.setVariable("UPDNETI_networkCollection", "")
-
-		// AAI query route table reference
-		execution.setVariable("UPDNETI_queryNetworkTableRefAAIRequest","")
-		execution.setVariable("UPDNETI_queryNetworkTableRefAAIResponse", "")
-		execution.setVariable("UPDNETI_aaiQqueryNetworkTableRefReturnCode", "")
-		execution.setVariable("UPDNETI_networkTableRefUriList", null)
-		execution.setVariable("UPDNETI_networkTableRefCount", 0)
-		execution.setVariable("UPDNETI_tableRefCollection", "")
-		
-		// AAI requery Id
-		execution.setVariable("UPDNETI_requeryIdAAIRequest","")
-		execution.setVariable("UPDNETI_requeryIdAAIResponse", "")
-		execution.setVariable("UPDNETI_aaiRequeryIdReturnCode", "")
-
-		// AAI update contrail
-		execution.setVariable("UPDNETI_updateContrailAAIUrlRequest","")
-		execution.setVariable("UPDNETI_updateContrailAAIPayloadRequest","")
-		execution.setVariable("UPDNETI_updateContrailAAIResponse", "")
-		execution.setVariable("UPDNETI_aaiUpdateContrailReturnCode", "")
-
-		execution.setVariable("UPDNETI_updateNetworkRequest", "")
-		execution.setVariable("UPDNETI_updateNetworkResponse", "")
-		execution.setVariable("UPDNETI_rollbackNetworkRequest", "")
-		execution.setVariable("UPDNETI_rollbackNetworkResponse", "")
-		execution.setVariable("UPDNETI_networkReturnCode", "")
-		execution.setVariable("UPDNETI_rollbackNetworkReturnCode", "")
-		execution.setVariable("UPDNETI_isNetworkRollbackNeeded", false)
-
-		execution.setVariable("UPDNETI_changeAssignSDNCRequest", "")
-		execution.setVariable("UPDNETI_changeAssignSDNCResponse", "")
-		execution.setVariable("UPDNETI_rollbackSDNCRequest", "")
-		execution.setVariable("UPDNETI_rollbackSDNCResponse", "")
-		execution.setVariable("UPDNETI_sdncReturnCode", "")
-		execution.setVariable("UPDNETI_rollbackSDNCReturnCode", "")
-		execution.setVariable("UPDNETI_isSdncRollbackNeeded", false)
-		execution.setVariable("UPDNETI_sdncResponseSuccess", false)
-
-		execution.setVariable("UPDNETI_updateDBRequest", "")
-		execution.setVariable("UPDNETI_updateDBResponse", "")
-		execution.setVariable("UPDNETI_dbReturnCode", "")
-
-		execution.setVariable("UPDNETI_isVnfBindingPresent", false)
-		execution.setVariable("UPDNETI_Success", false)
-		execution.setVariable("UPDNETI_serviceInstanceId", "")
-		execution.setVariable("GENGS_type", "service-instance") // Setting for Generic Sub Flow use
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>UpdateNetworkInstanceInfra.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside preProcessRequest UpdateNetworkInstanceInfra Request ***** ", isDebugEnabled)
-
-		// initialize flow variables
-		InitializeProcessVariables(execution)
-
-		// get Incoming request & validate json format
-		String updateNetworkJsonIncoming = execution.getVariable("bpmnRequest")
-		utils.logAudit(updateNetworkJsonIncoming)
-		try {
-			def prettyJson = JsonOutput.prettyPrint(updateNetworkJsonIncoming.toString())
-			utils.log("DEBUG", " Incoming message formatted . . . : " + '\n' + prettyJson, isDebugEnabled)
-
-		} catch (Exception ex) {
-			String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
-			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		}
-
-		// PO Authorization Info / headers Authorization=
-		String basicAuthValuePO = execution.getVariable("URN_mso_adapters_po_auth")
-		utils.log("DEBUG", " Obtained BasicAuth userid password for PO/SDNC adapter: " + basicAuthValuePO, isDebugEnabled)
-		try {
-			def encodedString = utils.getBasicAuth(basicAuthValuePO, execution.getVariable("URN_mso_msoKey"))
-			execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-			execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-
-		} catch (IOException ex) {
-			String dataErrorMessage = " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-			utils.log("DEBUG", dataErrorMessage, , isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		}
-
-		try {
-			// Catalog DB headers Authorization

-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

-			

-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

-		} catch (IOException ex) {

-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

-			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-		}

-		

-		try {

-
-			execution.setVariable("UPDNETI_UpdateNetworkInstanceInfraJsonRequest", updateNetworkJsonIncoming)
-
-			// recreate the xml network-request
-			String networkRequest =  vidUtils.createXmlNetworkRequestInfra(execution, updateNetworkJsonIncoming)
-			execution.setVariable("UPDNETI_networkRequest", networkRequest)
-			utils.log("DEBUG", " network-request - " + '\n' + networkRequest, isDebugEnabled)
-
-			String networkInputs = utils.getNodeXml(networkRequest, "network-inputs", false).replace("tag0:","").replace(":tag0","")
-			execution.setVariable("UPDNETI_networkInputs", networkInputs)
-			utils.log("DEBUG", " networkInputs - " + '\n' + networkInputs, isDebugEnabled)
-
-			String netId = utils.getNodeText1(networkRequest, "network-id")
-			String netName = utils.getNodeText1(networkRequest, "network-name")
-			String networkOutputs = 
-			   """<network-outputs>
-                   <network-id>${netId}</network-id>			
-                   <network-name>${netName}</network-name>
-                 </network-outputs>"""
-			execution.setVariable("UPDNETI_networkOutputs", networkOutputs)
-			utils.log("DEBUG", " networkOutputs - " + '\n' + networkOutputs, isDebugEnabled)
-
-			String requestId = execution.getVariable("mso-request-id")

-			if (requestId == null || requestId == "") {
-				requestId = execution.getVariable("requestId")
-			}
-			execution.setVariable("UPDNETI_requestId", requestId)
-			execution.setVariable("UPDNETI_source", utils.getNodeText1(networkRequest, "source"))
-
-			// prepare messageId
-			String messageId = execution.getVariable("UPDNETI_messageId")  // for testing
-			if (messageId == null || messageId == "") {
-				messageId = UUID.randomUUID()
-				utils.log("DEBUG", " UPDNETI_messageId, random generated: " + messageId, isDebugEnabled)
-			} else {
-				utils.log("DEBUG", " UPDNETI_messageId, pre-assigned: " + messageId, isDebugEnabled)
-			}
-			execution.setVariable("UPDNETI_messageId", messageId)
-
-			// validate 'backout-on-failure' to override 'URN_mso_rollback'
-			boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, networkRequest)
-			execution.setVariable("UPDNETI_rollbackEnabled", rollbackEnabled)
-
-			String networkId = ""
-			if (utils.nodeExists(networkRequest, "network-id")) {
-				networkId = utils.getNodeText1(networkRequest, "network-id")
-				if (networkId == 'null' || networkId == "") {
-					sendSyncError(execution)
-					// missing value of networkId
-					String dataErrorMessage = "Variable 'network-id' value/element is missing."
-					utils.log("DEBUG", " Invalid Request - " + dataErrorMessage, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-				}
-			}
-
-			String lcpCloudRegion = ""
-			if (utils.nodeExists(networkRequest, "aic-cloud-region")) {
-				lcpCloudRegion = utils.getNodeText1(networkRequest, "aic-cloud-region")
-			    if ((lcpCloudRegion == 'null') || (lcpCloudRegion == "")) {
-					sendSyncError(execution)
-					String dataErrorMessage = "requestDetails has missing 'aic-cloud-region' value/element."
-					utils.log("DEBUG", " Invalid Request - " + dataErrorMessage, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-				}
-			}
-
-			String serviceInstanceId = ""
-			if (utils.nodeExists(networkRequest, "service-instance-id")) {
-				serviceInstanceId = utils.getNodeText1(networkRequest, "service-instance-id")
-				if ((serviceInstanceId == 'null') || (lcpCloudRegion == "")) {
-					sendSyncError(execution)
-					String dataErrorMessage = "Variable 'serviceInstanceId' value/element is missing."
-					utils.log("DEBUG", " Invalid Request - " + dataErrorMessage, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-				}
-			}
-
-			execution.setVariable("UPDNETI_serviceInstanceId", serviceInstanceId)
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex){
-			sendSyncError(execution)
-			 // caught exception
-			String exceptionMessage = "Exception Encountered in UpdateNetworkInstanceInfra, PreProcessRequest() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-	}
-
-	public void sendSyncResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		utils.log("DEBUG", " ***** Inside sendSyncResponse of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-			String serviceInstanceId = execution.getVariable("UPDNETI_serviceInstanceId")
-			String requestId = execution.getVariable("mso-request-id")

-
-			// RESTResponse (for API Handler (APIH) Reply Task)
-			String updateNetworkRestRequest = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-
-			utils.log("DEBUG", " sendSyncResponse to APIH - " + "\n" + updateNetworkRestRequest, isDebugEnabled)
-			sendWorkflowResponse(execution, 202, updateNetworkRestRequest)
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow. sendSyncResponse() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-
-	}
-
-	public void callRESTQueryAAICloudRegion (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside callRESTQueryAAICloudRegion of UpdateNetworkInstanceInfra ***** " , isDebugEnabled)
-
-		try {
-			String networkInputs  = execution.getVariable("UPDNETI_networkInputs")
-			String cloudRegion = utils.getNodeText1(networkInputs, "aic-cloud-region")
-			cloudRegion = UriUtils.encode(cloudRegion,"UTF-8")
-
-			// Prepare AA&I url
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUtil = new AaiUtil(this)
-			String aai_uri = aaiUtil.getCloudInfrastructureCloudRegionUri(execution)
-			String queryCloudRegionRequest = "${aai_endpoint}${aai_uri}/" + cloudRegion
-			utils.logAudit(queryCloudRegionRequest)
-			execution.setVariable("UPDNETI_queryCloudRegionRequest", queryCloudRegionRequest)
-			utils.log("DEBUG", " UPDNETI_queryCloudRegionRequest - " + "\n" + queryCloudRegionRequest, isDebugEnabled)
-
-			String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
-			String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
-
-			if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
-				execution.setVariable("UPDNETI_cloudRegionPo", cloudRegionPo)
-				execution.setVariable("UPDNETI_cloudRegionSdnc", cloudRegionSdnc)
-				execution.setVariable("UPDNETI_isCloudRegionGood", true)
-
-			} else {
-			    String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable("UPDNETI_queryCloudRegionReturnCode")
-			    utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-			}
-
-			utils.log("DEBUG", " is Cloud Region Good: " + execution.getVariable("UPDNETI_isCloudRegionGood"), isDebugEnabled)
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex) {
-			// try error
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow - callRESTQueryAAICloudRegion() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTQueryAAINetworkId(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkId of UpdateNetworkInstanceInfra ***** " , isDebugEnabled)
-
-		try {
-			// get variables
-			String networkRequest = execution.getVariable("UPDNETI_networkRequest")
-			String networkId   = utils.getNodeText1(networkRequest, "network-id")
-			networkId = UriUtils.encode(networkId,"UTF-8")
-			execution.setVariable("UPDNETI_networkId", networkId)
-			String messageId = execution.getVariable("UPDNETI_messageId")
-
-			// Prepare AA&I url
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-			String queryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId
-			utils.logAudit(queryIdAAIRequest)
-			execution.setVariable("UPDNETI_queryIdAAIRequest", queryIdAAIRequest)
-			utils.log("DEBUG", " UPDNETI_queryIdAAIRequest - " + "\n" + queryIdAAIRequest, isDebugEnabled)
-
-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryIdAAIRequest)
-			String returnCode = response.getStatusCode()
-			execution.setVariable("UPDNETI_aaiIdReturnCode", returnCode)
-
-			utils.log("DEBUG", " ***** AAI Response Code  : " + returnCode, isDebugEnabled)
-
-			String aaiResponseAsString = response.getResponseBodyAsString()
-
-			if (returnCode=='200') {
-				utils.logAudit(aaiResponseAsString)
-				execution.setVariable("UPDNETI_queryIdAAIResponse", aaiResponseAsString)
-				utils.log("DEBUG", " QueryAAINetworkId Success REST Response - " + "\n" + aaiResponseAsString, isDebugEnabled)
-
-			} else {
-				if (returnCode=='404') {
-					String dataErrorMessage = "Response Error from QueryAAINetworkId is 404 (Not Found)."
-					utils.log("DEBUG", " AAI Query Failed. " + dataErrorMessage, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-				} else {
-				   if (aaiResponseAsString.contains("RESTFault")) {
-					   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-					   execution.setVariable("WorkflowException", exceptionObject)
-					   throw new BpmnError("MSOWorkflowException")
-
-				   } else {
-							// aai all errors
-							String dataErrorMessage = "Unexpected Response from QueryAAINetworkId - " + returnCode
-							utils.log("DEBUG", "Unexpected Response from QueryAAINetworkId - " + dataErrorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-				  }
-				}
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow. callRESTQueryAAINetworkId() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTReQueryAAINetworkId(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside callRESTReQueryAAINetworkId of UpdateNetworkInstanceInfra ***** " , isDebugEnabled)
-
-		try {
-			// get variables
-			String networkId   = utils.getNodeText1(execution.getVariable("UPDNETI_changeAssignSDNCResponse"), "network-id")
-			networkId = UriUtils.encode(networkId,"UTF-8")
-			String messageId = execution.getVariable("UPDNETI_messageId")
-
-			// Prepare AA&I url
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-			String requeryIdAAIRequest = "${aai_endpoint}${aai_uri}/" + networkId
-			utils.logAudit(requeryIdAAIRequest)
-			execution.setVariable("UPDNETI_requeryIdAAIRequest", requeryIdAAIRequest)
-			utils.log("DEBUG", " UPDNETI_requeryIdAAIRequest - " + "\n" + requeryIdAAIRequest, isDebugEnabled)
-
-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, requeryIdAAIRequest)
-			String returnCode = response.getStatusCode()
-			execution.setVariable("UPDNETI_aaiRequeryIdReturnCode", returnCode)
-			utils.log("DEBUG", " ***** AAI ReQuery Response Code  : " + returnCode, isDebugEnabled)
-
-			String aaiResponseAsString = response.getResponseBodyAsString()
-
-			if (returnCode=='200') {
-				utils.logAudit(aaiResponseAsString)
-				execution.setVariable("UPDNETI_requeryIdAAIResponse", aaiResponseAsString)
-				utils.log("DEBUG", " ReQueryAAINetworkId Success REST Response - " + "\n" + aaiResponseAsString, isDebugEnabled)
-
-				String netId = utils.getNodeText1(aaiResponseAsString, "network-id")
-				String netName = utils.getNodeText1(aaiResponseAsString, "network-name")
-				String networkOutputs =
-				   """<network-outputs>
-                   <network-id>${netId}</network-id>			
-                   <network-name>${netName}</network-name>
-                 </network-outputs>"""
-				execution.setVariable("UPDNETI_networkOutputs", networkOutputs)
-				utils.log("DEBUG", " networkOutputs - " + '\n' + networkOutputs, isDebugEnabled)
-				
-			} else {
-				if (returnCode=='404') {
-					String dataErrorMessage = "Response Error from ReQueryAAINetworkId is 404 (Not Found)."
-					utils.log("DEBUG", " AAI ReQuery Failed. - " + dataErrorMessage, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-				} else {
-				   if (aaiResponseAsString.contains("RESTFault")) {
-					   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-					   execution.setVariable("WorkflowException", exceptionObject)
-					   throw new BpmnError("MSOWorkflowException")
-
-					   } else {
-							// aai all errors
-							String dataErrorMessage = "Unexpected Response from ReQueryAAINetworkId - " + returnCode
-							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-					}
-				}
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow. callRESTReQueryAAINetworkId() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTQueryAAINetworkVpnBinding(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkVpnBinding of UpdateNetworkInstanceInfra ***** " , isDebugEnabled)
-
-		try {
-
-			// get variables
-			String messageId = execution.getVariable("UPDNETI_messageId")
-			String queryIdAAIResponse   = execution.getVariable("UPDNETI_requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
-			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
-
-			// Check if Vnf Binding is present, then build a List of vnfBinding
-			List vpnBindingUri = networkUtils.getVnfBindingObject(relationship)
-			int vpnCount = vpnBindingUri.size()
-			execution.setVariable("UPDNETI_vpnCount", vpnCount)
-			utils.log("DEBUG", " UPDNETI_vpnCount - " + vpnCount, isDebugEnabled)
-
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-
-			if (vpnCount > 0) {
-				execution.setVariable("UPDNETI_vpnBindings", vpnBindingUri)
-				utils.log("DEBUG", " vpnBindingUri List - " + vpnBindingUri, isDebugEnabled)
-
-				String routeTargets = ""
-				// AII loop call using list vpnBindings
-				for (i in 0..vpnBindingUri.size()-1) {
-
-					int counting = i+1
-
-					// prepare url using vpnBinding
-					String queryVpnBindingAAIRequest = ""
-					String aai_uri = aaiUriUtil.getNetworkVpnBindingUri(execution)
-
-					// Note: By default, the vpnBinding url is found in 'related-link' of the response,
-					//       so, the default in URN mappings for this is set to "" (ie, space), unless forced to use the URN mapping.
-					if (aai_uri == null || aai_uri == "") {
-						// using value of 'related-link' from response
-						if (vpnBindingUri[i].charAt(vpnBindingUri[i].length()-1) == '/') {
-						    queryVpnBindingAAIRequest = "${aai_endpoint}" + vpnBindingUri[i].substring(0, vpnBindingUri[i].length()-1)
-						} else {
-						    queryVpnBindingAAIRequest = "${aai_endpoint}" + vpnBindingUri[i]
-						}
-
-					} else {
-					    // using uri value in URN mapping
-						String vpnBindingId = vpnBindingUri[i].substring(vpnBindingUri[i].indexOf("/vpn-binding/")+13, vpnBindingUri[i].length())
-						if (vpnBindingId.charAt(vpnBindingId.length()-1) == '/') {
-							vpnBindingId = vpnBindingId.substring(0, vpnBindingId.length()-1)
-						}
-					    queryVpnBindingAAIRequest = "${aai_endpoint}${aai_uri}/" + vpnBindingId
-					}
-
-					utils.logAudit(queryVpnBindingAAIRequest)
-					execution.setVariable("UPDNETI_queryVpnBindingAAIRequest", queryVpnBindingAAIRequest)
-					utils.log("DEBUG", " UPDNETI_queryVpnBindingAAIRequest, , vpnBinding #" + counting + " : " + "\n" + queryVpnBindingAAIRequest, isDebugEnabled)
-
-					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryVpnBindingAAIRequest)
-					String returnCode = response.getStatusCode()
-					execution.setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", returnCode)
-					utils.log("DEBUG", " ***** AAI query vpn binding Response Code, vpnBinding #" + counting + " : " + returnCode, isDebugEnabled)
-
-					String aaiResponseAsString = response.getResponseBodyAsString()
-
-					if (returnCode=='200') {
-						utils.logAudit(aaiResponseAsString)
-						execution.setVariable("UPDNETI_queryVpnBindingAAIResponse", aaiResponseAsString)
-						utils.log("DEBUG", " AAI Query Vpn Binding Success REST Response, , vpnBinding #" + counting + " : " + "\n" + aaiResponseAsString, isDebugEnabled)
-
-						String routeTarget = ""
-						if (utils.nodeExists(aaiResponseAsString, "global-route-target")) {
-							routeTarget  = utils.getNodeText1(aaiResponseAsString, "global-route-target")
-							routeTargets += "<routeTargets>" + routeTarget + "</routeTargets>" + '\n'
-						}
-
-					} else {
-						if (returnCode=='404') {
-							String dataErrorMessage = "Response Error from AAINetworkVpnBinding is 404 (Not Found)."
-							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-						} else {
-						   if (aaiResponseAsString.contains("RESTFault")) {
-							   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-							   execution.setVariable("WorkflowException", exceptionObject)
-							   throw new BpmnError("MSOWorkflowException")
-
-							   } else {
-									// aai all errors
-									String dataErrorMessage = " Unexpected Response from AAINetworkVpnBinding - " + returnCode
-									utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-							  }
-						}
-					}
-
-				} // end loop
-
-				execution.setVariable("UPDNETI_routeCollection", routeTargets)
-				utils.log("DEBUG", " UPDNETI_routeCollection - " + '\n' + routeTargets, isDebugEnabled)
-
-			} else {
-				// reset return code to success
-				execution.setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", "200")
-				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
-			    String aaiStubResponse =
-					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
-							<vpn-binding xmlns="${schemaVersion}">
-						      <global-route-target/>
-							</vpn-binding>
-						</rest:payload>"""
-				String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
-				execution.setVariable("UPDNETI_queryVpnBindingAAIResponse", aaiStubResponseAsXml)
-				execution.setVariable("UPDNETI_routeCollection", "<routeTargets/>")
-				utils.log("DEBUG", " No vpnBinding, using this stub as response - " + '\n' + aaiStubResponseAsXml, isDebugEnabled)
-
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow. callRESTQueryAAINetworkVpnBinding() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTQueryAAINetworkPolicy(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkPolicy of UpdateNetworkInstanceInfra ***** " , isDebugEnabled)
-
-		try {
-			// get variables
-			String messageId = execution.getVariable("UPDNETI_messageId")
-			String queryIdAAIResponse   = execution.getVariable("UPDNETI_requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
-			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
-
-			// Check if Network Policy is present, then build a List of network policy
-			List networkPolicyUriList = networkUtils.getNetworkPolicyObject(relationship)
-			int networkPolicyCount = networkPolicyUriList.size()
-			execution.setVariable("UPDNETI_networkPolicyCount", networkPolicyCount)
-			utils.log("DEBUG", " UPDNETI_networkPolicyCount - " + networkPolicyCount, isDebugEnabled)
-
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-
-			if (networkPolicyCount > 0) {
-				execution.setVariable("UPDNETI_networkPolicyUriList", networkPolicyUriList)
-				utils.log("DEBUG", " networkPolicyUri List - " + networkPolicyUriList, isDebugEnabled)
-
-				String networkPolicies = ""
-				// AII loop call using list vpnBindings
-				for (i in 0..networkPolicyUriList.size()-1) {
-
-					int counting = i+1
-
-					// prepare url using vpnBinding
-					String queryNetworkPolicyAAIRequest = ""
-
-					String aai_uri = aaiUriUtil.getNetworkPolicyUri(execution)
-
-					// Note: By default, the network policy url is found in 'related-link' of the response,
-					//       so, the default in URN mappings for this is set to "" (ie, space), unless forced to use the URN mapping.
-					if (aai_uri == null || aai_uri == "") {
-						// using value of 'related-link' from response
-						if (networkPolicyUriList[i].charAt(networkPolicyUriList[i].length()-1) == '/') {
-							queryNetworkPolicyAAIRequest = "${aai_endpoint}" + networkPolicyUriList[i].substring(0, networkPolicyUriList[i].length()-1)
-						} else {
-							queryNetworkPolicyAAIRequest = "${aai_endpoint}" + networkPolicyUriList[i]
-						}
-					} else {
-						// using uri value in URN mapping
-						String networkPolicyId = networkPolicyUriList[i].substring(networkPolicyUriList[i].indexOf("/network-policy/")+16, networkPolicyUriList[i].length())
-						println " networkPolicyId - " + networkPolicyId
-						if (networkPolicyId.charAt(networkPolicyId.length()-1) == '/') {
-							networkPolicyId = networkPolicyId.substring(0, networkPolicyId.length()-1)
-						}
-						queryNetworkPolicyAAIRequest = "${aai_endpoint}${aai_uri}/" + networkPolicyId
-
-					}
-
-
-					utils.logAudit(queryNetworkPolicyAAIRequest)
-					execution.setVariable("UPDNETI_queryNetworkPolicyAAIRequest", queryNetworkPolicyAAIRequest)
-					utils.log("DEBUG", " UPDNETI_queryNetworkPolicyAAIRequest, , NetworkPolicy #" + counting + " : " + "\n" + queryNetworkPolicyAAIRequest, isDebugEnabled)
-
-					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkPolicyAAIRequest)
-					String returnCode = response.getStatusCode()
-					execution.setVariable("UPDNETI_aaiQqueryNetworkPolicyReturnCode", returnCode)
-					utils.log("DEBUG", " ***** AAI query network policy Response Code, NetworkPolicy #" + counting + " : " + returnCode, isDebugEnabled)
-
-					String aaiResponseAsString = response.getResponseBodyAsString()
-
-					if (returnCode=='200') {
-						utils.logAudit(aaiResponseAsString)
-						execution.setVariable("UPDNETI_queryNetworkPolicyAAIResponse", aaiResponseAsString)
-						utils.log("DEBUG", " QueryAAINetworkPolicy Success REST Response, , NetworkPolicy #" + counting + " : " + "\n" + aaiResponseAsString, isDebugEnabled)
-
-						String networkPolicy = ""
-						if (utils.nodeExists(aaiResponseAsString, "network-policy-fqdn")) {
-							networkPolicy  = utils.getNodeText1(aaiResponseAsString, "network-policy-fqdn")
-							networkPolicies += "<policyFqdns>" + networkPolicy + "</policyFqdns>" + '\n'
-						}
-
-					} else {
-						if (returnCode=='404') {
-							String dataErrorMessage = "Response Error from QueryAAINetworkPolicy is 404 (Not Found)."
-							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-						} else {
-						   if (aaiResponseAsString.contains("RESTFault")) {
-							   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-							   execution.setVariable("WorkflowException", exceptionObject)
-							   throw new BpmnError("MSOWorkflowException")
-
-							   } else {
-									// aai all errors
-									String dataErrorMessage = "Unexpected Response from QueryAAINetworkPolicy - " + returnCode
-									utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-							  }
-						}
-					}
-
-				} // end loop
-
-				execution.setVariable("UPDNETI_networkCollection", networkPolicies)
-				utils.log("DEBUG", " UPDNETI_networkCollection - " + '\n' + networkPolicies, isDebugEnabled)
-
-			} else {
-				// reset return code to success
-				execution.setVariable("UPDNETI_aaiQqueryNetworkPolicyReturnCode", "200")
-				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
-				String aaiStubResponse =
-					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
-							<network-policy xmlns="${schemaVersion}">
-							  <network-policy-fqdn/>
-                            </network-policy>
-						</rest:payload>"""
-				String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
-				execution.setVariable("UPDNETI_queryNetworkPolicyAAIResponse", aaiStubResponseAsXml)
-				execution.setVariable("UPDNETI_networkCollection", "<policyFqdns/>")
-				utils.log("DEBUG", " No net policies, using this stub as response - " + '\n' + aaiStubResponseAsXml, isDebugEnabled)
-
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow. callRESTQueryAAINetworkPolicy() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTQueryAAINetworkTableRef(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside callRESTQueryAAINetworkTableRef of UpdateNetworkInstanceInfra ***** " , isDebugEnabled)
-
-		try {
-			// get variables
-			String messageId = execution.getVariable("UPDNETI_messageId")
-			String queryIdAAIResponse   = execution.getVariable("UPDNETI_requeryIdAAIResponse").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-			String relationship = networkUtils.getFirstNodeXml(queryIdAAIResponse, "relationship-list").trim().replace("tag0:","").replace(":tag0","")
-			utils.log("DEBUG", " relationship - " + relationship, isDebugEnabled)
-
-			// Check if Network TableREf is present, then build a List of network policy
-			List networkTableRefUriList = networkUtils.getNetworkTableRefObject(relationship)
-			int networkTableRefCount = networkTableRefUriList.size()
-			execution.setVariable("UPDNETI_networkTableRefCount", networkTableRefCount)
-			utils.log("DEBUG", " UPDNETI_networkTableRefCount - " + networkTableRefCount, isDebugEnabled)
-
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-
-			if (networkTableRefCount > 0) {
-				execution.setVariable("UPDNETI_networkTableRefUriList", networkTableRefUriList)
-				utils.log("DEBUG", " networkTableRefUri List - " + networkTableRefUriList, isDebugEnabled)
-
-				// AII loop call using list vpnBindings
-				String networkTableRefs = ""
-				for (i in 0..networkTableRefUriList.size()-1) {
-
-					int counting = i+1
-
-					// prepare url using tableRef
-					String queryNetworkTableRefAAIRequest = ""
-
-					String aai_uri = aaiUriUtil.getNetworkTableReferencesUri(execution)
-
-					// Note: By default, the network policy url is found in 'related-link' of the response,
-					//       so, the default in URN mappings for this is set to "" (ie, space), unless forced to use the URN mapping.
-					if (aai_uri == null || aai_uri == "") {
-						// using value of 'related-link' from response
-						if (networkTableRefUriList[i].charAt(networkTableRefUriList[i].length()-1) == '/') {
-							queryNetworkTableRefAAIRequest = "${aai_endpoint}" + networkTableRefUriList[i].substring(0, networkTableRefUriList[i].length()-1)
-						} else {
-							queryNetworkTableRefAAIRequest = "${aai_endpoint}" + networkTableRefUriList[i]
-						}
-					} else {
-						// using uri value in URN mapping
-						String networkTableRefId = networkTableRefUriList[i].substring(networkTableRefUriList[i].indexOf("/route-table-reference/")+23, networkTableRefUriList[i].length())
-
-						if (networkTableRefId.charAt(networkTableRefId.length()-1) == '/') {
-							networkTableRefId = networkTableRefId.substring(0, networkTableRefId.length()-1)
-						}
-						queryNetworkTableRefAAIRequest = "${aai_endpoint}${aai_uri}/" + networkTableRefId
-
-					}
-
-
-					utils.logAudit(queryNetworkTableRefAAIRequest)
-					execution.setVariable("UPDNETI_queryNetworkTableRefAAIRequest", queryNetworkTableRefAAIRequest)
-					utils.log("DEBUG", " UPDNETI_queryNetworkTableRefAAIRequest, , NetworkTableRef #" + counting + " : " + "\n" + queryNetworkTableRefAAIRequest, isDebugEnabled)
-
-					APIResponse response = aaiUriUtil.executeAAIGetCall(execution, queryNetworkTableRefAAIRequest)
-					String returnCode = response.getStatusCode()
-					execution.setVariable("UPDNETI_aaiQqueryNetworkTableRefReturnCode", returnCode)
-					utils.log("DEBUG", " ***** AAI query network Table Reference Response Code, NetworkTableRef #" + counting + " : " + returnCode, isDebugEnabled)
-
-					String aaiResponseAsString = response.getResponseBodyAsString()
-
-					if (returnCode=='200') {
-						utils.logAudit(aaiResponseAsString)
-						execution.setVariable("UPDNETI_queryNetworkTableRefAAIResponse", aaiResponseAsString)
-						utils.log("DEBUG", " QueryAAINetworkTableRef Success REST Response, , NetworkTableRef #" + counting + " : " + "\n" + aaiResponseAsString, isDebugEnabled)
-
-						String networkTableRef = ""
-						if (utils.nodeExists(aaiResponseAsString, "route-table-reference-fqdn")) {
-							networkTableRef  = utils.getNodeText1(aaiResponseAsString, "route-table-reference-fqdn")
-							networkTableRefs += "<routeTableFqdns>" + networkTableRef + "</routeTableFqdns>" + '\n'
-						}
-
-					} else {
-						if (returnCode=='404') {
-							String dataErrorMessage = "Response Error from QueryAAINetworkTableRef is 404 (Not Found)."
-							utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-							
-						} else {
-						   if (aaiResponseAsString.contains("RESTFault")) {
-							   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-							   execution.setVariable("WorkflowException", exceptionObject)
-							   throw new BpmnError("MSOWorkflowException")
-		
-							   } else {
-									// aai all errors
-									String dataErrorMessage = "Unexpected Response from QueryAAINetworkTableRef - " + returnCode
-									utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-							  }
-						}
-					}
-
-				} // end loop
-
-				execution.setVariable("UPDNETI_tableRefCollection", networkTableRefs)
-				utils.log("DEBUG", " UPDNETI_tableRefCollection - " + '\n' + networkTableRefs, isDebugEnabled)
-
-			} else {
-				// reset return code to success
-				execution.setVariable("UPDNETI_aaiQqueryNetworkTableRefReturnCode", "200")
-				String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-				String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
-				String aaiStubResponse =
-					"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
-							<route-table-references xmlns="${schemaVersion}">
-							  <route-table-reference-fqdn/>
-                            </route-table-references>
-						</rest:payload>"""
-				String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
-				execution.setVariable("UPDNETI_queryNetworkTableRefAAIResponse", aaiStubResponseAsXml)
-				execution.setVariable("UPDNETI_tableRefCollection", "<routeTableFqdns/>")
-				utils.log("DEBUG", " No net table references, using this stub as response - " + '\n' + aaiStubResponseAsXml, isDebugEnabled)
-
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-			
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow. callRESTQueryAAINetworkTableRef() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-	
-	public void callRESTUpdateContrailAAINetwork(Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside callRESTUpdateContrailAAINetwork of UpdateNetworkInstanceInfra ***** " , isDebugEnabled)
-
-		try {
-			// get variables
-			String networkId   = utils.getNodeText1(execution.getVariable("UPDNETI_changeAssignSDNCResponse"), "network-id")
-			networkId = UriUtils.encode(networkId,"UTF-8")
-			String requeryIdAAIResponse   = execution.getVariable("UPDNETI_requeryIdAAIResponse")
-			String updateNetworkResponse   = execution.getVariable("UPDNETI_updateNetworkResponse")
-			String messageId = execution.getVariable("UPDNETI_messageId")
-
-			// Prepare url
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-			String aai_uri = aaiUriUtil.getNetworkL3NetworkUri(execution)
-			String updateContrailAAIUrlRequest = "${aai_endpoint}${aai_uri}/" + networkId
-
-			utils.logAudit(updateContrailAAIUrlRequest)
-			execution.setVariable("UPDNETI_updateContrailAAIUrlRequest", updateContrailAAIUrlRequest)
-			utils.log("DEBUG", " UPDNETI_updateContrailAAIUrlRequest - " + "\n" + updateContrailAAIUrlRequest, isDebugEnabled)
-
-			//Prepare payload (PUT)
-			String schemaVersion = aaiUriUtil.getNamespaceFromUri(aai_uri)
-			String payload = networkUtils.ContrailNetworkCreatedUpdate(requeryIdAAIResponse, updateNetworkResponse, schemaVersion)
-			String payloadXml = utils.formatXml(payload)
-			utils.logAudit(payloadXml)
-			execution.setVariable("UPDNETI_updateContrailAAIPayloadRequest", payloadXml)
-			utils.log("DEBUG", " 'payload' to Update Contrail - " + "\n" + payloadXml, isDebugEnabled)
-
-			APIResponse response = aaiUriUtil.executeAAIPutCall(execution, updateContrailAAIUrlRequest, payload)
-			String returnCode = response.getStatusCode()
-			execution.setVariable("UPDNETI_aaiUpdateContrailReturnCode", returnCode)
-
-			utils.log("DEBUG", " ***** AAI Update Contrail Response Code  : " + returnCode, isDebugEnabled)
-
-			String aaiUpdateContrailResponseAsString = response.getResponseBodyAsString()
-
-			if (returnCode=='200') {
-				utils.logAudit(aaiUpdateContrailResponseAsString)
-				execution.setVariable("UPDNETI_updateContrailAAIResponse", aaiUpdateContrailResponseAsString)
-				utils.log("DEBUG", " AAI Update Contrail Success REST Response - " + "\n" + aaiUpdateContrailResponseAsString, isDebugEnabled)
-				// Point-of-no-return is set to false, rollback not needed.
-				execution.setVariable("UPDNETI_isPONR", true)
-
-			} else {
-				if (returnCode=='404') {
-					String dataErrorMessage = " Response Error from UpdateContrailAAINetwork is 404 (Not Found)."
-					utils.log("DEBUG", dataErrorMessage, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-				} else {
-				   if (aaiUpdateContrailResponseAsString.contains("RESTFault")) {
-					   WorkflowException exceptionObject = exceptionUtil.MapAAIExceptionToWorkflowException(aaiUpdateContrailResponseAsString, execution)
-					   execution.setVariable("WorkflowException", exceptionObject)
-					   throw new BpmnError("MSOWorkflowException")
-
-					   } else {
-							// aai all errors
-							String errorMessage = "Unexpected Response from UpdateContrailAAINetwork - " + returnCode
-							utils.log("DEBUG", errorMessage, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, "2500", errorMessage)
-					  }
-				}
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in UpdateNetworkInstanceInfra flow. callRESTUpdateContrailAAINetwork() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void prepareUpdateNetworkRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside prepareUpdateNetworkRequest of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-
-			// get variables
-			String requestId = execution.getVariable("UPDNETI_requestId")
-			String messageId = execution.getVariable("UPDNETI_messageId")
-			String source    = execution.getVariable("UPDNETI_source")
-
-			String requestInput = execution.getVariable("UPDNETI_networkRequest")
-			String queryIdResponse = execution.getVariable("UPDNETI_requeryIdAAIResponse")
-			String cloudRegionId = execution.getVariable("UPDNETI_cloudRegionPo")
-			String backoutOnFailure = execution.getVariable("UPDNETI_rollbackEnabled")
-
-			// Prepare Network request
-			String routeCollection = execution.getVariable("UPDNETI_routeCollection")
-			String policyCollection = execution.getVariable("UPDNETI_networkCollection")
-			String tableCollection = execution.getVariable("UPDNETI_tableRefCollection")
-			String updateNetworkRequest = networkUtils.UpdateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyCollection, tableCollection, cloudRegionId, backoutOnFailure, source )
-			// Format Response
-			String buildUpdateNetworkRequestAsString = utils.formatXml(updateNetworkRequest)
-			buildUpdateNetworkRequestAsString = buildUpdateNetworkRequestAsString.replace(":w1aac13n0", "").replace("w1aac13n0:", "")
-			utils.logAudit(buildUpdateNetworkRequestAsString)
-
-			execution.setVariable("UPDNETI_updateNetworkRequest", buildUpdateNetworkRequestAsString)
-			utils.log("DEBUG", " UPDNETI_updateNetworkRequest - " + "\n" +  buildUpdateNetworkRequestAsString, isDebugEnabled)
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. prepareUpdateNetworkRequest() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void prepareSDNCRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside prepareSDNCRequest of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-			// get variables
-			String sdncCallback = execution.getVariable("URN_mso_workflow_sdncadapter_callback")
-			String updateNetworkInput = execution.getVariable("UPDNETI_networkRequest")
-			String cloudRegionId = execution.getVariable("UPDNETI_cloudRegionSdnc")
-
-			String networkId = ""
-			if (utils.nodeExists(updateNetworkInput, "network-id")) {
-			   networkId = utils.getNodeText1(updateNetworkInput, "network-id")
-			}
-			if (networkId == null) {networkId = ""}
-
-			String serviceInstanceId = utils.getNodeText1(updateNetworkInput, "service-instance-id")
-
-			// 1. prepare assign topology via SDNC Adapter SUBFLOW call
- 		   	String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, updateNetworkInput, serviceInstanceId, sdncCallback, "changeassign", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
-
-			String sndcTopologyUpdateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
-			utils.logAudit(sndcTopologyUpdateRequesAsString)
-			execution.setVariable("UPDNETI_changeAssignSDNCRequest", sndcTopologyUpdateRequesAsString)
-			utils.log("DEBUG", " UPDNETI_changeAssignSDNCRequest - " + "\n" +  sndcTopologyUpdateRequesAsString, isDebugEnabled)
-
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. prepareSDNCRequest() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void prepareDBRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		try {
-			// Catalog DB headers Authorization

-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

-			

-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

-		} catch (IOException ex) {

-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

-			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-		}

-		

-		try {

-			utils.log("DEBUG", " ***** Inside prepareDBRequest of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-			String networkOutputs = execution.getVariable("UPDNETI_networkOutputs")
-			String networkName = ""
-			try {
-				 networkName = utils.getNodeText1(networkOutputs, "network-name")
-				 if (networkName == null) {networkName = ""}
-			} catch (Exception ex) {
-				networkName = ""
-				utils.log("DEBUG", " No 'network-name' found in '<network-outputs>' ! ", isDebugEnabled)
-			}
-			String networkId = ""
-			try {
-				networkId = utils.getNodeText1(networkOutputs, "network-id")
-				if (networkId == null) {networkId = ""}
-			} catch (Exception) {
-				networkId = ""
-				utils.log("DEBUG", " No 'network-id' found in '<network-outputs>' ! ", isDebugEnabled)
-			}
-			String requestId = execution.getVariable("UPDNETI_requestId")
-
-			String statusMessage = "Network successfully updated."
-
-			String dbRequest =
-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
-						<soapenv:Header/>
-						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-								<requestId>${requestId}</requestId>
-								<lastModifiedBy>BPMN</lastModifiedBy>
-								<statusMessage>${statusMessage}</statusMessage>
-								<responseBody></responseBody>
-								<requestStatus>COMPLETED</requestStatus>
-								<progress>100</progress>
-								<vnfOutputs>&lt;network-id&gt;${networkId}&lt;/network-id&gt;&lt;network-name&gt;${networkName}&lt;/network-names&gt;</vnfOutputs>
-                                <networkId>${networkId}</networkId>
-							</ns:updateInfraRequest>
-					   	</soapenv:Body>
-					   </soapenv:Envelope>"""
-
-		   String buildDeleteDBRequestAsString = utils.formatXml(dbRequest)
-		   execution.setVariable("UPDNETI_updateDBRequest", buildDeleteDBRequestAsString)
-		   utils.log("DEBUG", " DB Adapter Request - " + "\n" + buildDeleteDBRequestAsString, isDebugEnabled)
-		   utils.logAudit(buildDeleteDBRequestAsString)
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. prepareDBRequest() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	 }
-
-	public void prepareDBRequestError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		try {
-			// Catalog DB headers Authorization

-			String basicAuthValueDB = execution.getVariable("URN_mso_adapters_db_auth")

-			utils.log("DEBUG", " Obtained BasicAuth userid password for Catalog DB adapter: " + basicAuthValueDB, isDebugEnabled)

-			

-			def encodedString = utils.getBasicAuth(basicAuthValueDB, execution.getVariable("URN_mso_msoKey"))

-			execution.setVariable("BasicAuthHeaderValueDB",encodedString)

-		} catch (IOException ex) {

-			String dataErrorMessage = " Unable to encode Catalog DB user/password string - " + ex.getMessage()

-			utils.log("DEBUG", dataErrorMessage, isDebugEnabled)

-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)

-		}

-		

-		try {

-			utils.log("DEBUG", " ***** Inside prepareDBRequestError of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-			String statusMessage = ""
-			WorkflowException wfe = null
-			if (execution.getVariable("WorkflowException") instanceof WorkflowException) {
-				wfe = execution.getVariable("WorkflowException")
-				statusMessage = wfe.getErrorMessage()
-			} else {
-			   String workflowException = execution.getVariable("WorkflowException")
-			   try {
-				  statusMessage = utils.getNodeText1(workflowException, "ErrorMessage")
-			   } catch (Exception ex) {
-			  	  statusMessage = "Encountered Error during DB Update. " + ex.getMessage()
-			   }
-			}
-			String networkOutputs = execution.getVariable("UPDNETI_networkOutputs")
-			String requestId = execution.getVariable("UPDNETI_requestId")
-			String networkId = ""
-			try {
-				networkId = utils.getNodeText1(networkOutputs, "network-id")
-				if (networkId == null) {networkId = ""}
-			} catch (Exception) {
-				networkId = ""
-				utils.log("DEBUG", " No 'network-id' found in '<network-outputs>' ! ", isDebugEnabled)
-			}
-			String networkName = ""
-			try {
-				 networkName = utils.getNodeText1(networkOutputs, "network-name")
-				 if (networkName == null) {networkName = ""}
-			} catch (Exception ex) {
-				networkName = ""
-				utils.log("DEBUG", " No 'network-name' found in '<network-outputs>' ! ", isDebugEnabled)
-			}
-			String dbRequest =
-					"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
-						<soapenv:Header/>
-						<soapenv:Body>
-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-								<requestId>${requestId}</requestId>
-								<lastModifiedBy>BPMN</lastModifiedBy>
-								<statusMessage>${statusMessage}</statusMessage>
-								<responseBody></responseBody>
-								<requestStatus>FAILED</requestStatus>
-								<vnfOutputs>&lt;network-id&gt;${networkId}&lt;/network-id&gt;&lt;network-name&gt;${networkName}&lt;/network-names&gt;</vnfOutputs>
-							</ns:updateInfraRequest>
-					   	</soapenv:Body>
-					   </soapenv:Envelope>"""
-
-		   execution.setVariable("UPDNETI_updateDBRequest", dbRequest)
-		   utils.log("DEBUG", " DB Adapter Request - " + "\n" + dbRequest, isDebugEnabled)
-		   utils.logAudit(dbRequest)
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. prepareDBRequestError() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	 }
-
-
-	// **************************************************
-	//     Post or Validate Response Section
-	// **************************************************
-
-	public void validateUpdateNetworkResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside validateUpdateNetworkResponse of UpdateNetworkInstanceInfra *****", isDebugEnabled)
-
-		try {
-			String returnCode = execution.getVariable("UPDNETI_networkReturnCode")
-			String networkResponse = execution.getVariable("UPDNETI_updateNetworkResponse")
-			if (networkResponse==null)	{
-				networkResponse="" // reset
-			}
-
-			utils.log("DEBUG", " Network Adapter update responseCode: " + returnCode, isDebugEnabled)
-
-			String errorMessage = ""
-			if (returnCode == "200") {
-				execution.setVariable("UPDNETI_isNetworkRollbackNeeded", true)
-				utils.logAudit(networkResponse)
-				execution.setVariable("UPDNETI_updateNetworkResponse", networkResponse)
-				utils.log("DEBUG", " Network Adapter update Success Response - " + "\n" + networkResponse, isDebugEnabled)
-
-				// prepare rollback data
-				String rollbackData = utils.getNodeXml(networkResponse, "rollback", false).replace("tag0:","").replace(":tag0","")
-  				String rollbackNetwork =
-					"""<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">

-							${rollbackData}
-						</NetworkAdapter:rollbackNetwork>"""
-				String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
-				execution.setVariable("UPDNETI_rollbackNetworkRequest", rollbackNetworkXml)
-				utils.log("DEBUG", " Network Adapter rollback data - " + "\n" + rollbackNetworkXml, isDebugEnabled)
-
-			} else { // network error
-			   if (returnCode.toInteger() > 399 && returnCode.toInteger() < 600) {   //4xx, 5xx
-				   if (networkResponse.contains("updateNetworkError")) {
-					   networkResponse = networkResponse.replace('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>', '')
-					   errorMessage = utils.getNodeText1(networkResponse, "message")
-					   errorMessage  = "Received error from Network Adapter: " + errorMessage
-					   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
-
-				   } else { // CatchAll exception
-				   	   if (returnCode == "500") {
-						   errorMessage = "JBWEB000065: HTTP Status 500."
-				       } else {
-					       errorMessage = "Return code is " + returnCode
-				       }
-					   errorMessage  = "Received error from Network Adapter: " + errorMessage
-					   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
-
-				   }
-
-			   } else { // CatchAll exception
-				   String dataErrorMessage  = "Received error from Network Adapter. Return code is: " + returnCode
-				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-			   }
-
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. validateUpdateNetworkResponse() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-
-	}
-
-	public void validateSDNCResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside validateSDNCResponse of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-		String response = execution.getVariable("UPDNETI_changeAssignSDNCResponse")
-		WorkflowException workflowException = null
-		try {
-			workflowException = execution.getVariable("UPDNETI_WorkflowException")
-			//execution.setVariable("WorkflowException", workflowException)
-		} catch (Exception ex) {
-			utils.log("DEBUG", " Sdnc 'WorkflowException' object is empty or null. ", isDebugEnabled)
-		}
-
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-		// reset variable
-		String changeAssignSDNCResponseDecodeXml = sdncAdapterUtils.decodeXML(execution.getVariable("UPDNETI_changeAssignSDNCResponse"))
-		changeAssignSDNCResponseDecodeXml = changeAssignSDNCResponseDecodeXml.replace("&", "&amp;").replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-		execution.setVariable("UPDNETI_changeAssignSDNCResponse", changeAssignSDNCResponseDecodeXml)
-
-		if (execution.getVariable("UPDNETI_sdncResponseSuccess") == true) {  // from sdnc util, prefix+'sdncResponseSuccess'
-			execution.setVariable("UPDNETI_isSdncRollbackNeeded", true)
-			utils.log("DEBUG", "Successfully Validated SDNC Response", isDebugEnabled)
-
-		} else {
-			utils.log("DEBUG", "Did NOT Successfully Validated SDNC Response", isDebugEnabled)
-			throw new BpmnError("MSOWorkflowException")
-		}
-
-	}
-
-
-	public void postProcessResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside postProcessResponse of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-			// Display DB response: UPDNETI_updateDBResponse / UPDNETI_dbReturnCode
-			String dbReturnCode = execution.getVariable("UPDNETI_dbReturnCode")
-			utils.log("DEBUG", " ***** DB Update Response Code  : " + dbReturnCode, isDebugEnabled)
-			String updateDBResponse =  execution.getVariable("UPDNETI_updateDBResponse")
-			utils.log("DEBUG", " ***** DB Update Response String: " + '\n' + updateDBResponse, isDebugEnabled)
-			utils.logAudit(updateDBResponse)
-
-			String source = execution.getVariable("UPDNETI_source")
-			String requestId = execution.getVariable("UPDNETI_requestId")
-
-			String msoCompletionRequest =
-				"""<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-								xmlns:ns="http://org.openecomp/mso/request/types/v1">

-						<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-							<request-id>${requestId}</request-id>
-							<action>UPDATE</action>
-							<source>${source}</source>
-			   			</request-info>
-			   			<aetgt:mso-bpel-name>BPMN Network action: UPDATE</aetgt:mso-bpel-name>
-					</aetgt:MsoCompletionRequest>"""
-
-				// Format Response
-			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
-
-			if (dbReturnCode == "200") {
-				utils.logAudit(updateDBResponse)
-				utils.logAudit(xmlMsoCompletionRequest)
-				execution.setVariable("UPDNETI_Success", true)
-				execution.setVariable("UPDNETI_CompleteMsoProcessRequest", xmlMsoCompletionRequest)
-				utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
-				
-			} else {
-				String errorMessage = " DB Update failed, code: " + dbReturnCode
-				utils.log("DEBUG", errorMessage, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
-				
-			}
-
-
-		} catch (BpmnError e) {
-		throw e;
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. postProcessResponse() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-        }
-
-
-	}
-
-	public void prepareSDNCRollbackRequest (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Inside prepareSDNCRollbackRequest of UpdateNetworkInstanceInfra ***** ", isDebugEnabled)
-
-		try {
-			// for some reason the WorkflowException object is null after the sdnc rollback call task, need to save WorkflowException. 
-			execution.setVariable("UPDNETI_WorkflowException", execution.getVariable("WorkflowException"))
-			// get variables
-			String sdncCallback = execution.getVariable("URN_mso_workflow_sdncadapter_callback")
-			String updateNetworkInput = execution.getVariable("UPDNETI_networkRequest")
-			String cloudRegionId = execution.getVariable("UPDNETI_cloudRegionSdnc")
-			String changeAssignSDNCResponse = execution.getVariable("UPDNETI_changeAssignSDNCResponse")
-			String networkId = utils.getNodeText1(changeAssignSDNCResponse, "network-id")
-
-			String serviceInstanceId = utils.getNodeText1(updateNetworkInput, "service-instance-id")
-
-			// 2. prepare rollback topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyRollbackRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, updateNetworkInput, serviceInstanceId, sdncCallback, "rollback", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
-			String sndcTopologyRollbackRequestAsString = utils.formatXml(sndcTopologyRollbackRequest)
-			execution.setVariable("UPDNETI_rollbackSDNCRequest", sndcTopologyRollbackRequestAsString)
-			utils.log("DEBUG", " Preparing request for SDNC Topology assign's rollback/compensation . . . - " + "\n" +  sndcTopologyRollbackRequestAsString, isDebugEnabled)
-
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. prepareSDNCRollbackRequest() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void validateRollbackResponses (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		try {
-			// Note: Updates do not support rollback.  To restore a previous state, another Update would be needed to revert to the original settings.  
-			// This would need to be managed by the client.
-			String rollbackNetworkErrorMessages = ""
-			Boolean isNetworkRollbackNeeded = execution.getVariable("UPDNETI_isNetworkRollbackNeeded")
-			if (isNetworkRollbackNeeded == true) {
-				rollbackNetworkErrorMessages = " + PO Network rollback is not supported for Update. Submit another Update to restore/rollback."
-			}
-
-			// validate SDNC rollback response
-			String rollbackSdncErrorMessages = ""
-			Boolean isSdncRollbackNeeded = execution.getVariable("UPDNETI_isSdncRollbackNeeded")
-			if (isSdncRollbackNeeded == true) {
-				String rollbackSDNCReturnCode = execution.getVariable("UPDNETI_rollbackSDNCReturnCode")
-				String rollbackSDNCReturnInnerCode = ""
-				String rollbackSDNCResponse = execution.getVariable("UPDNETI_rollbackSDNCResponse")
-				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-				rollbackSDNCResponse = sdncAdapterUtils.decodeXML(rollbackSDNCResponse)
-				rollbackSDNCResponse = rollbackSDNCResponse.replace("&", "&amp;").replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-
-				if (rollbackSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
-						rollbackSDNCReturnInnerCode = utils.getNodeText1(rollbackSDNCResponse, "response-code")
-						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
-						rollbackSdncErrorMessages = " + SNDC rollback completed."
-						} else {
-							rollbackSdncErrorMessages = " + SDNC rollback failed. "
-						}
-					} else {
-					  rollbackSdncErrorMessages = " + SNDC rollback completed."
-					}
-				} else {
-					  rollbackSdncErrorMessages = " + SDNC rollback failed. "
- 				}
-
-				utils.log("DEBUG", " SDNC rollback Code - " + rollbackSDNCReturnCode, isDebugEnabled)
-				utils.log("DEBUG", " SDNC rollback  Response - " + rollbackSDNCResponse, isDebugEnabled)
-
-			}
-
-			//WorkflowException wfe = execution.getVariable("WorkflowException")
-			//String statusMessage = wfe.getErrorMessage()
-			//int errorCode = wfe.getErrorCode()
-			
-			String statusMessage = ""
-			int errorCode = 0
-			WorkflowException wfe = execution.getVariable("WorkflowException")
-			if (wfe instanceof WorkflowException) { 
-			  statusMessage = wfe.getErrorMessage()
-			  errorCode = wfe.getErrorCode()
-			} else {
-			   if (execution.getVariable("UPDNETI_WorkflowException") instanceof WorkflowException) {
-				  // get saved WorkflowException  
-			      WorkflowException swfe = execution.getVariable("UPDNETI_WorkflowException")
-			      statusMessage = swfe.getErrorMessage()
-			      errorCode =  swfe.getErrorCode()
-			   } else {
-			      statusMessage = "Encountered Error, please see previous tasks/activities/steps for error messages."
-			      errorCode = 7000
-		       }   
-			} 
-
-			// recreate WorkflowException to include the rollback Message
-			statusMessage =  statusMessage + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
-			exceptionUtil.buildWorkflowException(execution, errorCode, statusMessage)
-
-		} catch (Exception ex) {
-			execution.setVariable("WorkflowException", null)
-			String exceptionMessage = " Bpmn error encountered in UpdateNetworkInstanceInfra flow. validateRollbackResponses() - " + ex.getMessage()
-			utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-
-
-	}
-
-	// *******************************
-	//     Build Error Section
-	// *******************************
-
-	// Prepare for FalloutHandler
-	public void buildErrorResponse (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		utils.log("DEBUG", " ***** Prepare for FalloutHandler. FAILURE - prepare request for sub-process FalloutHandler. *****", isDebugEnabled)
-
-		String dbReturnCode = execution.getVariable("UPDNETI_dbReturnCode")
-		utils.log("DEBUG", " ***** DB Update Response Code  : " + dbReturnCode, isDebugEnabled)
-		String updateDBResponse =  execution.getVariable("UPDNETI_updateDBResponse")
-		utils.log("DEBUG", " ***** DB Update Response String: " + '\n' + updateDBResponse, isDebugEnabled)
-		utils.logAudit(updateDBResponse)
-
-		String falloutHandlerRequest = ""
-		String requestId = execution.getVariable("UPDNETI_requestId")
-		String source = execution.getVariable("UPDNETI_source")
-		try {
-			execution.setVariable("UPDNETI_Success", false)
-			WorkflowException wfe = execution.getVariable("WorkflowException")
-			String errorCode = String.valueOf(wfe.getErrorCode())
-			String errorMessage = wfe.getErrorMessage()
-			falloutHandlerRequest =
-			    """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>${requestId}</request-id>
-					      <action>UPDATE</action>
-					      <source>${source}</source>
-					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>${errorMessage}</aetgt:ErrorMessage>
-							<aetgt:ErrorCode>${errorCode}</aetgt:ErrorCode>
-						</aetgt:WorkflowException>
-					</aetgt:FalloutHandlerRequest>"""
-
-			utils.logAudit(falloutHandlerRequest)
-			execution.setVariable("UPDNETI_FalloutHandlerRequest", falloutHandlerRequest)
-			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
-
-		} catch (Exception ex) {
-			String errorException = "  Bpmn error encountered in UpdateNetworkInstanceInfra flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
-			utils.log("DEBUG", errorException, isDebugEnabled)
-			falloutHandlerRequest =
-			"""<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>${requestId}</request-id>
-					      <action>UPDATE</action>
-					      <source>${source}</source>
-					   </request-info>
-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>${errorException}</aetgt:ErrorMessage>
-							<aetgt:ErrorCode>7000</aetgt:ErrorCode>
-						</aetgt:WorkflowException>
-					</aetgt:FalloutHandlerRequest>"""
-
-			execution.setVariable("UPDNETI_FalloutHandlerRequest", falloutHandlerRequest)
-			utils.log("DEBUG", "  Overall Error Response going to FalloutHandler: " + "\n" + falloutHandlerRequest, isDebugEnabled)
-
-		}
-
-	}
-
-
-	public void sendSyncError (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix", Prefix)
-
-		try {
-
-			String requestId = execution.getVariable("mso-request-id")

-
-			// REST Error (for API Handler (APIH) Reply Task)
-			String syncError = """{"requestReferences":{"instanceId":"","requestId":"${requestId}"}}""".trim()
-
-			sendWorkflowResponse(execution, 500, syncError)
-
-		} catch (Exception ex) {
-			utils.log("DEBUG", " Bpmn error encountered in UpdateNetworkInstanceInfra flow. sendSyncError() - " + ex.getMessage(), isDebugEnabled)
-		}
-
-	}
-
-
-	public void processJavaException(Execution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-		try{
-			utils.log("DEBUG", "Caught a Java Exception", isDebugEnabled)
-			utils.log("DEBUG", "Started processJavaException Method", isDebugEnabled)
-			utils.log("DEBUG", "Variables List: " + execution.getVariables(), isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
-			
-		}catch(Exception e){
-			utils.log("DEBUG", "Caught Exception during processJavaException Method: " + e, isDebugEnabled)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method")  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method")
-		}
-		utils.log("DEBUG", "Completed processJavaException Method", isDebugEnabled)
-	}
-
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy
index d428cc3..5c31377 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModule.groovy
@@ -1,24 +1,24 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts
 
 import groovy.util.Node
 import groovy.util.XmlParser;
@@ -29,11 +29,11 @@ import java.io.Serializable;
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.bpmn.core.json.JsonUtils;

-import org.openecomp.mso.rest.APIResponse

-import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor

-import org.openecomp.mso.bpmn.core.RollbackData

+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils;
+import org.openecomp.mso.rest.APIResponse
+import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.core.RollbackData
 
 
 public class UpdateVfModule extends AbstractServiceTaskProcessor {
@@ -204,7 +204,7 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 
 			String updateInfraRequest = """
 				<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-						xmlns:req="http://org.openecomp.mso/requestsdb">

+						xmlns:req="http://org.openecomp.mso/requestsdb">
 					<soapenv:Header/>
 					<soapenv:Body>
 						<req:updateInfraRequest>
@@ -255,8 +255,8 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			def requestInfo = getVariable(execution, 'UPDVfMod_requestInfo')
 
 			String content = """
-				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">

+				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">
 					${requestInfo}
 					<sdncadapterworkflow:mso-bpel-name>MSO_ACTIVATE_BPEL</sdncadapterworkflow:mso-bpel-name>
 				</sdncadapterworkflow:MsoCompletionRequest>
@@ -304,10 +304,10 @@ public class UpdateVfModule extends AbstractServiceTaskProcessor {
 			}
 
 			String content = """
-				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"

-						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"

-						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">

+				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
+						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
+						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
 					${requestInformation}
 					<sdncadapterworkflow:WorkflowException>
 						<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy
index 6d53252..9ca2477 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVfModuleVolume.groovy
@@ -1,24 +1,24 @@
-/*-

- * ============LICENSE_START=======================================================

- * OPENECOMP - MSO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.scripts

+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure.scripts
 
 import java.util.concurrent.ExecutionException;
 
@@ -26,12 +26,12 @@ import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.apache.commons.lang3.*
 import org.springframework.web.util.UriUtils
-import org.openecomp.mso.bpmn.common.scripts.AaiUtil

-import org.openecomp.mso.bpmn.common.scripts.VfModuleBase

-import org.openecomp.mso.bpmn.core.WorkflowException

-import org.openecomp.mso.bpmn.core.json.JsonUtils;

-import org.openecomp.mso.rest.APIResponse

-import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil

+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
+import org.openecomp.mso.bpmn.common.scripts.VfModuleBase
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils;
+import org.openecomp.mso.rest.APIResponse
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
 
 class UpdateVfModuleVolume extends VfModuleBase {
 
@@ -130,7 +130,7 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			def volumeInputs = execution.getVariable('UPDVfModVol_volumeInputs')
 
 			String synchResponse = """
-				<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

+				<volume-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
 					<request-info>
 						<request-id>${requestId}</request-id>
 						<action>UPDATE_VF_MODULE_VOL</action>
@@ -238,7 +238,7 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			def requestId = execution.getVariable('UPDVfModVol_requestId')
 			def serviceId = execution.getVariable('UPDVfModVol_serviceId')
 
-			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()

+			def messageId = execution.getVariable('mso-request-id') + '-' + System.currentTimeMillis()
 			def notificationUrl = createCallbackURL(execution, "VNFAResponse", messageId)
 			def useQualifiedHostName = execution.getVariable("URN_mso_use_qualified_host")
 			if ('true'.equals(useQualifiedHostName)) {
@@ -297,7 +297,7 @@ class UpdateVfModuleVolume extends VfModuleBase {
 
 			String updateInfraRequest = """
 				<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-						xmlns:req="http://org.openecomp.mso/requestsdb">

+						xmlns:req="http://org.openecomp.mso/requestsdb">
 					<soapenv:Header/>
 					<soapenv:Body>
 						<req:updateInfraRequest>
@@ -340,8 +340,8 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			def requestInfo = execution.getVariable('UPDVfModVol_requestInfo')
 
 			String content = """
-				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">

+				<sdncadapterworkflow:MsoCompletionRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1">
 					${requestInfo}
 					<sdncadapterworkflow:mso-bpel-name>MSO_ACTIVATE_BPEL</sdncadapterworkflow:mso-bpel-name>
 				</sdncadapterworkflow:MsoCompletionRequest>
@@ -385,10 +385,10 @@ class UpdateVfModuleVolume extends VfModuleBase {
 			}
 
 			String content = """
-				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"

-						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"

-						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">

+				<sdncadapterworkflow:FalloutHandlerRequest xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+						xmlns:reqtype="http://org.openecomp/mso/request/types/v1"
+						xmlns:msoservtypes="http://org.openecomp/mso/request/types/v1"
+						xmlns:structuredtypes="http://org.openecomp/mso/structured/types/v1">
 					${requestInfo}
 					<sdncadapterworkflow:WorkflowException>
 						<sdncadapterworkflow:ErrorMessage>${encErrorResponseMsg}</sdncadapterworkflow:ErrorMessage>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn
index fa114c5..dbd40c0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="CreateServiceInstance" name="CreateServiceInstance" isExecutable="true">
+  <bpmn2:process id="CreateGenericALaCarteServiceInstance" name="CreateGenericALaCarteServiceInstance" isExecutable="true">
     <bpmn2:startEvent id="createSI_startEvent" name="Create SI Start Flow">
       <bpmn2:outgoing>SequenceFlow_0lp2z7l</bpmn2:outgoing>
     </bpmn2:startEvent>
@@ -8,7 +8,7 @@
       <bpmn2:scriptTask id="ScriptTask_1" name="Handle Unexpected Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.utils.*
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
 ex.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -51,7 +51,7 @@ ex.processJavaException(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_0lp2z7l</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ktadna</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi= new CreateServiceInstance()
+def csi= new CreateGenericALaCarteServiceInstance()
 csi.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0lp2z7l" sourceRef="createSI_startEvent" targetRef="ScriptTask_0pvcr6j" />
@@ -59,7 +59,7 @@ csi.preProcessRequest(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_1o4wwba</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0xxvjxq</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new CreateServiceInstance()
+def csi = new CreateGenericALaCarteServiceInstance()
 csi.prepareCompletionRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallActivity_0sevgre" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
@@ -87,7 +87,7 @@ csi.prepareCompletionRequest(execution)]]></bpmn2:script>
         <bpmn2:incoming>SequenceFlow_14eadeb</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1reso2f</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new CreateServiceInstance()
+def csi = new CreateGenericALaCarteServiceInstance()
 csi.prepareFalloutRequest(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:callActivity id="CallActivity_1ksm1dz" name="Call FalloutHandler" calledElement="FalloutHandler">
@@ -109,7 +109,7 @@ csi.prepareFalloutRequest(execution)]]></bpmn2:script>
         <bpmn2:incoming>SequenceFlow_0n4umjf</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_14eadeb</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new  CreateServiceInstance()
+def csi = new  CreateGenericALaCarteServiceInstance()
 csi.sendSyncError(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_14eadeb" sourceRef="ScriptTask_0o4smqp" targetRef="ScriptTask_1hql91g" />
@@ -120,7 +120,7 @@ csi.sendSyncError(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_0ktadna</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0eto8sn</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new  CreateServiceInstance()
+def csi = new  CreateGenericALaCarteServiceInstance()
 csi.sendSyncResponse(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0ktadna" sourceRef="ScriptTask_0pvcr6j" targetRef="Task_1nko5zz" />
@@ -143,7 +143,7 @@ csi.sendSyncResponse(execution)]]></bpmn2:script>
   <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateServiceInstance">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateGenericALaCarteServiceInstance">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">
         <dc:Bounds x="-6" y="79" width="36" height="36" />
         <bpmndi:BPMNLabel>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn
index 7b9b821..a3a3652 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn
@@ -1,1203 +1,1243 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="CreateGenericMacroServiceNetworkVnf" name="CreateGenericMacroServiceNetworkVnf" isExecutable="true">

-    <bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="CreateGenericMacroServiceNetworkVnf" name="CreateGenericMacroServiceNetworkVnf" isExecutable="true">
+    <bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.sendSyncResponse(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="sendSyncAckResponse_ScriptTask" targetRef="IntermediateThrowEvent_2" />

-    <bpmn2:startEvent id="createVIPR_startEvent" name="Start Flow">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createVIPR_startEvent" targetRef="preProcessRequest_ScriptTask" />

-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.sendSyncResponse(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="sendSyncAckResponse_ScriptTask" targetRef="IntermediateThrowEvent_2" />
+    <bpmn2:startEvent id="createVIPR_startEvent" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createVIPR_startEvent" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask" />

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="vIPR-ATM">

+def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="vIPR-ATM">
       <bpmn2:outgoing>SequenceFlow_10o22u2</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_37" name="vIPR-ATM" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process &#38; Completion Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0afe2pg</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>

+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_37" name="vIPR-ATM" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process &#38; Completion Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0afe2pg</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.postProcessResponse(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="callCompleteMsoProcess_CallActivity" />

-    <bpmn2:callActivity id="callCompleteMsoProcess_CallActivity" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">

-      <bpmn2:extensionElements>

-        <camunda:in variables="all" />

-        <camunda:out variables="all" />

-        <camunda:in source="CREVAS_CompleteMsoProcessRequest" target="CompleteMsoProcessRequest" />

-        <camunda:in source="mso-request-id" target="requestId" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:out source="CMSO_ResponseCode" target="CMSO_ResponseCode" />

-        <camunda:out source="CompleteMsoProcessResponse" target="CompleteMsoProcessResponse" />

-        <camunda:out source="CMSO_ErrorResponse" target="CMSO_ErrorResponse" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="callCompleteMsoProcess_CallActivity" targetRef="ScriptTask_2" />

-    <bpmn2:scriptTask id="ScriptTask_2" name="Set Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[// The following variable is checked by the unit test

-execution.setVariable("CreateGenericMacroServiceNetworkVnfSuccessIndicator", true)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_2" targetRef="CreateVIPR_EndEvent" />

-    <bpmn2:endEvent id="CreateVIPR_EndEvent" name="End">

-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_13" />

-    </bpmn2:endEvent>

-    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_1">

-        <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" errorRef="Error_1" />

-      </bpmn2:startEvent>

-      <bpmn2:endEvent id="EndEvent_1">

-        <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />

-      <bpmn2:scriptTask id="ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.postProcessResponse(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="callCompleteMsoProcess_CallActivity" />
+    <bpmn2:callActivity id="callCompleteMsoProcess_CallActivity" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
+      <bpmn2:extensionElements>
+        <camunda:in variables="all" />
+        <camunda:out variables="all" />
+        <camunda:in source="CGMSNV_CompleteMsoProcessRequest" target="CompleteMsoProcessRequest" />
+        <camunda:in source="mso-request-id" target="requestId" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:out source="CMSO_ResponseCode" target="CMSO_ResponseCode" />
+        <camunda:out source="CompleteMsoProcessResponse" target="CompleteMsoProcessResponse" />
+        <camunda:out source="CMSO_ErrorResponse" target="CMSO_ErrorResponse" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="callCompleteMsoProcess_CallActivity" targetRef="ScriptTask_2" />
+    <bpmn2:scriptTask id="ScriptTask_2" name="Set Success Indicator" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[// The following variable is checked by the unit test
+execution.setVariable("CreateGenericMacroServiceNetworkVnfSuccessIndicator", true)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_2" targetRef="CreateVIPR_EndEvent" />
+    <bpmn2:endEvent id="CreateVIPR_EndEvent" name="End">
+      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_13" />
+    </bpmn2:endEvent>
+    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_1">
+        <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" errorRef="Error_1" />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_1">
+        <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />
+      <bpmn2:scriptTask id="ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateServiceInstanceInfra = new CreateServiceInstanceInfra()

-CreateServiceInstanceInfra.processJavaException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />

-    </bpmn2:subProcess>

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_4" name="FinishProcess">

-      <bpmn2:outgoing>SequenceFlow_12ilko1</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_39" name="FinishProcess" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:callActivity id="doCreateNetworkInstance_CallActivity" name="DoCreate&#10;Network&#10;Instance" calledElement="DoCreateNetworkInstance">

-      <bpmn2:extensionElements>

-        <camunda:in source="msoRequestId" target="msoRequestId" />

-        <camunda:in source="networkModelInfo" target="networkModelInfo" />

-        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />

-        <camunda:in source="tenantId" target="tenantId" />

-        <camunda:in source="productFamilyId" target="productFamilyId" />

-        <camunda:in source="disableRollback" target="disableRollback" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

-        <camunda:in source="networkInputParams" target="networkInputParams" />

-        <camunda:in source="failIfExists" target="failIfExists" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="rollbackData" target="DCRENI_rollbackData" />

-        <camunda:out source="rolledBack" target="DCRENI_rolledBack" />

-        <camunda:out source="networkId" target="networkId" />

-        <camunda:out source="networkName" target="networkName" />

-        <camunda:out source="networkOutputParams" target="networkOutputParams" />

-        <camunda:in source="sdncVersion" target="sdncVersion" />

-        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />

-        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />

-        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1bwbn7r</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_12ag2bk</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:scriptTask id="ScriptTask_PrepareNetworkCreate" name="Prepare for Network Create" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0cmebdc</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_0dfkfh1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1bwbn7r</bpmn2:outgoing>

+def CreateServiceInstanceInfra = new CreateServiceInstanceInfra()
+CreateServiceInstanceInfra.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
+    </bpmn2:subProcess>
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_4" name="FinishProcess">
+      <bpmn2:outgoing>SequenceFlow_12ilko1</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_39" name="FinishProcess" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:callActivity id="doCreateNetworkInstance_CallActivity" name="DoCreate&#10;Network&#10;Instance" calledElement="DoCreateNetworkInstance">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="networkModelInfo" target="networkModelInfo" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="productFamilyId" target="productFamilyId" />
+        <camunda:in source="disableRollback" target="disableRollback" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="networkInputParams" target="networkInputParams" />
+        <camunda:in source="failIfExists" target="failIfExists" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="rollbackData" target="DCRENI_rollbackData" />
+        <camunda:out source="rolledBack" target="DCRENI_rolledBack" />
+        <camunda:out source="networkId" target="networkId" />
+        <camunda:out source="networkName" target="networkName" />
+        <camunda:out source="networkOutputParams" target="networkOutputParams" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
+        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
+        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1bwbn7r</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_12ag2bk</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_PrepareNetworkCreate" name="Prepare for Network Create" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0cmebdc</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0dfkfh1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1bwbn7r</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.prepareNetworkCreate(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:callActivity id="doCreateServiceInstance_CallActivity" name="DoCreate&#10;ServiceInstance&#10;" calledElement="DoCreateServiceInstance">

-      <bpmn2:extensionElements>

-        <camunda:in source="msoRequestId" target="msoRequestId" />

-        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />

-        <camunda:in sourceExpression="vIPR-ATM" target="subscriptionServiceType" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:out source="rollbackData" target="DCRESI_rollbackData" />

-        <camunda:in source="serviceInstanceName" target="serviceInstanceName" />

-        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />

-        <camunda:in source="failIfExists" target="failIfExists" />

-        <camunda:in source="disableRollback" target="disableRollback" />

-        <camunda:in source="serviceInputParams" target="serviceInputParams" />

-        <camunda:out source="rolledBack" target="DCRESI_rolledBack" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="serviceInstanceName" target="serviceInstanceName" />

-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

-        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />

-        <camunda:in source="productFamilyId" target="productFamilyId" />

-        <camunda:in source="sdncVersion" target="sdncVersion" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_0j6sjye</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1ky2sv9</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:callActivity id="doCreateVNFandModules_CallActivity" name="DoCreate&#10;VNF and Modules&#10;" calledElement="DoCreateVnfAndModules">

-      <bpmn2:extensionElements>

-        <camunda:in source="msoRequestId" target="msoRequestId" />

-        <camunda:in source="disableRollback" target="disableRollback" />

-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:in source="productFamilyId" target="productFamilyId" />

-        <camunda:in source="vnfModelInfo" target="vnfModelInfo" />

-        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />

-        <camunda:in source="tenantId" target="tenantId" />

-        <camunda:in source="sdncVersion" target="sdncVersion" />

-        <camunda:out source="rollbackData" target="DCVM_rollbackData" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="vnfId" target="vnfId" />

-        <camunda:out source="vnfName" target="vnfName" />

-        <camunda:out source="vnfOutputParams" target="vnfOutputParams" />

-        <camunda:out source="rolledBack" target="rolledBack" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1h77psn</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0qi5uxg</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:scriptTask id="ScriptTask_3" name="Prepare to Create VNF" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0bvecvm</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1h77psn</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.prepareNetworkCreate(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="doCreateServiceInstance_CallActivity" name="DoCreate&#10;ServiceInstance&#10;" calledElement="DoCreateServiceInstance">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
+        <camunda:in sourceExpression="vIPR-ATM" target="subscriptionServiceType" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:out source="rollbackData" target="DCRESI_rollbackData" />
+        <camunda:in source="serviceInstanceName" target="serviceInstanceName" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="failIfExists" target="failIfExists" />
+        <camunda:in source="disableRollback" target="disableRollback" />
+        <camunda:in source="serviceInputParams" target="serviceInputParams" />
+        <camunda:out source="rolledBack" target="DCRESI_rolledBack" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="serviceInstanceName" target="serviceInstanceName" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
+        <camunda:in source="productFamilyId" target="productFamilyId" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0j6sjye</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1ky2sv9</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:callActivity id="doCreateVNFandModules_CallActivity" name="DoCreate&#10;VNF and Modules&#10;" calledElement="DoCreateVnfAndModules">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="disableRollback" target="disableRollback" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="productFamilyId" target="productFamilyId" />
+        <camunda:in source="vnfModelInfo" target="vnfModelInfo" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
+        <camunda:out source="rollbackData" target="DCVM_rollbackData" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="vnfId" target="vnfId" />
+        <camunda:out source="vnfName" target="vnfName" />
+        <camunda:out source="vnfOutputParams" target="vnfOutputParams" />
+        <camunda:out source="rolledBack" target="rolledBack" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
+        <camunda:in source="serviceDecomposition" target="serviceDecomposition" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1h77psn</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0qi5uxg</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_3" name="Prepare to Create VNF" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0bvecvm</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1h77psn</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.prepareVnfAndModulesCreate(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_4" name="GoToFinishProcess">

-      <bpmn2:incoming>SequenceFlow_0xowenu</bpmn2:incoming>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_41" name="FinishProcess" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="GoTovIPR-ATM">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_38" name="vIPR-ATM" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:subProcess id="SubProcess_0s6hpty" name="Subprocess For Exception / FalloutHandler " triggeredByEvent="true">

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_1vwgs6p" name="Is Rollback On?" default="SequenceFlow_0dhf2js">

-        <bpmn2:incoming>SequenceFlow_0zq7i3q</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0zpbskl</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_0dhf2js</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:startEvent id="StartEvent_1bwmffk" name="Fault Start">

-        <bpmn2:outgoing>SequenceFlow_0zq7i3q</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition />

-      </bpmn2:startEvent>

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_0ydrtdx" name="isPONR?" default="SequenceFlow_02o4yqx">

-        <bpmn2:incoming>SequenceFlow_0zpbskl</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1sx5llu</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_02o4yqx</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_00rt5qa" name="is VNF Ok?" default="SequenceFlow_05lo85t">

-        <bpmn2:incoming>SequenceFlow_0sdb3on</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_05lo85t</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_0xtr1g5</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_1kvn1pz" name="Network Rollback present?" default="SequenceFlow_19mxskt">

-        <bpmn2:incoming>SequenceFlow_05lo85t</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_09xerwk</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_19mxskt</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_0tmepzk</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:callActivity id="CallActivity_0jw5tqa" name="Call FalloutHandlerV1" calledElement="FalloutHandler">

-        <bpmn2:extensionElements>

-          <camunda:in source="CREVAS_falloutRequest" target="FalloutHandlerRequest" />

-          <camunda:in source="msoRequestId" target="mso-request-id" />

-          <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

-          <camunda:out source="FH_ResponseCode" target="FH_ResponseCode" />

-          <camunda:out source="FalloutHandlerResponse" target="FalloutHandlerResponse" />

-          <camunda:out source="FH_ErrorResponse" target="FH_ErrorResponse" />

-        </bpmn2:extensionElements>

-        <bpmn2:incoming>SequenceFlow_0807ukc</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_19yywk8</bpmn2:outgoing>

-      </bpmn2:callActivity>

-      <bpmn2:endEvent id="EndEvent_04xute7">

-        <bpmn2:incoming>SequenceFlow_19yywk8</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:inclusiveGateway id="InclusiveGateway_1pqjttt">

-        <bpmn2:incoming>SequenceFlow_19mxskt</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_1brxd2r</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_08s0ew2</bpmn2:outgoing>

-      </bpmn2:inclusiveGateway>

-      <bpmn2:scriptTask id="ScriptTask_0yk02h3" name="Prepare FalloutHandler" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_0jg47xm</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0807ukc</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.prepareVnfAndModulesCreate(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_4" name="GoToFinishProcess">
+      <bpmn2:incoming>SequenceFlow_0xowenu</bpmn2:incoming>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_41" name="FinishProcess" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="GoTovIPR-ATM">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_38" name="vIPR-ATM" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:subProcess id="SubProcess_0s6hpty" name="Subprocess For Exception / FalloutHandler " triggeredByEvent="true">
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_1vwgs6p" name="Is Rollback On?" default="SequenceFlow_0dhf2js">
+        <bpmn2:incoming>SequenceFlow_0zq7i3q</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0zpbskl</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_0dhf2js</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:startEvent id="StartEvent_1bwmffk" name="Fault Start">
+        <bpmn2:outgoing>SequenceFlow_0zq7i3q</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition />
+      </bpmn2:startEvent>
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_0ydrtdx" name="isPONR?" default="SequenceFlow_02o4yqx">
+        <bpmn2:incoming>SequenceFlow_0zpbskl</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1sx5llu</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_02o4yqx</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_00rt5qa" name="is VNF Ok?" default="SequenceFlow_05lo85t">
+        <bpmn2:incoming>SequenceFlow_0sdb3on</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_05lo85t</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_0xtr1g5</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_1kvn1pz" name="Network Rollback present?" default="SequenceFlow_19mxskt">
+        <bpmn2:incoming>SequenceFlow_05lo85t</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_09xerwk</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_19mxskt</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_0tmepzk</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:callActivity id="CallActivity_0jw5tqa" name="Call FalloutHandlerV1" calledElement="FalloutHandler">
+        <bpmn2:extensionElements>
+          <camunda:in source="CGMSNV_falloutRequest" target="FalloutHandlerRequest" />
+          <camunda:in source="msoRequestId" target="mso-request-id" />
+          <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+          <camunda:out source="FH_ResponseCode" target="FH_ResponseCode" />
+          <camunda:out source="FalloutHandlerResponse" target="FalloutHandlerResponse" />
+          <camunda:out source="FH_ErrorResponse" target="FH_ErrorResponse" />
+        </bpmn2:extensionElements>
+        <bpmn2:incoming>SequenceFlow_0807ukc</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_19yywk8</bpmn2:outgoing>
+      </bpmn2:callActivity>
+      <bpmn2:endEvent id="EndEvent_04xute7">
+        <bpmn2:incoming>SequenceFlow_19yywk8</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:inclusiveGateway id="InclusiveGateway_1pqjttt">
+        <bpmn2:incoming>SequenceFlow_19mxskt</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_1brxd2r</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_08s0ew2</bpmn2:outgoing>
+      </bpmn2:inclusiveGateway>
+      <bpmn2:scriptTask id="ScriptTask_0yk02h3" name="Prepare FalloutHandler" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0jg47xm</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0807ukc</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.prepareFalloutRequest(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_0zpbskl" name="Yes" sourceRef="ExclusiveGateway_1vwgs6p" targetRef="ExclusiveGateway_0ydrtdx">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("disableRollback") != true}]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_0dhf2js" name="No" sourceRef="ExclusiveGateway_1vwgs6p" targetRef="InclusiveGateway_0foywso" />

-      <bpmn2:sequenceFlow id="SequenceFlow_1sx5llu" name="Yes" sourceRef="ExclusiveGateway_0ydrtdx" targetRef="InclusiveGateway_0foywso">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("PONR") == true}]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_02o4yqx" name="No" sourceRef="ExclusiveGateway_0ydrtdx" targetRef="ScriptTask_17doerz" />

-      <bpmn2:sequenceFlow id="SequenceFlow_05lo85t" name="No" sourceRef="ExclusiveGateway_00rt5qa" targetRef="ExclusiveGateway_1kvn1pz" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0xtr1g5" name="Yes" sourceRef="ExclusiveGateway_00rt5qa" targetRef="DoRollbackVNFandModules_CallActivity">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVM_rollbackData") != null }]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_19mxskt" name="No" sourceRef="ExclusiveGateway_1kvn1pz" targetRef="InclusiveGateway_1pqjttt" />

-      <bpmn2:callActivity id="DoRollbackVNFandModules_CallActivity" name="DoRollback&#10;VNF and Modules&#10;" calledElement="DoCreateVnfAndModules">

-        <bpmn2:extensionElements>

-          <camunda:in source="msoRequestId" target="msoRequestId" />

-          <camunda:in source="DCVAM_rollbackData" target="rollbackData" />

-          <camunda:out source="rollbackSuccessful" target="DCVAM_rollbackSuccessful" />

-          <camunda:out source="rollbackError" target="DCVAM_rollbackError" />

-          <camunda:in source="sdncVersion" target="sdncVersion" />

-        </bpmn2:extensionElements>

-        <bpmn2:incoming>SequenceFlow_0xtr1g5</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_09xerwk</bpmn2:outgoing>

-      </bpmn2:callActivity>

-      <bpmn2:sequenceFlow id="SequenceFlow_09xerwk" sourceRef="DoRollbackVNFandModules_CallActivity" targetRef="ExclusiveGateway_1kvn1pz" />

-      <bpmn2:callActivity id="DoRollbackNetwork_CallActivity" name="DoRollback&#10;Network" calledElement="DoCreateNetworkInstanceRollback">

-        <bpmn2:extensionElements>

-          <camunda:in source="msoRequestId" target="msoRequestId" />

-          <camunda:in source="DCRENI_rollbackData" target="rollbackData" />

-          <camunda:out source="rollbackSuccessful" target="DCRENI_rollbackSuccessful" />

-          <camunda:out source="rollbackError" target="DCRENI_rollbackError" />

-          <camunda:in source="sdncVersion" target="sdncVersion" />

-        </bpmn2:extensionElements>

-        <bpmn2:incoming>SequenceFlow_0136s37</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_1fqmrda</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1dmsx0d</bpmn2:outgoing>

-      </bpmn2:callActivity>

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_09o09bu" name="Network rolled back OK?" default="SequenceFlow_0g7scsg">

-        <bpmn2:incoming>SequenceFlow_1ieiew4</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1os9x7w</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_0g7scsg</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:callActivity id="DoRollbackService_CallActivity" name="DoRollback&#10;Service&#10;" calledElement="DoCreateServiceInstanceRollback">

-        <bpmn2:extensionElements>

-          <camunda:in source="DCRESI_rollbackData" target="rollbackData" />

-          <camunda:in source="msoRequestId" target="msoRequestId" />

-          <camunda:out source="rollbackSuccessful" target="DCRESI_rollbackSuccessful" />

-          <camunda:out source="rollbackError" target="DCRESI_rollbackError" />

-          <camunda:in source="sdncVersion" target="sdncVersion" />

-        </bpmn2:extensionElements>

-        <bpmn2:incoming>SequenceFlow_1os9x7w</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1f1hd3l</bpmn2:outgoing>

-      </bpmn2:callActivity>

-      <bpmn2:inclusiveGateway id="InclusiveGateway_0foywso">

-        <bpmn2:incoming>SequenceFlow_1sx5llu</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_0dhf2js</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_1rabks0</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0jg47xm</bpmn2:outgoing>

-      </bpmn2:inclusiveGateway>

-      <bpmn2:sequenceFlow id="SequenceFlow_1os9x7w" name="Yes" sourceRef="ExclusiveGateway_09o09bu" targetRef="DoRollbackService_CallActivity">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCRENI_rollbackSuccessful") == null  || execution.getVariable("DCRENI_rollbackSuccessful") == true  }]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_1f1hd3l" sourceRef="DoRollbackService_CallActivity" targetRef="InclusiveGateway_0m9f5ka" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0g7scsg" name="No" sourceRef="ExclusiveGateway_09o09bu" targetRef="InclusiveGateway_0m9f5ka" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0jg47xm" sourceRef="InclusiveGateway_0foywso" targetRef="ScriptTask_0yk02h3" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0807ukc" sourceRef="ScriptTask_0yk02h3" targetRef="CallActivity_0jw5tqa" />

-      <bpmn2:sequenceFlow id="SequenceFlow_19yywk8" sourceRef="CallActivity_0jw5tqa" targetRef="EndEvent_04xute7" />

-      <bpmn2:scriptTask id="ScriptTask_184teky" name="Validate Network Rollback" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_1dmsx0d</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1otyild</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.prepareFalloutRequest(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_0zpbskl" name="Yes" sourceRef="ExclusiveGateway_1vwgs6p" targetRef="ExclusiveGateway_0ydrtdx">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("disableRollback") != true}]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_0dhf2js" name="No" sourceRef="ExclusiveGateway_1vwgs6p" targetRef="InclusiveGateway_0foywso" />
+      <bpmn2:sequenceFlow id="SequenceFlow_1sx5llu" name="Yes" sourceRef="ExclusiveGateway_0ydrtdx" targetRef="InclusiveGateway_0foywso">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("PONR") == true}]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_02o4yqx" name="No" sourceRef="ExclusiveGateway_0ydrtdx" targetRef="ScriptTask_17doerz" />
+      <bpmn2:sequenceFlow id="SequenceFlow_05lo85t" name="No" sourceRef="ExclusiveGateway_00rt5qa" targetRef="ExclusiveGateway_1kvn1pz" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0xtr1g5" name="Yes" sourceRef="ExclusiveGateway_00rt5qa" targetRef="DoRollbackVNFandModules_CallActivity">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVM_rollbackData") != null }]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_19mxskt" name="No" sourceRef="ExclusiveGateway_1kvn1pz" targetRef="InclusiveGateway_1pqjttt" />
+      <bpmn2:callActivity id="DoRollbackVNFandModules_CallActivity" name="DoRollback&#10;VNF and Modules&#10;" calledElement="DoCreateVnfAndModulesRollback">
+        <bpmn2:extensionElements>
+          <camunda:in source="msoRequestId" target="msoRequestId" />
+          <camunda:in source="DCVAM_rollbackData" target="rollbackData" />
+          <camunda:out source="rollbackSuccessful" target="DCVAM_rollbackSuccessful" />
+          <camunda:out source="rollbackError" target="DCVAM_rollbackError" />
+          <camunda:in source="sdncVersion" target="sdncVersion" />
+        </bpmn2:extensionElements>
+        <bpmn2:incoming>SequenceFlow_0xtr1g5</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_09xerwk</bpmn2:outgoing>
+      </bpmn2:callActivity>
+      <bpmn2:sequenceFlow id="SequenceFlow_09xerwk" sourceRef="DoRollbackVNFandModules_CallActivity" targetRef="ExclusiveGateway_1kvn1pz" />
+      <bpmn2:callActivity id="DoRollbackNetwork_CallActivity" name="DoRollback&#10;Network" calledElement="DoCreateNetworkInstanceRollback">
+        <bpmn2:extensionElements>
+          <camunda:in source="msoRequestId" target="msoRequestId" />
+          <camunda:in source="DCRENI_rollbackData" target="rollbackData" />
+          <camunda:out source="rollbackSuccessful" target="DCRENI_rollbackSuccessful" />
+          <camunda:out source="rollbackError" target="DCRENI_rollbackError" />
+          <camunda:in source="sdncVersion" target="sdncVersion" />
+        </bpmn2:extensionElements>
+        <bpmn2:incoming>SequenceFlow_0136s37</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_1fqmrda</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1dmsx0d</bpmn2:outgoing>
+      </bpmn2:callActivity>
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_09o09bu" name="Network rolled back OK?" default="SequenceFlow_0g7scsg">
+        <bpmn2:incoming>SequenceFlow_1ieiew4</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1os9x7w</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_0g7scsg</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:callActivity id="DoRollbackService_CallActivity" name="DoRollback&#10;Service&#10;" calledElement="DoCreateServiceInstanceRollback">
+        <bpmn2:extensionElements>
+          <camunda:in source="DCRESI_rollbackData" target="rollbackData" />
+          <camunda:in source="msoRequestId" target="msoRequestId" />
+          <camunda:out source="rollbackSuccessful" target="DCRESI_rollbackSuccessful" />
+          <camunda:out source="rollbackError" target="DCRESI_rollbackError" />
+          <camunda:in source="sdncVersion" target="sdncVersion" />
+        </bpmn2:extensionElements>
+        <bpmn2:incoming>SequenceFlow_1os9x7w</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1f1hd3l</bpmn2:outgoing>
+      </bpmn2:callActivity>
+      <bpmn2:inclusiveGateway id="InclusiveGateway_0foywso">
+        <bpmn2:incoming>SequenceFlow_1sx5llu</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_0dhf2js</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_1rabks0</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0jg47xm</bpmn2:outgoing>
+      </bpmn2:inclusiveGateway>
+      <bpmn2:sequenceFlow id="SequenceFlow_1os9x7w" name="Yes" sourceRef="ExclusiveGateway_09o09bu" targetRef="DoRollbackService_CallActivity">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCRENI_rollbackSuccessful") == null  || execution.getVariable("DCRENI_rollbackSuccessful") == true  }]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_1f1hd3l" sourceRef="DoRollbackService_CallActivity" targetRef="InclusiveGateway_0m9f5ka" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0g7scsg" name="No" sourceRef="ExclusiveGateway_09o09bu" targetRef="InclusiveGateway_0m9f5ka" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0jg47xm" sourceRef="InclusiveGateway_0foywso" targetRef="ScriptTask_0yk02h3" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0807ukc" sourceRef="ScriptTask_0yk02h3" targetRef="CallActivity_0jw5tqa" />
+      <bpmn2:sequenceFlow id="SequenceFlow_19yywk8" sourceRef="CallActivity_0jw5tqa" targetRef="EndEvent_04xute7" />
+      <bpmn2:scriptTask id="ScriptTask_184teky" name="Validate Network Rollback" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_1dmsx0d</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1otyild</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.validateNetworkRollback(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_1c386z9" name="Rollback Additional Networks?" default="SequenceFlow_12u8ufr">

-        <bpmn2:incoming>SequenceFlow_1otyild</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0136s37</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_12u8ufr</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:sequenceFlow id="SequenceFlow_1dmsx0d" sourceRef="DoRollbackNetwork_CallActivity" targetRef="ScriptTask_184teky" />

-      <bpmn2:sequenceFlow id="SequenceFlow_1otyild" sourceRef="ScriptTask_184teky" targetRef="ExclusiveGateway_1c386z9" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0136s37" name="Yes" sourceRef="ExclusiveGateway_1c386z9" targetRef="DoRollbackNetwork_CallActivity">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CREVAS_NetworksCreatedCount")  > 0 }]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_12u8ufr" name="No" sourceRef="ExclusiveGateway_1c386z9" targetRef="ExclusiveGateway_05indeh" />

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_1bts0nw" name="VNF rolled back OK?" default="SequenceFlow_1brxd2r">

-        <bpmn2:incoming>SequenceFlow_0tmepzk</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1fqmrda</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_1brxd2r</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:sequenceFlow id="SequenceFlow_0tmepzk" name="Yes" sourceRef="ExclusiveGateway_1kvn1pz" targetRef="ExclusiveGateway_1bts0nw">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCRENI_rollbackData") != null }]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_1fqmrda" name="Yes" sourceRef="ExclusiveGateway_1bts0nw" targetRef="DoRollbackNetwork_CallActivity">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCVAM_rollbackSuccessful") == null || execution.getVariable("DCVAM_rollbackSuccessful") == true }]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_1brxd2r" name="No" sourceRef="ExclusiveGateway_1bts0nw" targetRef="InclusiveGateway_1pqjttt" />

-      <bpmn2:exclusiveGateway id="ExclusiveGateway_05indeh" name="Service Rollback present?" default="SequenceFlow_0sezboq">

-        <bpmn2:incoming>SequenceFlow_12u8ufr</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_08s0ew2</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1ieiew4</bpmn2:outgoing>

-        <bpmn2:outgoing>SequenceFlow_0sezboq</bpmn2:outgoing>

-      </bpmn2:exclusiveGateway>

-      <bpmn2:sequenceFlow id="SequenceFlow_08s0ew2" sourceRef="InclusiveGateway_1pqjttt" targetRef="ExclusiveGateway_05indeh" />

-      <bpmn2:sequenceFlow id="SequenceFlow_1ieiew4" name="Yes" sourceRef="ExclusiveGateway_05indeh" targetRef="ExclusiveGateway_09o09bu">

-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCRESI_rollbackData") != null  }]]></bpmn2:conditionExpression>

-      </bpmn2:sequenceFlow>

-      <bpmn2:sequenceFlow id="SequenceFlow_0sezboq" name="No" sourceRef="ExclusiveGateway_05indeh" targetRef="InclusiveGateway_0m9f5ka" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0zq7i3q" name="" sourceRef="StartEvent_1bwmffk" targetRef="ExclusiveGateway_1vwgs6p" />

-      <bpmn2:inclusiveGateway id="InclusiveGateway_0m9f5ka">

-        <bpmn2:incoming>SequenceFlow_1f1hd3l</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_0g7scsg</bpmn2:incoming>

-        <bpmn2:incoming>SequenceFlow_0sezboq</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0f4u373</bpmn2:outgoing>

-      </bpmn2:inclusiveGateway>

-      <bpmn2:scriptTask id="ScriptTask_17doerz" name="Pre Process Rollback" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_02o4yqx</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0sdb3on</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.validateNetworkRollback(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_1c386z9" name="Rollback Additional Networks?" default="SequenceFlow_12u8ufr">
+        <bpmn2:incoming>SequenceFlow_1otyild</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0136s37</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_12u8ufr</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:sequenceFlow id="SequenceFlow_1dmsx0d" sourceRef="DoRollbackNetwork_CallActivity" targetRef="ScriptTask_184teky" />
+      <bpmn2:sequenceFlow id="SequenceFlow_1otyild" sourceRef="ScriptTask_184teky" targetRef="ExclusiveGateway_1c386z9" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0136s37" name="Yes" sourceRef="ExclusiveGateway_1c386z9" targetRef="DoRollbackNetwork_CallActivity">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CGMSNV_NetworksCreatedCount")  > 0 }]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_12u8ufr" name="No" sourceRef="ExclusiveGateway_1c386z9" targetRef="ExclusiveGateway_05indeh" />
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_1bts0nw" name="VNF rolled back OK?" default="SequenceFlow_1brxd2r">
+        <bpmn2:incoming>SequenceFlow_0tmepzk</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1fqmrda</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_1brxd2r</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:sequenceFlow id="SequenceFlow_0tmepzk" name="Yes" sourceRef="ExclusiveGateway_1kvn1pz" targetRef="ExclusiveGateway_1bts0nw">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCRENI_rollbackData") != null }]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_1fqmrda" name="Yes" sourceRef="ExclusiveGateway_1bts0nw" targetRef="DoRollbackNetwork_CallActivity">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCVAM_rollbackSuccessful") == null || execution.getVariable("DCVAM_rollbackSuccessful") == true }]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_1brxd2r" name="No" sourceRef="ExclusiveGateway_1bts0nw" targetRef="InclusiveGateway_1pqjttt" />
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_05indeh" name="Service Rollback present?" default="SequenceFlow_0sezboq">
+        <bpmn2:incoming>SequenceFlow_12u8ufr</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_08s0ew2</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1ieiew4</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_0sezboq</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:sequenceFlow id="SequenceFlow_08s0ew2" sourceRef="InclusiveGateway_1pqjttt" targetRef="ExclusiveGateway_05indeh" />
+      <bpmn2:sequenceFlow id="SequenceFlow_1ieiew4" name="Yes" sourceRef="ExclusiveGateway_05indeh" targetRef="ExclusiveGateway_09o09bu">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCRESI_rollbackData") != null  }]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="SequenceFlow_0sezboq" name="No" sourceRef="ExclusiveGateway_05indeh" targetRef="InclusiveGateway_0m9f5ka" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0zq7i3q" name="" sourceRef="StartEvent_1bwmffk" targetRef="ExclusiveGateway_1vwgs6p" />
+      <bpmn2:inclusiveGateway id="InclusiveGateway_0m9f5ka">
+        <bpmn2:incoming>SequenceFlow_1f1hd3l</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_0g7scsg</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_0sezboq</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0f4u373</bpmn2:outgoing>
+      </bpmn2:inclusiveGateway>
+      <bpmn2:scriptTask id="ScriptTask_17doerz" name="Pre Process Rollback" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_02o4yqx</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0sdb3on</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.preProcessRollback(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:scriptTask id="ScriptTask_0wyub4x" name="Post Process Rollback" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_0f4u373</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1rabks0</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.preProcessRollback(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:scriptTask id="ScriptTask_0wyub4x" name="Post Process Rollback" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0f4u373</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1rabks0</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.postProcessRollback(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_0sdb3on" sourceRef="ScriptTask_17doerz" targetRef="ExclusiveGateway_00rt5qa" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0f4u373" sourceRef="InclusiveGateway_0m9f5ka" targetRef="ScriptTask_0wyub4x" />

-      <bpmn2:sequenceFlow id="SequenceFlow_1rabks0" sourceRef="ScriptTask_0wyub4x" targetRef="InclusiveGateway_0foywso" />

-    </bpmn2:subProcess>

-    <bpmn2:scriptTask id="callDbCatalog_scriptTask" name="Get Models Info&#10; for Service (DB Catalog)&#10;" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1vwssu7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_19etqmx</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.postProcessRollback(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_0sdb3on" sourceRef="ScriptTask_17doerz" targetRef="ExclusiveGateway_00rt5qa" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0f4u373" sourceRef="InclusiveGateway_0m9f5ka" targetRef="ScriptTask_0wyub4x" />
+      <bpmn2:sequenceFlow id="SequenceFlow_1rabks0" sourceRef="ScriptTask_0wyub4x" targetRef="InclusiveGateway_0foywso" />
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="callDbCatalog_scriptTask" name="Get Models Info&#10;for Service&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1vwssu7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_19etqmx</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.callDBCatalog(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:scriptTask id="prepareCreateService_scriptTask" name="Prepare&#10;Create&#10;Service&#10;" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_10o22u2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0j6sjye</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.getDataFromDecomposition(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="prepareCreateService_scriptTask" name="Prepare&#10;Create&#10;Service&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0hvcwa1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0j6sjye</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.prepareCreateServiceInstance(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_10o22u2" sourceRef="IntermediateCatchEvent_3" targetRef="prepareCreateService_scriptTask" />

-    <bpmn2:scriptTask id="setPONR_ScriptTask" name="set PONR">

-      <bpmn2:incoming>SequenceFlow_12ilko1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0afe2pg</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[#{execution.setVariable("PONR", true)}]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_12ilko1" sourceRef="IntermediateCatchEvent_4" targetRef="setPONR_ScriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0afe2pg" sourceRef="setPONR_ScriptTask" targetRef="postProcessAndCompletionRequest_ScriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1bwbn7r" sourceRef="ScriptTask_PrepareNetworkCreate" targetRef="doCreateNetworkInstance_CallActivity" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1n7r495" name="No" sourceRef="ExclusiveGateway_0fe690i" targetRef="ExclusiveGateway_1os8cm5" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1h77psn" sourceRef="ScriptTask_3" targetRef="doCreateVNFandModules_CallActivity" />

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1nh09nr" name="StartNetworks">

-      <bpmn2:outgoing>SequenceFlow_1vwssu7</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition name="StartNetworks" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0prlju0" name="GoTo StartNetworks">

-      <bpmn2:incoming>SequenceFlow_13uceka</bpmn2:incoming>

-      <bpmn2:linkEventDefinition name="StartNetworks" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0b9wd4f" name="Create Network(s)?" default="SequenceFlow_1f26zbk">

-      <bpmn2:incoming>SequenceFlow_19etqmx</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0cmebdc</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1f26zbk</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0fe690i" name="Create Additional Networks?" default="SequenceFlow_1n7r495">

-      <bpmn2:incoming>SequenceFlow_04vlq8r</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1n7r495</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_0dfkfh1</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_0dfkfh1" name="Yes" sourceRef="ExclusiveGateway_0fe690i" targetRef="ScriptTask_PrepareNetworkCreate">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CREVAS_NetworksCreatedCount") < execution.getVariable("CREVAS_NetworksCount")}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_0cmebdc" name="Yes" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ScriptTask_PrepareNetworkCreate">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CREVAS_NetworksCount") > 0}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1os8cm5">

-      <bpmn2:incoming>SequenceFlow_1n7r495</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_1f26zbk</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1j7n6qx</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_1f26zbk" name="No" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ExclusiveGateway_1os8cm5" />

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0nreq15" name="GoTo StartVnfs">

-      <bpmn2:incoming>SequenceFlow_1j7n6qx</bpmn2:incoming>

-      <bpmn2:linkEventDefinition name="StartVnfs" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1vwssu7" sourceRef="IntermediateCatchEvent_1nh09nr" targetRef="callDbCatalog_scriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_19etqmx" sourceRef="callDbCatalog_scriptTask" targetRef="ExclusiveGateway_0b9wd4f" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1j7n6qx" sourceRef="ExclusiveGateway_1os8cm5" targetRef="IntermediateThrowEvent_0nreq15" />

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0rlqdvq" name="StartVnfs">

-      <bpmn2:outgoing>SequenceFlow_10tbv62</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition name="StartVnfs" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nlocis" name="Create VNF?" default="SequenceFlow_0w7328u">

-      <bpmn2:incoming>SequenceFlow_10tbv62</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0bvecvm</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_0w7328u</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_04q1qud">

-      <bpmn2:incoming>SequenceFlow_0qi5uxg</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_0w7328u</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0xowenu</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_10tbv62" sourceRef="IntermediateCatchEvent_0rlqdvq" targetRef="ExclusiveGateway_1nlocis" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0bvecvm" name="Yes" sourceRef="ExclusiveGateway_1nlocis" targetRef="ScriptTask_3">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CREVAS_VNFsCount") >0}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_0qi5uxg" name="in 1702 scope only one VNF will be created - if needed" sourceRef="doCreateVNFandModules_CallActivity" targetRef="ExclusiveGateway_04q1qud">

-      <bpmn2:documentation>in 1702 scope only one VNF will be created</bpmn2:documentation>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_0w7328u" name="No" sourceRef="ExclusiveGateway_1nlocis" targetRef="ExclusiveGateway_04q1qud" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0xowenu" sourceRef="ExclusiveGateway_04q1qud" targetRef="IntermediateThrowEvent_4" />

-    <bpmn2:scriptTask id="ScriptTask_04o8gb3" name="Validate Network Create" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_12ag2bk</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_04vlq8r</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.prepareCreateServiceInstance(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="setPONR_ScriptTask" name="set PONR">
+      <bpmn2:incoming>SequenceFlow_12ilko1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0afe2pg</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[#{execution.setVariable("PONR", true)}]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_12ilko1" sourceRef="IntermediateCatchEvent_4" targetRef="setPONR_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0afe2pg" sourceRef="setPONR_ScriptTask" targetRef="postProcessAndCompletionRequest_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1bwbn7r" sourceRef="ScriptTask_PrepareNetworkCreate" targetRef="doCreateNetworkInstance_CallActivity" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1n7r495" name="No" sourceRef="ExclusiveGateway_0fe690i" targetRef="ExclusiveGateway_1os8cm5" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1h77psn" sourceRef="ScriptTask_3" targetRef="doCreateVNFandModules_CallActivity" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1nh09nr" name="StartNetworks">
+      <bpmn2:outgoing>SequenceFlow_1vwssu7</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition name="StartNetworks" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0prlju0" name="GoTo StartNetworks">
+      <bpmn2:incoming>SequenceFlow_13uceka</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="StartNetworks" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0b9wd4f" name="Create Network(s)?" default="SequenceFlow_1f26zbk">
+      <bpmn2:incoming>SequenceFlow_19etqmx</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0cmebdc</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1f26zbk</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0fe690i" name="Create Additional Networks?" default="SequenceFlow_1n7r495">
+      <bpmn2:incoming>SequenceFlow_04vlq8r</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1n7r495</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0dfkfh1</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_0dfkfh1" name="Yes" sourceRef="ExclusiveGateway_0fe690i" targetRef="ScriptTask_PrepareNetworkCreate">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CGMSNV_NetworksCreatedCount") < execution.getVariable("CGMSNV_NetworksCount")}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0cmebdc" name="Yes" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ScriptTask_PrepareNetworkCreate">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CGMSNV_NetworksCount") > 0}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1os8cm5">
+      <bpmn2:incoming>SequenceFlow_1n7r495</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1f26zbk</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1j7n6qx</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1f26zbk" name="No" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ExclusiveGateway_1os8cm5" />
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0nreq15" name="GoTo StartVnfs">
+      <bpmn2:incoming>SequenceFlow_1j7n6qx</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="StartVnfs" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1vwssu7" sourceRef="IntermediateCatchEvent_1nh09nr" targetRef="callDbCatalog_scriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_19etqmx" sourceRef="callDbCatalog_scriptTask" targetRef="ExclusiveGateway_0b9wd4f" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1j7n6qx" sourceRef="ExclusiveGateway_1os8cm5" targetRef="IntermediateThrowEvent_0nreq15" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0rlqdvq" name="StartVnfs">
+      <bpmn2:outgoing>SequenceFlow_10tbv62</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition name="StartVnfs" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nlocis" name="Create VNF?" default="SequenceFlow_0w7328u">
+      <bpmn2:incoming>SequenceFlow_10tbv62</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0bvecvm</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0w7328u</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_04q1qud">
+      <bpmn2:incoming>SequenceFlow_0qi5uxg</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0w7328u</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0xowenu</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_10tbv62" sourceRef="IntermediateCatchEvent_0rlqdvq" targetRef="ExclusiveGateway_1nlocis" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0bvecvm" name="Yes" sourceRef="ExclusiveGateway_1nlocis" targetRef="ScriptTask_3">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CGMSNV_VNFsCount") >0}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0qi5uxg" name="in 1702 scope only one VNF will be created - if needed" sourceRef="doCreateVNFandModules_CallActivity" targetRef="ExclusiveGateway_04q1qud">
+      <bpmn2:documentation>in 1702 scope only one VNF will be created</bpmn2:documentation>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0w7328u" name="No" sourceRef="ExclusiveGateway_1nlocis" targetRef="ExclusiveGateway_04q1qud" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0xowenu" sourceRef="ExclusiveGateway_04q1qud" targetRef="IntermediateThrowEvent_4" />
+    <bpmn2:scriptTask id="ScriptTask_04o8gb3" name="Validate Network Create" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_12ag2bk</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_04vlq8r</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.validateNetworkCreate(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_12ag2bk" sourceRef="doCreateNetworkInstance_CallActivity" targetRef="ScriptTask_04o8gb3" />

-    <bpmn2:sequenceFlow id="SequenceFlow_04vlq8r" sourceRef="ScriptTask_04o8gb3" targetRef="ExclusiveGateway_0fe690i" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0j6sjye" sourceRef="prepareCreateService_scriptTask" targetRef="doCreateServiceInstance_CallActivity" />

-    <bpmn2:serviceTask id="updateInfraRequest" name="Update DB status to SUCCESS">

-      <bpmn2:extensionElements>

-        <camunda:connector>

-          <camunda:inputOutput>

-            <camunda:inputParameter name="url">${URN_mso_adapters_db_endpoint}</camunda:inputParameter>

-            <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("CREVAS_setUpdateDbInstancePayload")}]]></camunda:inputParameter>

-            <camunda:inputParameter name="headers">

-              <camunda:map>

-                <camunda:entry key="content-type">application/soap+xml</camunda:entry>

-              </camunda:map>

-            </camunda:inputParameter>

-            <camunda:inputParameter name="method">POST</camunda:inputParameter>

-          </camunda:inputOutput>

-          <camunda:connectorId>soap-http-connector</camunda:connectorId>

-        </camunda:connector>

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_0vj46ej</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_13uceka</bpmn2:outgoing>

-    </bpmn2:serviceTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_13uceka" sourceRef="updateInfraRequest" targetRef="IntermediateThrowEvent_0prlju0" />

-    <bpmn2:scriptTask id="ScriptTask_1qd3uwb" name="PostProcess&#10;Create&#10;Service&#10;" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1ky2sv9</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0vj46ej</bpmn2:outgoing>

+def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.validateNetworkCreate(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_12ag2bk" sourceRef="doCreateNetworkInstance_CallActivity" targetRef="ScriptTask_04o8gb3" />
+    <bpmn2:sequenceFlow id="SequenceFlow_04vlq8r" sourceRef="ScriptTask_04o8gb3" targetRef="ExclusiveGateway_0fe690i" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0j6sjye" sourceRef="prepareCreateService_scriptTask" targetRef="doCreateServiceInstance_CallActivity" />
+    <bpmn2:serviceTask id="updateInfraRequest" name="Update DB status to SUCCESS">
+      <bpmn2:extensionElements>
+        <camunda:connector>
+          <camunda:inputOutput>
+            <camunda:inputParameter name="url">${URN_mso_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("CGMSNV_setUpdateDbInstancePayload")}]]></camunda:inputParameter>
+            <camunda:inputParameter name="headers">
+              <camunda:map>
+                <camunda:entry key="content-type">application/soap+xml</camunda:entry>
+              </camunda:map>
+            </camunda:inputParameter>
+            <camunda:inputParameter name="method">POST</camunda:inputParameter>
+          </camunda:inputOutput>
+          <camunda:connectorId>soap-http-connector</camunda:connectorId>
+        </camunda:connector>
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0vj46ej</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_13uceka</bpmn2:outgoing>
+    </bpmn2:serviceTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_13uceka" sourceRef="updateInfraRequest" targetRef="IntermediateThrowEvent_0prlju0" />
+    <bpmn2:scriptTask id="ScriptTask_1qd3uwb" name="PostProcess&#10;Create&#10;Service&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1ky2sv9</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0vj46ej</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()

-CreateGenericMacroServiceNetworkVnf.postProcessServiceInstanceCreate(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1ky2sv9" sourceRef="doCreateServiceInstance_CallActivity" targetRef="ScriptTask_1qd3uwb" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0vj46ej" sourceRef="ScriptTask_1qd3uwb" targetRef="updateInfraRequest" />

-  </bpmn2:process>

-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateGenericMacroServiceNetworkVnf">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createVIPR_startEvent">

-        <dc:Bounds x="96" y="90" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="82" y="131" width="65" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

-        <dc:Bounds x="285" y="68" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

-        <di:waypoint xsi:type="dc:Point" x="132" y="108" />

-        <di:waypoint xsi:type="dc:Point" x="285" y="108" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="171" y="108" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity">

-        <dc:Bounds x="787" y="1115" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">

-        <dc:Bounds x="514" y="1115" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_127">

-        <di:waypoint xsi:type="dc:Point" x="385" y="108" />

-        <di:waypoint xsi:type="dc:Point" x="476" y="108" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="271" y="69" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask">

-        <dc:Bounds x="476" y="68" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80" targetElement="_BPMNShape_CallActivity_4">

-        <di:waypoint xsi:type="dc:Point" x="614" y="1155" />

-        <di:waypoint xsi:type="dc:Point" x="787" y="1155" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="701" y="1140" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="CreateVIPR_EndEvent">

-        <dc:Bounds x="1286" y="1135" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1294" y="1176" width="20" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_CallActivity_4" targetElement="_BPMNShape_ScriptTask_337">

-        <di:waypoint xsi:type="dc:Point" x="887" y="1155" />

-        <di:waypoint xsi:type="dc:Point" x="1095" y="1154" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="991" y="1140" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">

-        <dc:Bounds x="1281" y="1385" width="409" height="232" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">

-        <dc:Bounds x="1349" y="1490" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1367" y="1531" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">

-        <dc:Bounds x="1424" y="1468" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">

-        <dc:Bounds x="1577" y="1490" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1595" y="1531" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">

-        <di:waypoint xsi:type="dc:Point" x="1385" y="1508" />

-        <di:waypoint xsi:type="dc:Point" x="1424" y="1508" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1413" y="1508" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">

-        <di:waypoint xsi:type="dc:Point" x="1524" y="1508" />

-        <di:waypoint xsi:type="dc:Point" x="1557" y="1508" />

-        <di:waypoint xsi:type="dc:Point" x="1557" y="1508" />

-        <di:waypoint xsi:type="dc:Point" x="1577" y="1508" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1572" y="1508" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_75" bpmnElement="doCreateServiceInstance_CallActivity">

-        <dc:Bounds x="476" y="223" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_127">

-        <di:waypoint xsi:type="dc:Point" x="576" y="108" />

-        <di:waypoint xsi:type="dc:Point" x="728" y="108" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="652" y="93" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_337" bpmnElement="ScriptTask_2">

-        <dc:Bounds x="1095" y="1114" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_337" targetElement="_BPMNShape_EndEvent_177">

-        <di:waypoint xsi:type="dc:Point" x="1195" y="1153" />

-        <di:waypoint xsi:type="dc:Point" x="1286" y="1153" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1241" y="1138" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_76" bpmnElement="doCreateNetworkInstance_CallActivity">

-        <dc:Bounds x="542" y="491" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_35" bpmnElement="IntermediateCatchEvent_3">

-        <dc:Bounds x="96" y="245" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="88" y="281" width="51" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_36" bpmnElement="IntermediateCatchEvent_4">

-        <dc:Bounds x="84" y="1137" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="66" y="1173" width="71" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_51" bpmnElement="IntermediateThrowEvent_4">

-        <dc:Bounds x="1033" y="854" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1008" y="895" width="85" height="26" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_341" bpmnElement="ScriptTask_PrepareNetworkCreate">

-        <dc:Bounds x="400" y="488" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_342" bpmnElement="ScriptTask_3">

-        <dc:Bounds x="456" y="765" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_81" bpmnElement="doCreateVNFandModules_CallActivity">

-        <dc:Bounds x="623" y="765" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_49" bpmnElement="IntermediateThrowEvent_2">

-        <dc:Bounds x="728" y="90" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="707" y="131" width="77" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="SubProcess_0s6hpty_di" bpmnElement="SubProcess_0s6hpty" isExpanded="true">

-        <dc:Bounds x="-75" y="1333" width="1324" height="837" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1vwgs6p_di" bpmnElement="ExclusiveGateway_1vwgs6p" isMarkerVisible="true">

-        <dc:Bounds x="79" y="2042" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="66" y="2102" width="80" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="StartEvent_1bwmffk_di" bpmnElement="StartEvent_1bwmffk">

-        <dc:Bounds x="-34" y="2050" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="-40" y="2091" width="50" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_0ydrtdx_di" bpmnElement="ExclusiveGateway_0ydrtdx" isMarkerVisible="true">

-        <dc:Bounds x="79" y="1935" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="13" y="1950" width="47" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_00rt5qa_di" bpmnElement="ExclusiveGateway_00rt5qa" isMarkerVisible="true">

-        <dc:Bounds x="79" y="1625" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="5" y="1640" width="57" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1kvn1pz_di" bpmnElement="ExclusiveGateway_1kvn1pz" isMarkerVisible="true">

-        <dc:Bounds x="206" y="1505" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="188" y="1471" width="89" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="CallActivity_0jw5tqa_di" bpmnElement="CallActivity_0jw5tqa">

-        <dc:Bounds x="1052" y="2016" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="EndEvent_04xute7_di" bpmnElement="EndEvent_04xute7">

-        <dc:Bounds x="1189" y="2038" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1207" y="2079" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="InclusiveGateway_1pqjttt_di" bpmnElement="InclusiveGateway_1pqjttt">

-        <dc:Bounds x="303" y="1625" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="328" y="1680" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_0yk02h3_di" bpmnElement="ScriptTask_0yk02h3">

-        <dc:Bounds x="920" y="2016" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0zpbskl_di" bpmnElement="SequenceFlow_0zpbskl">

-        <di:waypoint xsi:type="dc:Point" x="104" y="2042" />

-        <di:waypoint xsi:type="dc:Point" x="104" y="1985" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="110" y="2023.785849077779" width="19" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0dhf2js_di" bpmnElement="SequenceFlow_0dhf2js">

-        <di:waypoint xsi:type="dc:Point" x="129" y="2067" />

-        <di:waypoint xsi:type="dc:Point" x="763" y="2067" />

-        <di:waypoint xsi:type="dc:Point" x="763" y="1985" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="169" y="2072" width="14" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1sx5llu_di" bpmnElement="SequenceFlow_1sx5llu">

-        <di:waypoint xsi:type="dc:Point" x="129" y="1960" />

-        <di:waypoint xsi:type="dc:Point" x="434" y="1960" />

-        <di:waypoint xsi:type="dc:Point" x="434" y="1960" />

-        <di:waypoint xsi:type="dc:Point" x="738" y="1960" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="448" y="1964" width="19" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_02o4yqx_di" bpmnElement="SequenceFlow_02o4yqx">

-        <di:waypoint xsi:type="dc:Point" x="104" y="1935" />

-        <di:waypoint xsi:type="dc:Point" x="104" y="1851" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="115" y="1888.0011779924323" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_05lo85t_di" bpmnElement="SequenceFlow_05lo85t">

-        <di:waypoint xsi:type="dc:Point" x="129" y="1650" />

-        <di:waypoint xsi:type="dc:Point" x="231" y="1650" />

-        <di:waypoint xsi:type="dc:Point" x="231" y="1555" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="133" y="1654" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0xtr1g5_di" bpmnElement="SequenceFlow_0xtr1g5">

-        <di:waypoint xsi:type="dc:Point" x="104" y="1625" />

-        <di:waypoint xsi:type="dc:Point" x="104" y="1570" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="113" y="1565" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_19mxskt_di" bpmnElement="SequenceFlow_19mxskt">

-        <di:waypoint xsi:type="dc:Point" x="242" y="1544" />

-        <di:waypoint xsi:type="dc:Point" x="317" y="1636" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="281" y="1572" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0r7telk_di" bpmnElement="callDbCatalog_scriptTask">

-        <dc:Bounds x="184" y="533" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_1gacz45_di" bpmnElement="prepareCreateService_scriptTask">

-        <dc:Bounds x="285" y="223" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_10o22u2_di" bpmnElement="SequenceFlow_10o22u2">

-        <di:waypoint xsi:type="dc:Point" x="132" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="285" y="262" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="209" y="247.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_11b4gmn_di" bpmnElement="setPONR_ScriptTask">

-        <dc:Bounds x="228" y="1115" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_12ilko1_di" bpmnElement="SequenceFlow_12ilko1">

-        <di:waypoint xsi:type="dc:Point" x="120" y="1155" />

-        <di:waypoint xsi:type="dc:Point" x="228" y="1155" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="174" y="1130" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0afe2pg_di" bpmnElement="SequenceFlow_0afe2pg">

-        <di:waypoint xsi:type="dc:Point" x="328" y="1155" />

-        <di:waypoint xsi:type="dc:Point" x="471" y="1155" />

-        <di:waypoint xsi:type="dc:Point" x="514" y="1155" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="400" y="1140" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_1cvt373_di" bpmnElement="DoRollbackVNFandModules_CallActivity">

-        <dc:Bounds x="54" y="1490" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_09xerwk_di" bpmnElement="SequenceFlow_09xerwk">

-        <di:waypoint xsi:type="dc:Point" x="154" y="1530" />

-        <di:waypoint xsi:type="dc:Point" x="206" y="1530" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="180" y="1515" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_0zl1ald_di" bpmnElement="DoRollbackNetwork_CallActivity">

-        <dc:Bounds x="404" y="1490" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_09o09bu_di" bpmnElement="ExclusiveGateway_09o09bu" isMarkerVisible="true">

-        <dc:Bounds x="608" y="1625" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="596" y="1596" width="73" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="CallActivity_0oh7wzu_di" bpmnElement="DoRollbackService_CallActivity">

-        <dc:Bounds x="713" y="1610" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="InclusiveGateway_0foywso_di" bpmnElement="InclusiveGateway_0foywso">

-        <dc:Bounds x="738" y="1935" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="763" y="1990" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1os9x7w_di" bpmnElement="SequenceFlow_1os9x7w">

-        <di:waypoint xsi:type="dc:Point" x="658" y="1650" />

-        <di:waypoint xsi:type="dc:Point" x="713" y="1650" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="678" y="1635" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1f1hd3l_di" bpmnElement="SequenceFlow_1f1hd3l">

-        <di:waypoint xsi:type="dc:Point" x="763" y="1690" />

-        <di:waypoint xsi:type="dc:Point" x="763" y="1743" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="778" y="1716.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0g7scsg_di" bpmnElement="SequenceFlow_0g7scsg">

-        <di:waypoint xsi:type="dc:Point" x="633" y="1675" />

-        <di:waypoint xsi:type="dc:Point" x="633" y="1768" />

-        <di:waypoint xsi:type="dc:Point" x="738" y="1768" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="641" y="1710.0295234297107" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0jg47xm_di" bpmnElement="SequenceFlow_0jg47xm">

-        <di:waypoint xsi:type="dc:Point" x="788" y="1960" />

-        <di:waypoint xsi:type="dc:Point" x="970" y="1960" />

-        <di:waypoint xsi:type="dc:Point" x="970" y="2016" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="879" y="1945" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0807ukc_di" bpmnElement="SequenceFlow_0807ukc">

-        <di:waypoint xsi:type="dc:Point" x="1020" y="2056" />

-        <di:waypoint xsi:type="dc:Point" x="1052" y="2056" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1036" y="2041" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_19yywk8_di" bpmnElement="SequenceFlow_19yywk8">

-        <di:waypoint xsi:type="dc:Point" x="1152" y="2056" />

-        <di:waypoint xsi:type="dc:Point" x="1189" y="2056" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1171" y="2041" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1bwbn7r_di" bpmnElement="SequenceFlow_1bwbn7r">

-        <di:waypoint xsi:type="dc:Point" x="500" y="530" />

-        <di:waypoint xsi:type="dc:Point" x="542" y="529" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="521" y="514.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1n7r495_di" bpmnElement="SequenceFlow_1n7r495">

-        <di:waypoint xsi:type="dc:Point" x="882" y="528" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="528" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="561" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="896" y="513" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1h77psn_di" bpmnElement="SequenceFlow_1h77psn">

-        <di:waypoint xsi:type="dc:Point" x="556" y="806" />

-        <di:waypoint xsi:type="dc:Point" x="586" y="806" />

-        <di:waypoint xsi:type="dc:Point" x="586" y="804" />

-        <di:waypoint xsi:type="dc:Point" x="623" y="804" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="601" y="805" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="IntermediateCatchEvent_1nh09nr_di" bpmnElement="IntermediateCatchEvent_1nh09nr">

-        <dc:Bounds x="83" y="555" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="66" y="591" width="70" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="IntermediateThrowEvent_0prlju0_di" bpmnElement="IntermediateThrowEvent_0prlju0">

-        <dc:Bounds x="905" y="245" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="888" y="286" width="70" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_0b9wd4f_di" bpmnElement="ExclusiveGateway_0b9wd4f" isMarkerVisible="true">

-        <dc:Bounds x="332" y="548" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="393" y="580" width="61" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_0fe690i_di" bpmnElement="ExclusiveGateway_0fe690i" isMarkerVisible="true">

-        <dc:Bounds x="828" y="503" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="796" y="561" width="82" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0dfkfh1_di" bpmnElement="SequenceFlow_0dfkfh1">

-        <di:waypoint xsi:type="dc:Point" x="853" y="503" />

-        <di:waypoint xsi:type="dc:Point" x="853" y="426" />

-        <di:waypoint xsi:type="dc:Point" x="450" y="426" />

-        <di:waypoint xsi:type="dc:Point" x="450" y="486" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="644" y="411" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0cmebdc_di" bpmnElement="SequenceFlow_0cmebdc">

-        <di:waypoint xsi:type="dc:Point" x="357" y="548" />

-        <di:waypoint xsi:type="dc:Point" x="357" y="528" />

-        <di:waypoint xsi:type="dc:Point" x="400" y="528" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="363" y="538" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1os8cm5_di" bpmnElement="ExclusiveGateway_1os8cm5" isMarkerVisible="true">

-        <dc:Bounds x="898" y="561" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="923" y="616" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1f26zbk_di" bpmnElement="SequenceFlow_1f26zbk">

-        <di:waypoint xsi:type="dc:Point" x="357" y="598" />

-        <di:waypoint xsi:type="dc:Point" x="357" y="665" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="665" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="611" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="633" y="650" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="IntermediateThrowEvent_0nreq15_di" bpmnElement="IntermediateThrowEvent_0nreq15">

-        <dc:Bounds x="1033" y="568" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1013" y="609" width="75" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1vwssu7_di" bpmnElement="SequenceFlow_1vwssu7">

-        <di:waypoint xsi:type="dc:Point" x="119" y="573" />

-        <di:waypoint xsi:type="dc:Point" x="184" y="573" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="152" y="548" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_19etqmx_di" bpmnElement="SequenceFlow_19etqmx">

-        <di:waypoint xsi:type="dc:Point" x="284" y="573" />

-        <di:waypoint xsi:type="dc:Point" x="332" y="573" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="308" y="548" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1j7n6qx_di" bpmnElement="SequenceFlow_1j7n6qx">

-        <di:waypoint xsi:type="dc:Point" x="948" y="586" />

-        <di:waypoint xsi:type="dc:Point" x="1033" y="586" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="991" y="561" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="IntermediateCatchEvent_0rlqdvq_di" bpmnElement="IntermediateCatchEvent_0rlqdvq">

-        <dc:Bounds x="83" y="870" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="77" y="906" width="45" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1nlocis_di" bpmnElement="ExclusiveGateway_1nlocis" isMarkerVisible="true">

-        <dc:Bounds x="332" y="863" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="396" y="882" width="62" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_04q1qud_di" bpmnElement="ExclusiveGateway_04q1qud" isMarkerVisible="true">

-        <dc:Bounds x="898" y="847" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="923" y="902" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_10tbv62_di" bpmnElement="SequenceFlow_10tbv62">

-        <di:waypoint xsi:type="dc:Point" x="119" y="888" />

-        <di:waypoint xsi:type="dc:Point" x="332" y="888" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="226" y="863" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0bvecvm_di" bpmnElement="SequenceFlow_0bvecvm">

-        <di:waypoint xsi:type="dc:Point" x="357" y="863" />

-        <di:waypoint xsi:type="dc:Point" x="357" y="805" />

-        <di:waypoint xsi:type="dc:Point" x="456" y="805" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="368" y="838" width="19" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0qi5uxg_di" bpmnElement="SequenceFlow_0qi5uxg">

-        <di:waypoint xsi:type="dc:Point" x="723" y="805" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="805" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="847" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="808" y="752" width="89" height="50" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0w7328u_di" bpmnElement="SequenceFlow_0w7328u">

-        <di:waypoint xsi:type="dc:Point" x="357" y="914" />

-        <di:waypoint xsi:type="dc:Point" x="357" y="937" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="937" />

-        <di:waypoint xsi:type="dc:Point" x="923" y="898" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="603" y="913" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0xowenu_di" bpmnElement="SequenceFlow_0xowenu">

-        <di:waypoint xsi:type="dc:Point" x="948" y="872" />

-        <di:waypoint xsi:type="dc:Point" x="1033" y="872" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="991" y="847" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_04o8gb3_di" bpmnElement="ScriptTask_04o8gb3">

-        <dc:Bounds x="686" y="491" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_12ag2bk_di" bpmnElement="SequenceFlow_12ag2bk">

-        <di:waypoint xsi:type="dc:Point" x="642" y="531" />

-        <di:waypoint xsi:type="dc:Point" x="686" y="531" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="664" y="506" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_04vlq8r_di" bpmnElement="SequenceFlow_04vlq8r">

-        <di:waypoint xsi:type="dc:Point" x="786" y="531" />

-        <di:waypoint xsi:type="dc:Point" x="807" y="531" />

-        <di:waypoint xsi:type="dc:Point" x="807" y="528" />

-        <di:waypoint xsi:type="dc:Point" x="828" y="528" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="822" y="519.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0j6sjye_di" bpmnElement="SequenceFlow_0j6sjye">

-        <di:waypoint xsi:type="dc:Point" x="385" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="476" y="263" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="431" y="248" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_184teky_di" bpmnElement="ScriptTask_184teky">

-        <dc:Bounds x="546" y="1490" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1c386z9_di" bpmnElement="ExclusiveGateway_1c386z9" isMarkerVisible="true">

-        <dc:Bounds x="685" y="1505" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="758" y="1512" width="53" height="36" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1dmsx0d_di" bpmnElement="SequenceFlow_1dmsx0d">

-        <di:waypoint xsi:type="dc:Point" x="504" y="1530" />

-        <di:waypoint xsi:type="dc:Point" x="546" y="1530" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="525" y="1515" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1otyild_di" bpmnElement="SequenceFlow_1otyild">

-        <di:waypoint xsi:type="dc:Point" x="646" y="1530" />

-        <di:waypoint xsi:type="dc:Point" x="685" y="1530" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="666" y="1515" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0136s37_di" bpmnElement="SequenceFlow_0136s37">

-        <di:waypoint xsi:type="dc:Point" x="710" y="1505" />

-        <di:waypoint xsi:type="dc:Point" x="710" y="1414" />

-        <di:waypoint xsi:type="dc:Point" x="454" y="1414" />

-        <di:waypoint xsi:type="dc:Point" x="454" y="1490" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="574" y="1399" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_12u8ufr_di" bpmnElement="SequenceFlow_12u8ufr">

-        <di:waypoint xsi:type="dc:Point" x="710" y="1555" />

-        <di:waypoint xsi:type="dc:Point" x="710" y="1586" />

-        <di:waypoint xsi:type="dc:Point" x="530" y="1586" />

-        <di:waypoint xsi:type="dc:Point" x="530" y="1625" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="615" y="1571" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1bts0nw_di" bpmnElement="ExclusiveGateway_1bts0nw" isMarkerVisible="true">

-        <dc:Bounds x="303" y="1505" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="289" y="1471" width="81" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0tmepzk_di" bpmnElement="SequenceFlow_0tmepzk">

-        <di:waypoint xsi:type="dc:Point" x="256" y="1530" />

-        <di:waypoint xsi:type="dc:Point" x="303" y="1530" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="271" y="1505" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1fqmrda_di" bpmnElement="SequenceFlow_1fqmrda">

-        <di:waypoint xsi:type="dc:Point" x="353" y="1530" />

-        <di:waypoint xsi:type="dc:Point" x="404" y="1530" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="370" y="1505" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1brxd2r_di" bpmnElement="SequenceFlow_1brxd2r">

-        <di:waypoint xsi:type="dc:Point" x="328" y="1555" />

-        <di:waypoint xsi:type="dc:Point" x="328" y="1625" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="336" y="1580" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_05indeh_di" bpmnElement="ExclusiveGateway_05indeh" isMarkerVisible="true">

-        <dc:Bounds x="505" y="1625" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="430" y="1593" width="85" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_08s0ew2_di" bpmnElement="SequenceFlow_08s0ew2">

-        <di:waypoint xsi:type="dc:Point" x="353" y="1650" />

-        <di:waypoint xsi:type="dc:Point" x="505" y="1650" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="429" y="1625" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1ieiew4_di" bpmnElement="SequenceFlow_1ieiew4">

-        <di:waypoint xsi:type="dc:Point" x="555" y="1650" />

-        <di:waypoint xsi:type="dc:Point" x="608" y="1650" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="573" y="1625" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0sezboq_di" bpmnElement="SequenceFlow_0sezboq">

-        <di:waypoint xsi:type="dc:Point" x="530" y="1675" />

-        <di:waypoint xsi:type="dc:Point" x="530" y="1768" />

-        <di:waypoint xsi:type="dc:Point" x="738" y="1768" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="538" y="1710.0295234297107" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ServiceTask_16yhzej_di" bpmnElement="updateInfraRequest">

-        <dc:Bounds x="764" y="223" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_13uceka_di" bpmnElement="SequenceFlow_13uceka">

-        <di:waypoint xsi:type="dc:Point" x="864" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="905" y="263" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="885" y="248" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_1qd3uwb_di" bpmnElement="ScriptTask_1qd3uwb">

-        <dc:Bounds x="618" y="226" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1ky2sv9_di" bpmnElement="SequenceFlow_1ky2sv9">

-        <di:waypoint xsi:type="dc:Point" x="576" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="597" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="597" y="266" />

-        <di:waypoint xsi:type="dc:Point" x="618" y="266" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="612" y="254.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0vj46ej_di" bpmnElement="SequenceFlow_0vj46ej">

-        <di:waypoint xsi:type="dc:Point" x="718" y="266" />

-        <di:waypoint xsi:type="dc:Point" x="741" y="266" />

-        <di:waypoint xsi:type="dc:Point" x="741" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="764" y="263" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="756" y="254.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_17doerz_di" bpmnElement="ScriptTask_17doerz">

-        <dc:Bounds x="54" y="1771" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0zq7i3q_di" bpmnElement="SequenceFlow_0zq7i3q">

-        <di:waypoint xsi:type="dc:Point" x="2" y="2068" />

-        <di:waypoint xsi:type="dc:Point" x="49" y="2068" />

-        <di:waypoint xsi:type="dc:Point" x="49" y="2067" />

-        <di:waypoint xsi:type="dc:Point" x="79" y="2067" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="18" y="2069" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="InclusiveGateway_0m9f5ka_di" bpmnElement="InclusiveGateway_0m9f5ka">

-        <dc:Bounds x="738" y="1743" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="763" y="1798" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_0wyub4x_di" bpmnElement="ScriptTask_0wyub4x">

-        <dc:Bounds x="713" y="1827" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0sdb3on_di" bpmnElement="SequenceFlow_0sdb3on">

-        <di:waypoint xsi:type="dc:Point" x="104" y="1771" />

-        <di:waypoint xsi:type="dc:Point" x="104" y="1675" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="119" y="1713" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0f4u373_di" bpmnElement="SequenceFlow_0f4u373">

-        <di:waypoint xsi:type="dc:Point" x="763" y="1793" />

-        <di:waypoint xsi:type="dc:Point" x="763" y="1827" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="778" y="1800" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1rabks0_di" bpmnElement="SequenceFlow_1rabks0">

-        <di:waypoint xsi:type="dc:Point" x="763" y="1907" />

-        <di:waypoint xsi:type="dc:Point" x="763" y="1935" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="778" y="1911" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.postProcessServiceInstanceCreate(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1ky2sv9" sourceRef="doCreateServiceInstance_CallActivity" targetRef="ScriptTask_1qd3uwb" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0vj46ej" sourceRef="ScriptTask_1qd3uwb" targetRef="updateInfraRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0hvcwa1" sourceRef="DecomposeService" targetRef="prepareCreateService_scriptTask" />
+    <bpmn2:callActivity id="DecomposeService" name="DecomposeService" calledElement="DecomposeService">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="serviceDecomposition" target="serviceDecomposition" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_00h6hmd</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0hvcwa1</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_0cdtchu" name="Prepare&#10;Decompose&#10;Service&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1eu60rt</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_00h6hmd</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf()
+CreateGenericMacroServiceNetworkVnf.prepareDecomposeService(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1eu60rt" sourceRef="IntermediateCatchEvent_3" targetRef="ScriptTask_0cdtchu" />
+    <bpmn2:sequenceFlow id="SequenceFlow_00h6hmd" sourceRef="ScriptTask_0cdtchu" targetRef="DecomposeService" />
+  </bpmn2:process>
+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateGenericMacroServiceNetworkVnf">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createVIPR_startEvent">
+        <dc:Bounds x="96" y="90" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="82" y="131" width="65" height="22" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="285" y="68" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="132" y="108" />
+        <di:waypoint xsi:type="dc:Point" x="285" y="108" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="171" y="108" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity">
+        <dc:Bounds x="787" y="1115" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
+        <dc:Bounds x="514" y="1115" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_127">
+        <di:waypoint xsi:type="dc:Point" x="385" y="108" />
+        <di:waypoint xsi:type="dc:Point" x="476" y="108" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="271" y="69" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask">
+        <dc:Bounds x="476" y="68" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80" targetElement="_BPMNShape_CallActivity_4">
+        <di:waypoint xsi:type="dc:Point" x="614" y="1155" />
+        <di:waypoint xsi:type="dc:Point" x="787" y="1155" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="701" y="1140" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="CreateVIPR_EndEvent">
+        <dc:Bounds x="1286" y="1135" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1294" y="1176" width="20" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_CallActivity_4" targetElement="_BPMNShape_ScriptTask_337">
+        <di:waypoint xsi:type="dc:Point" x="887" y="1155" />
+        <di:waypoint xsi:type="dc:Point" x="1095" y="1154" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="991" y="1140" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">
+        <dc:Bounds x="1281" y="1385" width="409" height="232" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">
+        <dc:Bounds x="1349" y="1490" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1367" y="1531" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">
+        <dc:Bounds x="1424" y="1468" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">
+        <dc:Bounds x="1577" y="1490" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1595" y="1531" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">
+        <di:waypoint xsi:type="dc:Point" x="1385" y="1508" />
+        <di:waypoint xsi:type="dc:Point" x="1424" y="1508" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1413" y="1508" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">
+        <di:waypoint xsi:type="dc:Point" x="1524" y="1508" />
+        <di:waypoint xsi:type="dc:Point" x="1557" y="1508" />
+        <di:waypoint xsi:type="dc:Point" x="1557" y="1508" />
+        <di:waypoint xsi:type="dc:Point" x="1577" y="1508" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1572" y="1508" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_75" bpmnElement="doCreateServiceInstance_CallActivity">
+        <dc:Bounds x="610" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_127">
+        <di:waypoint xsi:type="dc:Point" x="576" y="108" />
+        <di:waypoint xsi:type="dc:Point" x="728" y="108" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="652" y="93" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_337" bpmnElement="ScriptTask_2">
+        <dc:Bounds x="1095" y="1114" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_337" targetElement="_BPMNShape_EndEvent_177">
+        <di:waypoint xsi:type="dc:Point" x="1195" y="1153" />
+        <di:waypoint xsi:type="dc:Point" x="1286" y="1153" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1241" y="1138" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_76" bpmnElement="doCreateNetworkInstance_CallActivity">
+        <dc:Bounds x="542" y="491" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_35" bpmnElement="IntermediateCatchEvent_3">
+        <dc:Bounds x="96" y="245" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="88" y="281" width="51" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_36" bpmnElement="IntermediateCatchEvent_4">
+        <dc:Bounds x="84" y="1137" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="66" y="1173" width="71" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_51" bpmnElement="IntermediateThrowEvent_4">
+        <dc:Bounds x="1033" y="854" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1008" y="895" width="85" height="26" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_341" bpmnElement="ScriptTask_PrepareNetworkCreate">
+        <dc:Bounds x="400" y="488" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_342" bpmnElement="ScriptTask_3">
+        <dc:Bounds x="456" y="765" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_81" bpmnElement="doCreateVNFandModules_CallActivity">
+        <dc:Bounds x="623" y="765" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_49" bpmnElement="IntermediateThrowEvent_2">
+        <dc:Bounds x="728" y="90" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="707" y="131" width="77" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_0s6hpty_di" bpmnElement="SubProcess_0s6hpty" isExpanded="true">
+        <dc:Bounds x="-75" y="1333" width="1324" height="837" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1vwgs6p_di" bpmnElement="ExclusiveGateway_1vwgs6p" isMarkerVisible="true">
+        <dc:Bounds x="79" y="2042" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="66" y="2102" width="80" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1bwmffk_di" bpmnElement="StartEvent_1bwmffk">
+        <dc:Bounds x="-34" y="2050" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-40" y="2091" width="50" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0ydrtdx_di" bpmnElement="ExclusiveGateway_0ydrtdx" isMarkerVisible="true">
+        <dc:Bounds x="79" y="1935" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="13" y="1950" width="47" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_00rt5qa_di" bpmnElement="ExclusiveGateway_00rt5qa" isMarkerVisible="true">
+        <dc:Bounds x="79" y="1625" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="5" y="1640" width="57" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1kvn1pz_di" bpmnElement="ExclusiveGateway_1kvn1pz" isMarkerVisible="true">
+        <dc:Bounds x="206" y="1505" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="188" y="1471" width="89" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0jw5tqa_di" bpmnElement="CallActivity_0jw5tqa">
+        <dc:Bounds x="1052" y="2016" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_04xute7_di" bpmnElement="EndEvent_04xute7">
+        <dc:Bounds x="1189" y="2038" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1207" y="2079" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="InclusiveGateway_1pqjttt_di" bpmnElement="InclusiveGateway_1pqjttt">
+        <dc:Bounds x="303" y="1625" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="328" y="1680" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0yk02h3_di" bpmnElement="ScriptTask_0yk02h3">
+        <dc:Bounds x="920" y="2016" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0zpbskl_di" bpmnElement="SequenceFlow_0zpbskl">
+        <di:waypoint xsi:type="dc:Point" x="104" y="2042" />
+        <di:waypoint xsi:type="dc:Point" x="104" y="1985" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="110" y="2023.785849077779" width="19" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0dhf2js_di" bpmnElement="SequenceFlow_0dhf2js">
+        <di:waypoint xsi:type="dc:Point" x="129" y="2067" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="2067" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="1985" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="169" y="2072" width="14" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1sx5llu_di" bpmnElement="SequenceFlow_1sx5llu">
+        <di:waypoint xsi:type="dc:Point" x="129" y="1960" />
+        <di:waypoint xsi:type="dc:Point" x="434" y="1960" />
+        <di:waypoint xsi:type="dc:Point" x="434" y="1960" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="1960" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="448" y="1964" width="19" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_02o4yqx_di" bpmnElement="SequenceFlow_02o4yqx">
+        <di:waypoint xsi:type="dc:Point" x="104" y="1935" />
+        <di:waypoint xsi:type="dc:Point" x="104" y="1851" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="115" y="1888.0011779924323" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_05lo85t_di" bpmnElement="SequenceFlow_05lo85t">
+        <di:waypoint xsi:type="dc:Point" x="129" y="1650" />
+        <di:waypoint xsi:type="dc:Point" x="231" y="1650" />
+        <di:waypoint xsi:type="dc:Point" x="231" y="1555" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="133" y="1654" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0xtr1g5_di" bpmnElement="SequenceFlow_0xtr1g5">
+        <di:waypoint xsi:type="dc:Point" x="104" y="1625" />
+        <di:waypoint xsi:type="dc:Point" x="104" y="1570" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="113" y="1565" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_19mxskt_di" bpmnElement="SequenceFlow_19mxskt">
+        <di:waypoint xsi:type="dc:Point" x="242" y="1544" />
+        <di:waypoint xsi:type="dc:Point" x="317" y="1636" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="281" y="1572" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0r7telk_di" bpmnElement="callDbCatalog_scriptTask">
+        <dc:Bounds x="184" y="533" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1gacz45_di" bpmnElement="prepareCreateService_scriptTask">
+        <dc:Bounds x="456" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_11b4gmn_di" bpmnElement="setPONR_ScriptTask">
+        <dc:Bounds x="228" y="1115" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_12ilko1_di" bpmnElement="SequenceFlow_12ilko1">
+        <di:waypoint xsi:type="dc:Point" x="120" y="1155" />
+        <di:waypoint xsi:type="dc:Point" x="228" y="1155" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="174" y="1130" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0afe2pg_di" bpmnElement="SequenceFlow_0afe2pg">
+        <di:waypoint xsi:type="dc:Point" x="328" y="1155" />
+        <di:waypoint xsi:type="dc:Point" x="471" y="1155" />
+        <di:waypoint xsi:type="dc:Point" x="514" y="1155" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="400" y="1140" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1cvt373_di" bpmnElement="DoRollbackVNFandModules_CallActivity">
+        <dc:Bounds x="54" y="1490" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_09xerwk_di" bpmnElement="SequenceFlow_09xerwk">
+        <di:waypoint xsi:type="dc:Point" x="154" y="1530" />
+        <di:waypoint xsi:type="dc:Point" x="206" y="1530" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="180" y="1515" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0zl1ald_di" bpmnElement="DoRollbackNetwork_CallActivity">
+        <dc:Bounds x="404" y="1490" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_09o09bu_di" bpmnElement="ExclusiveGateway_09o09bu" isMarkerVisible="true">
+        <dc:Bounds x="608" y="1625" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="596" y="1596" width="73" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0oh7wzu_di" bpmnElement="DoRollbackService_CallActivity">
+        <dc:Bounds x="713" y="1610" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="InclusiveGateway_0foywso_di" bpmnElement="InclusiveGateway_0foywso">
+        <dc:Bounds x="738" y="1935" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="763" y="1990" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1os9x7w_di" bpmnElement="SequenceFlow_1os9x7w">
+        <di:waypoint xsi:type="dc:Point" x="658" y="1650" />
+        <di:waypoint xsi:type="dc:Point" x="713" y="1650" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="678" y="1635" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1f1hd3l_di" bpmnElement="SequenceFlow_1f1hd3l">
+        <di:waypoint xsi:type="dc:Point" x="763" y="1690" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="1743" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="778" y="1716.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0g7scsg_di" bpmnElement="SequenceFlow_0g7scsg">
+        <di:waypoint xsi:type="dc:Point" x="633" y="1675" />
+        <di:waypoint xsi:type="dc:Point" x="633" y="1768" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="1768" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="641" y="1710.0295234297107" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0jg47xm_di" bpmnElement="SequenceFlow_0jg47xm">
+        <di:waypoint xsi:type="dc:Point" x="788" y="1960" />
+        <di:waypoint xsi:type="dc:Point" x="970" y="1960" />
+        <di:waypoint xsi:type="dc:Point" x="970" y="2016" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="879" y="1945" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0807ukc_di" bpmnElement="SequenceFlow_0807ukc">
+        <di:waypoint xsi:type="dc:Point" x="1020" y="2056" />
+        <di:waypoint xsi:type="dc:Point" x="1052" y="2056" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1036" y="2041" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_19yywk8_di" bpmnElement="SequenceFlow_19yywk8">
+        <di:waypoint xsi:type="dc:Point" x="1152" y="2056" />
+        <di:waypoint xsi:type="dc:Point" x="1189" y="2056" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1171" y="2041" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1bwbn7r_di" bpmnElement="SequenceFlow_1bwbn7r">
+        <di:waypoint xsi:type="dc:Point" x="500" y="530" />
+        <di:waypoint xsi:type="dc:Point" x="542" y="529" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="521" y="514.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1n7r495_di" bpmnElement="SequenceFlow_1n7r495">
+        <di:waypoint xsi:type="dc:Point" x="882" y="528" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="528" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="561" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="896" y="513" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1h77psn_di" bpmnElement="SequenceFlow_1h77psn">
+        <di:waypoint xsi:type="dc:Point" x="556" y="806" />
+        <di:waypoint xsi:type="dc:Point" x="586" y="806" />
+        <di:waypoint xsi:type="dc:Point" x="586" y="804" />
+        <di:waypoint xsi:type="dc:Point" x="623" y="804" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="601" y="805" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_1nh09nr_di" bpmnElement="IntermediateCatchEvent_1nh09nr">
+        <dc:Bounds x="83" y="555" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="66" y="591" width="70" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_0prlju0_di" bpmnElement="IntermediateThrowEvent_0prlju0">
+        <dc:Bounds x="1065" y="245" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1048" y="286" width="70" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0b9wd4f_di" bpmnElement="ExclusiveGateway_0b9wd4f" isMarkerVisible="true">
+        <dc:Bounds x="332" y="548" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="393" y="580" width="61" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0fe690i_di" bpmnElement="ExclusiveGateway_0fe690i" isMarkerVisible="true">
+        <dc:Bounds x="828" y="503" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="796" y="561" width="82" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0dfkfh1_di" bpmnElement="SequenceFlow_0dfkfh1">
+        <di:waypoint xsi:type="dc:Point" x="853" y="503" />
+        <di:waypoint xsi:type="dc:Point" x="853" y="426" />
+        <di:waypoint xsi:type="dc:Point" x="450" y="426" />
+        <di:waypoint xsi:type="dc:Point" x="450" y="486" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="644" y="411" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0cmebdc_di" bpmnElement="SequenceFlow_0cmebdc">
+        <di:waypoint xsi:type="dc:Point" x="357" y="548" />
+        <di:waypoint xsi:type="dc:Point" x="357" y="528" />
+        <di:waypoint xsi:type="dc:Point" x="400" y="528" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="363" y="538" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1os8cm5_di" bpmnElement="ExclusiveGateway_1os8cm5" isMarkerVisible="true">
+        <dc:Bounds x="898" y="561" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="923" y="616" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1f26zbk_di" bpmnElement="SequenceFlow_1f26zbk">
+        <di:waypoint xsi:type="dc:Point" x="357" y="598" />
+        <di:waypoint xsi:type="dc:Point" x="357" y="665" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="665" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="611" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="633" y="650" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_0nreq15_di" bpmnElement="IntermediateThrowEvent_0nreq15">
+        <dc:Bounds x="1033" y="568" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1013" y="609" width="75" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1vwssu7_di" bpmnElement="SequenceFlow_1vwssu7">
+        <di:waypoint xsi:type="dc:Point" x="119" y="573" />
+        <di:waypoint xsi:type="dc:Point" x="184" y="573" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="152" y="548" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_19etqmx_di" bpmnElement="SequenceFlow_19etqmx">
+        <di:waypoint xsi:type="dc:Point" x="284" y="573" />
+        <di:waypoint xsi:type="dc:Point" x="332" y="573" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="308" y="548" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1j7n6qx_di" bpmnElement="SequenceFlow_1j7n6qx">
+        <di:waypoint xsi:type="dc:Point" x="948" y="586" />
+        <di:waypoint xsi:type="dc:Point" x="1033" y="586" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="991" y="561" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_0rlqdvq_di" bpmnElement="IntermediateCatchEvent_0rlqdvq">
+        <dc:Bounds x="83" y="870" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="77" y="906" width="45" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1nlocis_di" bpmnElement="ExclusiveGateway_1nlocis" isMarkerVisible="true">
+        <dc:Bounds x="332" y="863" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="396" y="882" width="62" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_04q1qud_di" bpmnElement="ExclusiveGateway_04q1qud" isMarkerVisible="true">
+        <dc:Bounds x="898" y="847" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="923" y="902" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_10tbv62_di" bpmnElement="SequenceFlow_10tbv62">
+        <di:waypoint xsi:type="dc:Point" x="119" y="888" />
+        <di:waypoint xsi:type="dc:Point" x="332" y="888" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="226" y="863" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0bvecvm_di" bpmnElement="SequenceFlow_0bvecvm">
+        <di:waypoint xsi:type="dc:Point" x="357" y="863" />
+        <di:waypoint xsi:type="dc:Point" x="357" y="805" />
+        <di:waypoint xsi:type="dc:Point" x="456" y="805" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="368" y="838" width="19" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0qi5uxg_di" bpmnElement="SequenceFlow_0qi5uxg">
+        <di:waypoint xsi:type="dc:Point" x="723" y="805" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="805" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="847" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="808" y="752" width="89" height="50" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0w7328u_di" bpmnElement="SequenceFlow_0w7328u">
+        <di:waypoint xsi:type="dc:Point" x="357" y="914" />
+        <di:waypoint xsi:type="dc:Point" x="357" y="937" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="937" />
+        <di:waypoint xsi:type="dc:Point" x="923" y="898" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="603" y="913" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0xowenu_di" bpmnElement="SequenceFlow_0xowenu">
+        <di:waypoint xsi:type="dc:Point" x="948" y="872" />
+        <di:waypoint xsi:type="dc:Point" x="1033" y="872" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="991" y="847" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_04o8gb3_di" bpmnElement="ScriptTask_04o8gb3">
+        <dc:Bounds x="686" y="491" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_12ag2bk_di" bpmnElement="SequenceFlow_12ag2bk">
+        <di:waypoint xsi:type="dc:Point" x="642" y="531" />
+        <di:waypoint xsi:type="dc:Point" x="686" y="531" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="664" y="506" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_04vlq8r_di" bpmnElement="SequenceFlow_04vlq8r">
+        <di:waypoint xsi:type="dc:Point" x="786" y="531" />
+        <di:waypoint xsi:type="dc:Point" x="807" y="531" />
+        <di:waypoint xsi:type="dc:Point" x="807" y="528" />
+        <di:waypoint xsi:type="dc:Point" x="828" y="528" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="822" y="519.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0j6sjye_di" bpmnElement="SequenceFlow_0j6sjye">
+        <di:waypoint xsi:type="dc:Point" x="556" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="610" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="583" y="248" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_184teky_di" bpmnElement="ScriptTask_184teky">
+        <dc:Bounds x="546" y="1490" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1c386z9_di" bpmnElement="ExclusiveGateway_1c386z9" isMarkerVisible="true">
+        <dc:Bounds x="685" y="1505" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="758" y="1512" width="53" height="36" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1dmsx0d_di" bpmnElement="SequenceFlow_1dmsx0d">
+        <di:waypoint xsi:type="dc:Point" x="504" y="1530" />
+        <di:waypoint xsi:type="dc:Point" x="546" y="1530" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="525" y="1515" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1otyild_di" bpmnElement="SequenceFlow_1otyild">
+        <di:waypoint xsi:type="dc:Point" x="646" y="1530" />
+        <di:waypoint xsi:type="dc:Point" x="685" y="1530" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="666" y="1515" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0136s37_di" bpmnElement="SequenceFlow_0136s37">
+        <di:waypoint xsi:type="dc:Point" x="710" y="1505" />
+        <di:waypoint xsi:type="dc:Point" x="710" y="1414" />
+        <di:waypoint xsi:type="dc:Point" x="454" y="1414" />
+        <di:waypoint xsi:type="dc:Point" x="454" y="1490" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="574" y="1399" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_12u8ufr_di" bpmnElement="SequenceFlow_12u8ufr">
+        <di:waypoint xsi:type="dc:Point" x="710" y="1555" />
+        <di:waypoint xsi:type="dc:Point" x="710" y="1586" />
+        <di:waypoint xsi:type="dc:Point" x="530" y="1586" />
+        <di:waypoint xsi:type="dc:Point" x="530" y="1625" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="615" y="1571" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1bts0nw_di" bpmnElement="ExclusiveGateway_1bts0nw" isMarkerVisible="true">
+        <dc:Bounds x="303" y="1505" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="289" y="1471" width="81" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0tmepzk_di" bpmnElement="SequenceFlow_0tmepzk">
+        <di:waypoint xsi:type="dc:Point" x="256" y="1530" />
+        <di:waypoint xsi:type="dc:Point" x="303" y="1530" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="271" y="1505" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1fqmrda_di" bpmnElement="SequenceFlow_1fqmrda">
+        <di:waypoint xsi:type="dc:Point" x="353" y="1530" />
+        <di:waypoint xsi:type="dc:Point" x="404" y="1530" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="370" y="1505" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1brxd2r_di" bpmnElement="SequenceFlow_1brxd2r">
+        <di:waypoint xsi:type="dc:Point" x="328" y="1555" />
+        <di:waypoint xsi:type="dc:Point" x="328" y="1625" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="336" y="1580" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_05indeh_di" bpmnElement="ExclusiveGateway_05indeh" isMarkerVisible="true">
+        <dc:Bounds x="505" y="1625" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="430" y="1593" width="85" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_08s0ew2_di" bpmnElement="SequenceFlow_08s0ew2">
+        <di:waypoint xsi:type="dc:Point" x="353" y="1650" />
+        <di:waypoint xsi:type="dc:Point" x="505" y="1650" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="429" y="1625" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ieiew4_di" bpmnElement="SequenceFlow_1ieiew4">
+        <di:waypoint xsi:type="dc:Point" x="555" y="1650" />
+        <di:waypoint xsi:type="dc:Point" x="608" y="1650" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="573" y="1625" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0sezboq_di" bpmnElement="SequenceFlow_0sezboq">
+        <di:waypoint xsi:type="dc:Point" x="530" y="1675" />
+        <di:waypoint xsi:type="dc:Point" x="530" y="1768" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="1768" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="538" y="1710.0295234297107" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_16yhzej_di" bpmnElement="updateInfraRequest">
+        <dc:Bounds x="921" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_13uceka_di" bpmnElement="SequenceFlow_13uceka">
+        <di:waypoint xsi:type="dc:Point" x="1021" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="1065" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1043" y="248" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1qd3uwb_di" bpmnElement="ScriptTask_1qd3uwb">
+        <dc:Bounds x="772" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ky2sv9_di" bpmnElement="SequenceFlow_1ky2sv9">
+        <di:waypoint xsi:type="dc:Point" x="710" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="772" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="741" y="248" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0vj46ej_di" bpmnElement="SequenceFlow_0vj46ej">
+        <di:waypoint xsi:type="dc:Point" x="872" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="921" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="897" y="248" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_17doerz_di" bpmnElement="ScriptTask_17doerz">
+        <dc:Bounds x="54" y="1771" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0zq7i3q_di" bpmnElement="SequenceFlow_0zq7i3q">
+        <di:waypoint xsi:type="dc:Point" x="2" y="2068" />
+        <di:waypoint xsi:type="dc:Point" x="49" y="2068" />
+        <di:waypoint xsi:type="dc:Point" x="49" y="2067" />
+        <di:waypoint xsi:type="dc:Point" x="79" y="2067" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="18" y="2069" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="InclusiveGateway_0m9f5ka_di" bpmnElement="InclusiveGateway_0m9f5ka">
+        <dc:Bounds x="738" y="1743" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="763" y="1798" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0wyub4x_di" bpmnElement="ScriptTask_0wyub4x">
+        <dc:Bounds x="713" y="1827" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0sdb3on_di" bpmnElement="SequenceFlow_0sdb3on">
+        <di:waypoint xsi:type="dc:Point" x="104" y="1771" />
+        <di:waypoint xsi:type="dc:Point" x="104" y="1675" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="119" y="1713" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0f4u373_di" bpmnElement="SequenceFlow_0f4u373">
+        <di:waypoint xsi:type="dc:Point" x="763" y="1793" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="1827" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="778" y="1800" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1rabks0_di" bpmnElement="SequenceFlow_1rabks0">
+        <di:waypoint xsi:type="dc:Point" x="763" y="1907" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="1935" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="778" y="1911" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0hvcwa1_di" bpmnElement="SequenceFlow_0hvcwa1">
+        <di:waypoint xsi:type="dc:Point" x="407" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="456" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="432" y="248" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0w2alah_di" bpmnElement="DecomposeService">
+        <dc:Bounds x="307" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0cdtchu_di" bpmnElement="ScriptTask_0cdtchu">
+        <dc:Bounds x="171" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1eu60rt_di" bpmnElement="SequenceFlow_1eu60rt">
+        <di:waypoint xsi:type="dc:Point" x="132" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="171" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="152" y="238" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_00h6hmd_di" bpmnElement="SequenceFlow_00h6hmd">
+        <di:waypoint xsi:type="dc:Point" x="271" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="307" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="289" y="238" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
index 7a8133e..c58fec9 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
@@ -1,22 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pNTO8MRhEeWv36YLr7PC3Q" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_pNTO8MRhEeWv36YLr7PC3Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="CreateVfModuleInfra" name="CreateVfModuleInfra" isExecutable="true">
     <bpmn2:startEvent id="StartEvent_1" name="Start">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="PreProcessRequest"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="PreProcessRequest" />
     <bpmn2:callActivity id="DoCreateVfModuleSubprocess" name="Do Create Vf Module" calledElement="DoCreateVfModule">
       <bpmn2:extensionElements>
-        <camunda:in source="DoCreateVfModuleRequest" target="DoCreateVfModuleRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:in source="isVidRequest" target="isVidRequest"/>
-        <camunda:in source="newVfModuleId" target="newVfModuleId"/>
-        <camunda:out source="DCVFM_vnfId" target="CVFMI_vnfId"/>
-        <camunda:out source="DCVFM_vfModuleId" target="CVFMI_vfModuleId"/>
-        <camunda:out source="RollbackData" target="RollbackData"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:out source="WorkflowResponse" target="CVFMI_WorkflowResponse"/>
+        <camunda:in source="CVFMI_requestId" target="msoRequestId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="isVidRequest" target="isVidRequest" />
+        <camunda:in source="CVFMI_disableRollback" target="disableRollback" />
+        <camunda:out source="DCVFM_vnfId" target="CVFMI_vnfId" />
+        <camunda:out source="DCVFM_vfModuleId" target="CVFMI_vfModuleId" />
+        <camunda:out source="RollbackData" target="RollbackData" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="CVFMI_WorkflowResponse" />
+        <camunda:out source="DCVFM_vfModuleName" target="CVFMI_vfModuleName" />
+        <camunda:in source="CVFMI_vnfType" target="vnfType" />
+        <camunda:in source="CVFMI_vnfName" target="vnfName" />
+        <camunda:in source="CVFMI_vnfId" target="vnfId" />
+        <camunda:in source="CVFMI_vfModuleName" target="vfModuleName" />
+        <camunda:in source="CVFMI_vfModuleType" target="vfModuleType" />
+        <camunda:in source="CVFMI_volumeGroupId" target="volumeGroupId" />
+        <camunda:in source="CVFMI_volumeGroupName" target="volumeGroupName" />
+        <camunda:in source="CVFMI_isBaseVfModule" target="isBaseVfModule" />
+        <camunda:in source="CVFMI_asdcServiceModelVersion" target="asdcServiceModelVersion" />
+        <camunda:in source="CVFMI_serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="CVFMI_serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="CVFMI_vnfModelInfo" target="vnfModelInfo" />
+        <camunda:in source="CVFMI_globalSubscriberId" target="globalSubscriberId" />
+        <camunda:in source="CVFMI_sdncVersion" target="sdncVersion" />
+        <camunda:in source="CVFMI_lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="CVFMI_tenantId" target="tenantId" />
+        <camunda:in source="CVFMI_vfModuleId" target="vfModuleId" />
+        <camunda:in source="CVFMI_vfModuleModelInfo" target="vfModuleModelInfo" />
+        <camunda:in source="CVFMI_usePreload" target="usePreload" />
+        <camunda:in source="CVFMI_vfModuleInputParams" target="vfModuleInputParams" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
@@ -28,17 +48,17 @@
 def createVfModule = new CreateVfModuleInfra()
 createVfModule.sendResponse(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="SendResponse" targetRef="DoCreateVfModuleSubprocess"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="SendResponse" targetRef="DoCreateVfModuleSubprocess" />
     <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1" name="To FinishLine">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_34" name="FinishLine"/>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_34" name="FinishLine" />
     </bpmn2:intermediateThrowEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="DoCreateVfModuleSubprocess" targetRef="IntermediateThrowEvent_1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="DoCreateVfModuleSubprocess" targetRef="IntermediateThrowEvent_1" />
     <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" name="FinishLine">
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_35" name="FinishLine"/>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_35" name="FinishLine" />
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="IntermediateCatchEvent_1" targetRef="PrepareUpdateInfraRequest"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="IntermediateCatchEvent_1" targetRef="PrepareUpdateInfraRequest" />
     <bpmn2:scriptTask id="PrepareUpdateInfraRequest" name="Prepare Update Infra Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
@@ -49,7 +69,6 @@ createVfModule.prepareUpdateInfraRequest(execution)]]></bpmn2:script>
     <bpmn2:serviceTask id="ServiceTask_1" name="Update Infra Request">
       <bpmn2:extensionElements>
         <camunda:connector>
-          <camunda:connectorId>http-connector</camunda:connectorId>
           <camunda:inputOutput>
             <camunda:inputParameter name="url">${URN_mso_adapters_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
@@ -62,13 +81,14 @@ createVfModule.prepareUpdateInfraRequest(execution)]]></bpmn2:script>
             <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter>
             <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter>
           </camunda:inputOutput>
+          <camunda:connectorId>http-connector</camunda:connectorId>
         </camunda:connector>
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
     </bpmn2:serviceTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="PrepareUpdateInfraRequest" targetRef="ServiceTask_1"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ServiceTask_1" targetRef="UpdateInfraRequestResponseCheck"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="PrepareUpdateInfraRequest" targetRef="ServiceTask_1" />
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ServiceTask_1" targetRef="UpdateInfraRequestResponseCheck" />
     <bpmn2:scriptTask id="PrepareMSOCompletionHandler" name="Prepare MSO Completion Handler" scriptFormat="groovy">
       <bpmn2:incoming>updateInfraRequestResponseGood</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
@@ -76,15 +96,15 @@ createVfModule.prepareUpdateInfraRequest(execution)]]></bpmn2:script>
 def createVfModule = new CreateVfModuleInfra()
 createVfModule.postProcessResponse(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="PrepareMSOCompletionHandler" targetRef="MSOCompletionHandler"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="PrepareMSOCompletionHandler" targetRef="MSOCompletionHandler" />
     <bpmn2:callActivity id="MSOCompletionHandler" name="MSO Completion Handler" calledElement="CompleteMsoProcess">
       <bpmn2:extensionElements>
-        <camunda:in source="CVFMI_msoCompletionRequest" target="CompleteMsoProcessRequest"/>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:out source="CompleteMsoProcessResponse" target="CompleteMsoProcessResponse"/>
-        <camunda:out source="CMSO_ErrorResponse" target="CMSO_ErrorResponse"/>
+        <camunda:in source="CVFMI_msoCompletionRequest" target="CompleteMsoProcessRequest" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:out source="CompleteMsoProcessResponse" target="CompleteMsoProcessResponse" />
+        <camunda:out source="CMSO_ErrorResponse" target="CMSO_ErrorResponse" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
@@ -94,13 +114,13 @@ createVfModule.postProcessResponse(execution)]]></bpmn2:script>
       <bpmn2:outgoing>updateInfraRequestResponseBad</bpmn2:outgoing>
       <bpmn2:outgoing>updateInfraRequestResponseGood</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="updateInfraRequestResponseBad" name="no" sourceRef="UpdateInfraRequestResponseCheck" targetRef="EndEvent_2"/>
+    <bpmn2:sequenceFlow id="updateInfraRequestResponseBad" name="no" sourceRef="UpdateInfraRequestResponseCheck" targetRef="EndEvent_2" />
     <bpmn2:sequenceFlow id="updateInfraRequestResponseGood" name="yes" sourceRef="UpdateInfraRequestResponseCheck" targetRef="PrepareMSOCompletionHandler">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CVFMI_dbResponseCode" ) == '200'}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:endEvent id="EndEvent_2">
       <bpmn2:incoming>updateInfraRequestResponseBad</bpmn2:incoming>
-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_2" errorRef="Error_1"/>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_2" errorRef="Error_1" />
     </bpmn2:endEvent>
     <bpmn2:subProcess id="ErrorHandler" name="Error Handler" triggeredByEvent="true">
       <bpmn2:scriptTask id="ValidateRollbackResponse" name="Validate Rollback Response" scriptFormat="groovy">
@@ -110,37 +130,37 @@ createVfModule.postProcessResponse(execution)]]></bpmn2:script>
 def createVfModule = new CreateVfModuleInfra()
 createVfModule.validateRollbackResponse(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ValidateRollbackResponse" targetRef="InclusiveGateway_1"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ValidateRollbackResponse" targetRef="InclusiveGateway_1" />
       <bpmn2:callActivity id="ScriptTask_1" name="Do CreateVfModule Rollback" calledElement="DoCreateVfModuleRollback">
         <bpmn2:extensionElements>
-          <camunda:in source="RollbackData" target="RollbackData"/>
-          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-          <camunda:in source="isVidRequest" target="isVidRequest"/>
-          <camunda:out source="MSOWorkflowException" target="RollbackWorkflowException"/>
+          <camunda:in source="RollbackData" target="RollbackData" />
+          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+          <camunda:in source="isVidRequest" target="isVidRequest" />
+          <camunda:out source="MSOWorkflowException" target="RollbackWorkflowException" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
       </bpmn2:callActivity>
-      <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_1" targetRef="ValidateRollbackResponse"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_1" targetRef="ValidateRollbackResponse" />
       <bpmn2:startEvent id="StartEvent_2" name="Catch All Errors">
         <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1"/>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />
       </bpmn2:startEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="StartEvent_2" targetRef="ExclusiveGateway_1"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="StartEvent_2" targetRef="ExclusiveGateway_1" />
       <bpmn2:callActivity id="FalloutHandler" name="Fallout Handler" calledElement="FalloutHandler">
         <bpmn2:extensionElements>
-          <camunda:in source="CVFMI_FalloutHandlerRequest" target="FalloutHandlerRequest"/>
-          <camunda:in source="mso-request-id" target="mso-request-id"/>
-          <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
+          <camunda:in source="CVFMI_FalloutHandlerRequest" target="FalloutHandlerRequest" />
+          <camunda:in source="mso-request-id" target="mso-request-id" />
+          <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
       </bpmn2:callActivity>
-      <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="FalloutHandler" targetRef="EndEvent_3"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="FalloutHandler" targetRef="EndEvent_3" />
       <bpmn2:endEvent id="EndEvent_3">
         <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
-        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11"/>
+        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11" />
       </bpmn2:endEvent>
       <bpmn2:scriptTask id="PrepareFalloutHandler" name="Prepare Fallout Handler" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
@@ -149,19 +169,19 @@ createVfModule.validateRollbackResponse(execution)]]></bpmn2:script>
 def cvfm = new CreateVfModuleInfra()
 cvfm.falloutHandlerPrep(execution, 'CVFMI_FalloutHandlerRequest')]]></bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PrepareFalloutHandler" targetRef="FalloutHandler"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PrepareFalloutHandler" targetRef="FalloutHandler" />
       <bpmn2:inclusiveGateway id="InclusiveGateway_1">
         <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
         <bpmn2:incoming>isRollbackOnNoSequenceFlow</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
       </bpmn2:inclusiveGateway>
-      <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="InclusiveGateway_1" targetRef="PrepareFalloutHandler"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="InclusiveGateway_1" targetRef="PrepareFalloutHandler" />
       <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="Is Rollback On? " default="isRollbackOnNoSequenceFlow">
         <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
         <bpmn2:outgoing>isRollbackOnNoSequenceFlow</bpmn2:outgoing>
         <bpmn2:outgoing>IsRollbackOnYesSequenceFlow</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
-      <bpmn2:sequenceFlow id="isRollbackOnNoSequenceFlow" name="no" sourceRef="ExclusiveGateway_1" targetRef="InclusiveGateway_1"/>
+      <bpmn2:sequenceFlow id="isRollbackOnNoSequenceFlow" name="no" sourceRef="ExclusiveGateway_1" targetRef="InclusiveGateway_1" />
       <bpmn2:scriptTask id="LogAndSaveOriginalException" name="Log and Save Original Exception" scriptFormat="groovy">
         <bpmn2:incoming>IsRollbackOnYesSequenceFlow</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
@@ -172,7 +192,7 @@ cvfm.logAndSaveOriginalException(execution)]]></bpmn2:script>
       <bpmn2:sequenceFlow id="IsRollbackOnYesSequenceFlow" name="yes" sourceRef="ExclusiveGateway_1" targetRef="LogAndSaveOriginalException">
         <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CVFMI_rollbackEnabled") == true}]]></bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
-      <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="LogAndSaveOriginalException" targetRef="ScriptTask_1"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="LogAndSaveOriginalException" targetRef="ScriptTask_1" />
     </bpmn2:subProcess>
     <bpmn2:scriptTask id="SetSuccessIndicator" name="Set Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
@@ -181,18 +201,18 @@ cvfm.logAndSaveOriginalException(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:endEvent id="EndEvent_1">
       <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_10"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_10" />
     </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="MSOCompletionHandler" targetRef="SetSuccessIndicator"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="SetSuccessIndicator" targetRef="EndEvent_1"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="MSOCompletionHandler" targetRef="SetSuccessIndicator" />
+    <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="SetSuccessIndicator" targetRef="EndEvent_1" />
     <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="ErrorHandler">
       <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_3"/>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_3" />
     </bpmn2:boundaryEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="BoundaryEvent_1" targetRef="EndEvent_4"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="BoundaryEvent_1" targetRef="EndEvent_4" />
     <bpmn2:endEvent id="EndEvent_4">
       <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_12"/>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_12" />
     </bpmn2:endEvent>
     <bpmn2:scriptTask id="PreProcessRequest" name="Pre-Process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
@@ -201,272 +221,272 @@ cvfm.logAndSaveOriginalException(execution)]]></bpmn2:script>
 def createVfModule = new CreateVfModuleInfra()
 createVfModule.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="PreProcessRequest" targetRef="SendResponse"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="PreProcessRequest" targetRef="SendResponse" />
   </bpmn2:process>
-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSOWorkflowException"/>
-  <bpmn2:error id="Error_2" errorCode="RESTFault" name="REST Fault"/>
+  <bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_2" name="REST Fault" errorCode="RESTFault" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateVfModuleInfra">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="StartEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="41.0" y="231.0"/>
+        <dc:Bounds x="41" y="231" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ScriptTask_124">
-        <di:waypoint xsi:type="dc:Point" x="77.0" y="249.0"/>
-        <di:waypoint xsi:type="dc:Point" x="226.0" y="249.0"/>
+        <di:waypoint xsi:type="dc:Point" x="77" y="249" />
+        <di:waypoint xsi:type="dc:Point" x="226" y="249" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="99.0" y="249.0"/>
+          <dc:Bounds x="99" y="249" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_124" bpmnElement="PreProcessRequest">
-        <dc:Bounds height="80.0" width="100.0" x="226.0" y="209.0"/>
+        <dc:Bounds x="226" y="209" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_86" bpmnElement="SendResponse">
-        <dc:Bounds height="80.0" width="100.0" x="432.0" y="209.0"/>
+        <dc:Bounds x="432" y="209" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_124" targetElement="_BPMNShape_ServiceTask_86">
-        <di:waypoint xsi:type="dc:Point" x="326.0" y="249.0"/>
-        <di:waypoint xsi:type="dc:Point" x="432.0" y="249.0"/>
+        <di:waypoint xsi:type="dc:Point" x="326" y="249" />
+        <di:waypoint xsi:type="dc:Point" x="432" y="249" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="348.0" y="249.0"/>
+          <dc:Bounds x="348" y="249" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_178" bpmnElement="DoCreateVfModuleSubprocess">
-        <dc:Bounds height="80.0" width="145.0" x="612.0" y="209.0"/>
+        <dc:Bounds x="612" y="209" width="145" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ServiceTask_86" targetElement="_BPMNShape_ScriptTask_178">
-        <di:waypoint xsi:type="dc:Point" x="532.0" y="249.0"/>
-        <di:waypoint xsi:type="dc:Point" x="612.0" y="249.0"/>
+        <di:waypoint xsi:type="dc:Point" x="532" y="249" />
+        <di:waypoint xsi:type="dc:Point" x="612" y="249" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_47" bpmnElement="IntermediateThrowEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="823.0" y="231.0"/>
+        <dc:Bounds x="823" y="231" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="841.0" y="272.0"/>
+          <dc:Bounds x="841" y="272" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_178" targetElement="_BPMNShape_IntermediateThrowEvent_47">
-        <di:waypoint xsi:type="dc:Point" x="756.0" y="249.0"/>
-        <di:waypoint xsi:type="dc:Point" x="823.0" y="249.0"/>
+        <di:waypoint xsi:type="dc:Point" x="756" y="249" />
+        <di:waypoint xsi:type="dc:Point" x="823" y="249" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_32" bpmnElement="IntermediateCatchEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="39.0" y="349.0"/>
+        <dc:Bounds x="39" y="349" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="65.0" x="25.0" y="390.0"/>
+          <dc:Bounds x="25" y="390" width="65" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_219" bpmnElement="PrepareUpdateInfraRequest">
-        <dc:Bounds height="80.0" width="100.0" x="127.0" y="327.0"/>
+        <dc:Bounds x="127" y="327" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_103" bpmnElement="ServiceTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="277.0" y="327.0"/>
+        <dc:Bounds x="277" y="327" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_179" bpmnElement="UpdateInfraRequestResponseCheck" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="443.0" y="341.0"/>
+        <dc:Bounds x="443" y="341" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="68.0" x="435.0" y="308.0"/>
+          <dc:Bounds x="435" y="308" width="68" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_220" bpmnElement="PrepareMSOCompletionHandler">
-        <dc:Bounds height="80.0" width="100.0" x="552.0" y="327.0"/>
+        <dc:Bounds x="552" y="327" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_221" bpmnElement="MSOCompletionHandler">
-        <dc:Bounds height="80.0" width="100.0" x="708.0" y="327.0"/>
+        <dc:Bounds x="708" y="327" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="1020.0" y="349.0"/>
+        <dc:Bounds x="1020" y="349" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="1038.0" y="390.0"/>
+          <dc:Bounds x="1038" y="390" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_178" bpmnElement="EndEvent_2">
-        <dc:Bounds height="36.0" width="36.0" x="452.0" y="469.0"/>
+        <dc:Bounds x="452" y="469" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="470.0" y="510.0"/>
+          <dc:Bounds x="470" y="510" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_IntermediateCatchEvent_32" targetElement="_BPMNShape_ScriptTask_219">
-        <di:waypoint xsi:type="dc:Point" x="75.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="127.0" y="367.0"/>
+        <di:waypoint xsi:type="dc:Point" x="75" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="127" y="367" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="105.0" y="367.0"/>
+          <dc:Bounds x="105" y="367" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_219" targetElement="_BPMNShape_ServiceTask_103">
-        <di:waypoint xsi:type="dc:Point" x="227.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="277.0" y="367.0"/>
+        <di:waypoint xsi:type="dc:Point" x="227" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="277" y="367" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ServiceTask_103" targetElement="_BPMNShape_ExclusiveGateway_179">
-        <di:waypoint xsi:type="dc:Point" x="377.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="410.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="410.0" y="366.0"/>
-        <di:waypoint xsi:type="dc:Point" x="443.0" y="366.0"/>
+        <di:waypoint xsi:type="dc:Point" x="377" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="410" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="410" y="366" />
+        <di:waypoint xsi:type="dc:Point" x="443" y="366" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="407.0" y="366.0"/>
+          <dc:Bounds x="407" y="366" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="updateInfraRequestResponseBad" sourceElement="_BPMNShape_ExclusiveGateway_179" targetElement="_BPMNShape_EndEvent_178">
-        <di:waypoint xsi:type="dc:Point" x="468.0" y="391.0"/>
-        <di:waypoint xsi:type="dc:Point" x="469.0" y="421.0"/>
-        <di:waypoint xsi:type="dc:Point" x="470.0" y="421.0"/>
-        <di:waypoint xsi:type="dc:Point" x="470.0" y="469.0"/>
+        <di:waypoint xsi:type="dc:Point" x="468" y="391" />
+        <di:waypoint xsi:type="dc:Point" x="469" y="421" />
+        <di:waypoint xsi:type="dc:Point" x="470" y="421" />
+        <di:waypoint xsi:type="dc:Point" x="470" y="469" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="20.0" x="459.0" y="419.0"/>
+          <dc:Bounds x="459" y="419" width="20" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="updateInfraRequestResponseGood" sourceElement="_BPMNShape_ExclusiveGateway_179" targetElement="_BPMNShape_ScriptTask_220">
-        <di:waypoint xsi:type="dc:Point" x="493.0" y="366.0"/>
-        <di:waypoint xsi:type="dc:Point" x="523.0" y="366.0"/>
-        <di:waypoint xsi:type="dc:Point" x="523.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="552.0" y="367.0"/>
+        <di:waypoint xsi:type="dc:Point" x="493" y="366" />
+        <di:waypoint xsi:type="dc:Point" x="523" y="366" />
+        <di:waypoint xsi:type="dc:Point" x="523" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="552" y="367" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="27.0" x="510.0" y="367.0"/>
+          <dc:Bounds x="510" y="367" width="27" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_220" targetElement="_BPMNShape_ScriptTask_221">
-        <di:waypoint xsi:type="dc:Point" x="652.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="708.0" y="367.0"/>
+        <di:waypoint xsi:type="dc:Point" x="652" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="708" y="367" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="678.0" y="367.0"/>
+          <dc:Bounds x="678" y="367" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_20" bpmnElement="ErrorHandler" isExpanded="true">
-        <dc:Bounds height="385.0" width="925.0" x="48.0" y="540.0"/>
+        <dc:Bounds x="48" y="540" width="925" height="385" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_54" bpmnElement="StartEvent_2">
-        <dc:Bounds height="36.0" width="36.0" x="72.0" y="844.0"/>
+        <dc:Bounds x="72" y="844" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="98.0" x="60.0" y="886.0"/>
+          <dc:Bounds x="60" y="886" width="98" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_222" bpmnElement="PrepareFalloutHandler">
-        <dc:Bounds height="80.0" width="100.0" x="564.0" y="672.0"/>
+        <dc:Bounds x="564" y="672" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_223" bpmnElement="FalloutHandler">
-        <dc:Bounds height="80.0" width="100.0" x="708.0" y="672.0"/>
+        <dc:Bounds x="708" y="672" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_179" bpmnElement="EndEvent_3">
-        <dc:Bounds height="36.0" width="36.0" x="864.0" y="694.0"/>
+        <dc:Bounds x="864" y="694" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="882.0" y="735.0"/>
+          <dc:Bounds x="882" y="735" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_44" bpmnElement="BoundaryEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="955.0" y="690.0"/>
+        <dc:Bounds x="955" y="690" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="970.0" y="731.0"/>
+          <dc:Bounds x="970" y="731" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_180" bpmnElement="EndEvent_4">
-        <dc:Bounds height="36.0" width="36.0" x="1049.0" y="690.0"/>
+        <dc:Bounds x="1049" y="690" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="1067.0" y="731.0"/>
+          <dc:Bounds x="1067" y="731" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_222" targetElement="_BPMNShape_ScriptTask_223">
-        <di:waypoint xsi:type="dc:Point" x="664.0" y="712.0"/>
-        <di:waypoint xsi:type="dc:Point" x="708.0" y="712.0"/>
+        <di:waypoint xsi:type="dc:Point" x="664" y="712" />
+        <di:waypoint xsi:type="dc:Point" x="708" y="712" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="689.0" y="712.0"/>
+          <dc:Bounds x="689" y="712" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_223" targetElement="_BPMNShape_EndEvent_179">
-        <di:waypoint xsi:type="dc:Point" x="808.0" y="712.0"/>
-        <di:waypoint xsi:type="dc:Point" x="864.0" y="712.0"/>
+        <di:waypoint xsi:type="dc:Point" x="808" y="712" />
+        <di:waypoint xsi:type="dc:Point" x="864" y="712" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="836.0" y="712.0"/>
+          <dc:Bounds x="836" y="712" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_BoundaryEvent_44" targetElement="_BPMNShape_EndEvent_180">
-        <di:waypoint xsi:type="dc:Point" x="991.0" y="708.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1049.0" y="708.0"/>
+        <di:waypoint xsi:type="dc:Point" x="991" y="708" />
+        <di:waypoint xsi:type="dc:Point" x="1049" y="708" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1015.0" y="708.0"/>
+          <dc:Bounds x="1015" y="708" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_241" bpmnElement="SetSuccessIndicator">
-        <dc:Bounds height="79.0" width="103.0" x="858.0" y="328.0"/>
+        <dc:Bounds x="858" y="328" width="103" height="79" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_221" targetElement="_BPMNShape_ScriptTask_241">
-        <di:waypoint xsi:type="dc:Point" x="808.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="858.0" y="367.0"/>
+        <di:waypoint xsi:type="dc:Point" x="808" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="858" y="367" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ScriptTask_241" targetElement="_BPMNShape_EndEvent_177">
-        <di:waypoint xsi:type="dc:Point" x="960.0" y="367.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1020.0" y="367.0"/>
+        <di:waypoint xsi:type="dc:Point" x="960" y="367" />
+        <di:waypoint xsi:type="dc:Point" x="1020" y="367" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_223" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="205.0" y="836.0"/>
+        <dc:Bounds x="205" y="836" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="102.0" x="193.0" y="901.0"/>
+          <dc:Bounds x="193" y="901" width="102" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_266" bpmnElement="ValidateRollbackResponse">
-        <dc:Bounds height="79.0" width="103.0" x="312.0" y="554.0"/>
+        <dc:Bounds x="312" y="554" width="103" height="79" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_25" bpmnElement="InclusiveGateway_1">
-        <dc:Bounds height="50.0" width="50.0" x="459.0" y="686.0"/>
+        <dc:Bounds x="459" y="686" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="484.0" y="741.0"/>
+          <dc:Bounds x="484" y="741" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_StartEvent_54" targetElement="_BPMNShape_ExclusiveGateway_223">
-        <di:waypoint xsi:type="dc:Point" x="108.0" y="862.0"/>
-        <di:waypoint xsi:type="dc:Point" x="156.0" y="862.0"/>
-        <di:waypoint xsi:type="dc:Point" x="156.0" y="861.0"/>
-        <di:waypoint xsi:type="dc:Point" x="205.0" y="861.0"/>
+        <di:waypoint xsi:type="dc:Point" x="108" y="862" />
+        <di:waypoint xsi:type="dc:Point" x="156" y="862" />
+        <di:waypoint xsi:type="dc:Point" x="156" y="861" />
+        <di:waypoint xsi:type="dc:Point" x="205" y="861" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="153.0" y="862.0"/>
+          <dc:Bounds x="153" y="862" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="isRollbackOnNoSequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_InclusiveGateway_25">
-        <di:waypoint xsi:type="dc:Point" x="255.0" y="861.0"/>
-        <di:waypoint xsi:type="dc:Point" x="354.0" y="861.0"/>
-        <di:waypoint xsi:type="dc:Point" x="354.0" y="711.0"/>
-        <di:waypoint xsi:type="dc:Point" x="459.0" y="711.0"/>
+        <di:waypoint xsi:type="dc:Point" x="255" y="861" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="861" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="711" />
+        <di:waypoint xsi:type="dc:Point" x="459" y="711" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="20.0" x="324.0" y="866.0"/>
+          <dc:Bounds x="324" y="866" width="20" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ScriptTask_266" targetElement="_BPMNShape_InclusiveGateway_25">
-        <di:waypoint xsi:type="dc:Point" x="414.0" y="593.0"/>
-        <di:waypoint xsi:type="dc:Point" x="484.0" y="593.0"/>
-        <di:waypoint xsi:type="dc:Point" x="484.0" y="686.0"/>
+        <di:waypoint xsi:type="dc:Point" x="414" y="593" />
+        <di:waypoint xsi:type="dc:Point" x="484" y="593" />
+        <di:waypoint xsi:type="dc:Point" x="484" y="686" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="462.0" y="593.0"/>
+          <dc:Bounds x="462" y="593" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_InclusiveGateway_25" targetElement="_BPMNShape_ScriptTask_222">
-        <di:waypoint xsi:type="dc:Point" x="509.0" y="711.0"/>
-        <di:waypoint xsi:type="dc:Point" x="527.0" y="711.0"/>
-        <di:waypoint xsi:type="dc:Point" x="527.0" y="712.0"/>
-        <di:waypoint xsi:type="dc:Point" x="564.0" y="712.0"/>
+        <di:waypoint xsi:type="dc:Point" x="509" y="711" />
+        <di:waypoint xsi:type="dc:Point" x="527" y="711" />
+        <di:waypoint xsi:type="dc:Point" x="527" y="712" />
+        <di:waypoint xsi:type="dc:Point" x="564" y="712" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="533.0" y="712.0"/>
+          <dc:Bounds x="533" y="712" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_267" bpmnElement="ScriptTask_1">
-        <dc:Bounds height="79.0" width="103.0" x="179.0" y="554.0"/>
+        <dc:Bounds x="179" y="554" width="103" height="79" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_267" targetElement="_BPMNShape_ScriptTask_266">
-        <di:waypoint xsi:type="dc:Point" x="281.0" y="593.0"/>
-        <di:waypoint xsi:type="dc:Point" x="312.0" y="593.0"/>
+        <di:waypoint xsi:type="dc:Point" x="281" y="593" />
+        <di:waypoint xsi:type="dc:Point" x="312" y="593" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="294.0" y="593.0"/>
+          <dc:Bounds x="294" y="593" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_283" bpmnElement="LogAndSaveOriginalException">
-        <dc:Bounds height="79.0" width="103.0" x="179.0" y="693.0"/>
+        <dc:Bounds x="179" y="693" width="103" height="79" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="IsRollbackOnYesSequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_ScriptTask_283">
-        <di:waypoint xsi:type="dc:Point" x="230.0" y="836.0"/>
-        <di:waypoint xsi:type="dc:Point" x="230.0" y="771.0"/>
+        <di:waypoint xsi:type="dc:Point" x="230" y="836" />
+        <di:waypoint xsi:type="dc:Point" x="230" y="771" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="27.0" x="240.0" y="804.0"/>
+          <dc:Bounds x="240" y="804" width="27" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ScriptTask_283" targetElement="_BPMNShape_ScriptTask_267">
-        <di:waypoint xsi:type="dc:Point" x="230.0" y="693.0"/>
-        <di:waypoint xsi:type="dc:Point" x="230.0" y="632.0"/>
+        <di:waypoint xsi:type="dc:Point" x="230" y="693" />
+        <di:waypoint xsi:type="dc:Point" x="230" y="632" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn
index e8d27b6..b10e98b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn
@@ -23,7 +23,7 @@ createVnf.sendSyncResponse(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="sendResponse" targetRef="CreateVNF" />
     <bpmn2:callActivity id="CreateVNF" name="Create VNF" calledElement="DoCreateVnf">
       <bpmn2:extensionElements>
-        <camunda:in source="CREVI_requestId" target="requestId" />
+        <camunda:in source="CREVI_requestId" target="msoRequestId" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:in source="CREVI_serviceInstanceId" target="serviceInstanceId" />
         <camunda:in source="CREVI_suppressRollback" target="disableRollback" />
@@ -31,12 +31,13 @@ createVnf.sendSyncResponse(execution)]]></bpmn2:script>
         <camunda:in source="CREVI_vnfType" target="vnfType" />
         <camunda:in source="CREVI_vnfName" target="vnfName" />
         <camunda:in source="CREVI_vnfId" target="vnfId" />
-        <camunda:in source="CREVI_cloudConfiguration" target="cloudConfiguration" />
         <camunda:in source="CREVI_serviceId" target="productFamilyId" />
         <camunda:in source="CREVI_vnfInputParameters" target="vnfInputParameters" />
         <camunda:out source="vnfId" target="CREVI_vnfId" />
         <camunda:out source="vnfOutputParameters" target="CREVI_vnfOutputParameters" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="CREVI_lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="CREVI_tenantId" target="tenandId" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0lso26t</bpmn2:outgoing>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericALaCarteServiceInstance.bpmn
index 4488e8d..ceb0c72 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericALaCarteServiceInstance.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="DelServiceInstance" name="DelServiceInstance" isExecutable="true">
+  <bpmn2:process id="DeleteGenericALaCarteServiceInstance" name="DeleteGenericALaCarteServiceInstance" isExecutable="true">
     <bpmn2:startEvent id="deleteSI_startEvent" name="Delete SI Start Flow">
       <bpmn2:outgoing>SequenceFlow_0lp2z7l</bpmn2:outgoing>
     </bpmn2:startEvent>
@@ -8,7 +8,7 @@
       <bpmn2:scriptTask id="ScriptTask_1" name="Handle Unexpected Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.utils.*
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
 ex.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -47,16 +47,16 @@ ex.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_0pvcr6j" name="Pre Process Incoming Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0lp2z7l</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ktadna</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi= new DelServiceInstance()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def csi= new DeleteGenericALaCarteServiceInstance()
 csi.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0lp2z7l" sourceRef="deleteSI_startEvent" targetRef="ScriptTask_0pvcr6j" />
     <bpmn2:scriptTask id="ScriptTask_0cihgpv" name="Prepare Completion Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1qjygj5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0xxvjxq</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new DelServiceInstance()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def csi = new DeleteGenericALaCarteServiceInstance()
 csi.prepareCompletionRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallActivity_0sevgre" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
@@ -83,8 +83,8 @@ csi.prepareCompletionRequest(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="ScriptTask_1hql91g" name="Prepare Fallout Request" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_14eadeb</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1reso2f</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new DelServiceInstance()
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def csi = new DeleteGenericALaCarteServiceInstance()
 csi.prepareFalloutRequest(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:callActivity id="CallActivity_1ksm1dz" name="Call FalloutHandler" calledElement="FalloutHandler">
@@ -105,8 +105,8 @@ csi.prepareFalloutRequest(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="ScriptTask_0o4smqp" name="Send Error Response">
         <bpmn2:incoming>SequenceFlow_0n4umjf</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_14eadeb</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new  DelServiceInstance()
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def csi = new  DeleteGenericALaCarteServiceInstance()
 csi.sendSyncError(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_14eadeb" sourceRef="ScriptTask_0o4smqp" targetRef="ScriptTask_1hql91g" />
@@ -116,8 +116,8 @@ csi.sendSyncError(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_1nko5zz" name="Send Sync Ack Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0ktadna</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0eto8sn</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new  DelServiceInstance()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def csi = new  DeleteGenericALaCarteServiceInstance()
 csi.sendSyncResponse(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0ktadna" sourceRef="ScriptTask_0pvcr6j" targetRef="Task_1nko5zz" />
@@ -138,7 +138,7 @@ csi.sendSyncResponse(execution)]]></bpmn2:script>
   <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DelServiceInstance">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteGenericALaCarteServiceInstance">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteSI_startEvent">
         <dc:Bounds x="117" y="79" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -328,4 +328,4 @@ csi.sendSyncResponse(execution)]]></bpmn2:script>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
+</bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn
index eeb3259..bb2c487 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn
@@ -1,771 +1,773 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="DeleteGenericMacroServiceNetworkVnf" name="DeleteGenericMacroServiceNetworkVnf" isExecutable="true">

-    <bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DeleteGenericMacroServiceNetworkVnf" name="DeleteGenericMacroServiceNetworkVnf" isExecutable="true">
+    <bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.sendSyncResponse(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="sendSyncAckResponse_ScriptTask" targetRef="IntermediateThrowEvent_2" />

-    <bpmn2:startEvent id="createVIPR_startEvent" name="Start Flow">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createVIPR_startEvent" targetRef="preProcessRequest_ScriptTask" />

-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.sendSyncResponse(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="sendSyncAckResponse_ScriptTask" targetRef="IntermediateThrowEvent_2" />
+    <bpmn2:startEvent id="createVIPR_startEvent" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createVIPR_startEvent" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask" />

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="vIPR-ATM">

-      <bpmn2:outgoing>SequenceFlow_10o22u2</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_37" name="vIPR-ATM" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process &#38; Completion Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_12ilko1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="vIPR-ATM">
+      <bpmn2:outgoing>SequenceFlow_10o22u2</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_37" name="vIPR-ATM" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process &#38; Completion Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_12ilko1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.postProcessResponse(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="callCompleteMsoProcess_CallActivity" />

-    <bpmn2:callActivity id="callCompleteMsoProcess_CallActivity" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">

-      <bpmn2:extensionElements>

-        <camunda:in variables="all" />

-        <camunda:out variables="all" />

-        <camunda:in source="DELVAS_CompleteMsoProcessRequest" target="CompleteMsoProcessRequest" />

-        <camunda:in source="requestId" target="requestId" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:out source="CMSO_ResponseCode" target="CMSO_ResponseCode" />

-        <camunda:out source="CompleteMsoProcessResponse" target="CompleteMsoProcessResponse" />

-        <camunda:out source="CMSO_ErrorResponse" target="CMSO_ErrorResponse" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="callCompleteMsoProcess_CallActivity" targetRef="ScriptTask_2" />

-    <bpmn2:scriptTask id="ScriptTask_2" name="Set Success Indicator" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

-      <bpmn2:script><![CDATA[// The following variable is checked by the unit test

-execution.setVariable("DeleteGenericMacroServiceNetworkVnfSuccessIndicator", true)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_2" targetRef="DeleteVIPR_EndEvent" />

-    <bpmn2:endEvent id="DeleteVIPR_EndEvent" name="End">

-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_13" />

-    </bpmn2:endEvent>

-    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_1">

-        <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" errorRef="Error_1" />

-      </bpmn2:startEvent>

-      <bpmn2:endEvent id="EndEvent_1">

-        <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />

-      <bpmn2:scriptTask id="ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.postProcessResponse(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="callCompleteMsoProcess_CallActivity" />
+    <bpmn2:callActivity id="callCompleteMsoProcess_CallActivity" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
+      <bpmn2:extensionElements>
+        <camunda:in variables="all" />
+        <camunda:out variables="all" />
+        <camunda:in source="DELVAS_CompleteMsoProcessRequest" target="CompleteMsoProcessRequest" />
+        <camunda:in source="requestId" target="requestId" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:out source="CMSO_ResponseCode" target="CMSO_ResponseCode" />
+        <camunda:out source="CompleteMsoProcessResponse" target="CompleteMsoProcessResponse" />
+        <camunda:out source="CMSO_ErrorResponse" target="CMSO_ErrorResponse" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="callCompleteMsoProcess_CallActivity" targetRef="ScriptTask_2" />
+    <bpmn2:scriptTask id="ScriptTask_2" name="Set Success Indicator" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[// The following variable is checked by the unit test
+execution.setVariable("DeleteGenericMacroServiceNetworkVnfSuccessIndicator", true)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_2" targetRef="DeleteVIPR_EndEvent" />
+    <bpmn2:endEvent id="DeleteVIPR_EndEvent" name="End">
+      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_13" />
+    </bpmn2:endEvent>
+    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_1">
+        <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" errorRef="Error_1" />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_1">
+        <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />
+      <bpmn2:scriptTask id="ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteServiceInstanceInfra = new DeleteServiceInstanceInfra()

-DeleteServiceInstanceInfra.processJavaException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />

-    </bpmn2:subProcess>

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_4" name="FinishProcess">

-      <bpmn2:outgoing>SequenceFlow_12ilko1</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_39" name="FinishProcess" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:callActivity id="doDeleteNetworkInstance_CallActivity" name="DoDelete&#10;Network&#10;Instance" calledElement="DoDeleteNetworkInstance">

-      <bpmn2:extensionElements>

-        <camunda:in source="msoRequestId" target="msoRequestId" />

-        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />

-        <camunda:in source="tenantId" target="tenantId" />

-        <camunda:in source="disableRollback" target="disableRollback" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

-        <camunda:in source="failIfExists" target="failIfExists" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="rollbackData" target="DELNWKI_rollbackData" />

-        <camunda:out source="rolledBack" target="DELNWKI_rolledBack" />

-        <camunda:out source="wasDeleted" target="wasDeleted" />

-        <camunda:in source="networkId" target="networkId" />

-        <camunda:in source="sdncVersion" target="sdncVersion" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1bwbn7r</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_12ag2bk</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:scriptTask id="ScriptTask_PrepareNetworkDelete" name="Prepare for Network Delete" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0cmebdc</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_0dfkfh1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1bwbn7r</bpmn2:outgoing>

+def DeleteServiceInstanceInfra = new DeleteServiceInstanceInfra()
+DeleteServiceInstanceInfra.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
+    </bpmn2:subProcess>
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_4" name="FinishProcess">
+      <bpmn2:outgoing>SequenceFlow_12ilko1</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_39" name="FinishProcess" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:callActivity id="doDeleteNetworkInstance_CallActivity" name="DoDelete&#10;Network&#10;Instance" calledElement="DoDeleteNetworkInstance">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="disableRollback" target="disableRollback" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="failIfExists" target="failIfExists" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="rollbackData" target="DELNWKI_rollbackData" />
+        <camunda:out source="rolledBack" target="DELNWKI_rolledBack" />
+        <camunda:out source="wasDeleted" target="wasDeleted" />
+        <camunda:in source="networkId" target="networkId" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1bwbn7r</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_12ag2bk</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_PrepareNetworkDelete" name="Prepare for Network Delete" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0cmebdc</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0dfkfh1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1bwbn7r</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.prepareNetworkDelete(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:callActivity id="doDeleteServiceInstance_CallActivity" name="DoDelete&#10;ServiceInstance&#10;" calledElement="DoDeleteServiceInstance">

-      <bpmn2:extensionElements>

-        <camunda:in source="msoRequestId" target="msoRequestId" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:out source="rollbackData" target="DCRESI_rollbackData" />

-        <camunda:in source="failExists" target="failExists" />

-        <camunda:in source="disableRollback" target="disableRollback" />

-        <camunda:out source="rolledBack" target="DCRESI_rolledBack" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

-        <camunda:in source="sdncVersion" target="sdncVersion" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_10o22u2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_04ao07f</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:callActivity id="doDeleteVNFandModules_CallActivity" name="DoDelete&#10;VNF and Modules&#10;" calledElement="DoDeleteVnfAndModules">

-      <bpmn2:extensionElements>

-        <camunda:in source="msoRequestId" target="msoRequestId" />

-        <camunda:in source="disableRollback" target="disableRollback" />

-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />

-        <camunda:in source="vnftId" target="vnftId" />

-        <camunda:in source="sdncVersion" target="sdncVersion" />

-        <camunda:out source="rollbackData" target="rollbackData" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="rolledBack" target="rolledBack" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1h77psn</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1dmn40p</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:scriptTask id="ScriptTask_3" name="Prepare to Delete VNF" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0bvecvm</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_0mr8jgt</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1h77psn</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.prepareNetworkDelete(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="doDeleteServiceInstance_CallActivity" name="DoDelete&#10;ServiceInstance&#10;" calledElement="DoDeleteServiceInstance">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:out source="rollbackData" target="DCRESI_rollbackData" />
+        <camunda:in source="failExists" target="failExists" />
+        <camunda:in source="disableRollback" target="disableRollback" />
+        <camunda:out source="rolledBack" target="DCRESI_rolledBack" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_10o22u2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_04ao07f</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:callActivity id="doDeleteVNFandModules_CallActivity" name="DoDelete&#10;VNF and Modules&#10;" calledElement="DoDeleteVnfAndModules">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="disableRollback" target="disableRollback" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="vnfId" target="vnfId" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
+        <camunda:out source="rollbackData" target="rollbackData" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="rolledBack" target="rolledBack" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1h77psn</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1dmn40p</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_3" name="Prepare to Delete VNF" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0bvecvm</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0mr8jgt</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1h77psn</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.prepareVnfAndModulesDelete(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_4" name="GoToStartNetworks">

-      <bpmn2:incoming>SequenceFlow_0xowenu</bpmn2:incoming>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_41" name="StartNetworks" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="GoQueryServiceInstance">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_38" name="QueryServiceInstance" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:subProcess id="SubProcess_0s6hpty" name="Subprocess For Exception / FalloutHandler " triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_1bwmffk" name="Fault Start">

-        <bpmn2:outgoing>SequenceFlow_06llof4</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition />

-      </bpmn2:startEvent>

-      <bpmn2:callActivity id="CallActivity_0jw5tqa" name="Call FalloutHandlerV1" calledElement="FalloutHandler">

-        <bpmn2:extensionElements>

-          <camunda:in source="DELVAS_falloutRequest" target="FalloutHandlerRequest" />

-          <camunda:in source="msoRequestId" target="mso-request-id" />

-          <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

-          <camunda:out source="FH_ResponseCode" target="FH_ResponseCode" />

-          <camunda:out source="FalloutHandlerResponse" target="FalloutHandlerResponse" />

-          <camunda:out source="FH_ErrorResponse" target="FH_ErrorResponse" />

-        </bpmn2:extensionElements>

-        <bpmn2:incoming>SequenceFlow_0807ukc</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_19yywk8</bpmn2:outgoing>

-      </bpmn2:callActivity>

-      <bpmn2:endEvent id="EndEvent_04xute7">

-        <bpmn2:incoming>SequenceFlow_19yywk8</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:scriptTask id="ScriptTask_0yk02h3" name="Prepare FalloutHandler" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_06llof4</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0807ukc</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.prepareVnfAndModulesDelete(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_4" name="GoToStartNetworks">
+      <bpmn2:incoming>SequenceFlow_0xowenu</bpmn2:incoming>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_41" name="StartNetworks" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="GoQueryServiceInstance">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_38" name="QueryServiceInstance" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:subProcess id="SubProcess_0s6hpty" name="Subprocess For Exception / FalloutHandler " triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_1bwmffk" name="Fault Start">
+        <bpmn2:outgoing>SequenceFlow_06llof4</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition />
+      </bpmn2:startEvent>
+      <bpmn2:callActivity id="CallActivity_0jw5tqa" name="Call FalloutHandlerV1" calledElement="FalloutHandler">
+        <bpmn2:extensionElements>
+          <camunda:in source="DELVAS_falloutRequest" target="FalloutHandlerRequest" />
+          <camunda:in source="msoRequestId" target="mso-request-id" />
+          <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+          <camunda:out source="FH_ResponseCode" target="FH_ResponseCode" />
+          <camunda:out source="FalloutHandlerResponse" target="FalloutHandlerResponse" />
+          <camunda:out source="FH_ErrorResponse" target="FH_ErrorResponse" />
+        </bpmn2:extensionElements>
+        <bpmn2:incoming>SequenceFlow_0807ukc</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_19yywk8</bpmn2:outgoing>
+      </bpmn2:callActivity>
+      <bpmn2:endEvent id="EndEvent_04xute7">
+        <bpmn2:incoming>SequenceFlow_19yywk8</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:scriptTask id="ScriptTask_0yk02h3" name="Prepare FalloutHandler" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_06llof4</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0807ukc</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.prepareFalloutRequest(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_0807ukc" sourceRef="ScriptTask_0yk02h3" targetRef="CallActivity_0jw5tqa" />

-      <bpmn2:sequenceFlow id="SequenceFlow_19yywk8" sourceRef="CallActivity_0jw5tqa" targetRef="EndEvent_04xute7" />

-      <bpmn2:sequenceFlow id="SequenceFlow_06llof4" sourceRef="StartEvent_1bwmffk" targetRef="ScriptTask_0yk02h3" />

-    </bpmn2:subProcess>

-    <bpmn2:sequenceFlow id="SequenceFlow_10o22u2" sourceRef="IntermediateCatchEvent_3" targetRef="doDeleteServiceInstance_CallActivity" />

-    <bpmn2:sequenceFlow id="SequenceFlow_12ilko1" sourceRef="IntermediateCatchEvent_4" targetRef="postProcessAndCompletionRequest_ScriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1bwbn7r" sourceRef="ScriptTask_PrepareNetworkDelete" targetRef="doDeleteNetworkInstance_CallActivity" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1n7r495" name="No" sourceRef="ExclusiveGateway_0fe690i" targetRef="ExclusiveGateway_1os8cm5" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1h77psn" sourceRef="ScriptTask_3" targetRef="doDeleteVNFandModules_CallActivity" />

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1nh09nr" name="StartNetworks">

-      <bpmn2:outgoing>SequenceFlow_1vwssu7</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition name="StartNetworks" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0prlju0" name="GoTo FinishProcess">

-      <bpmn2:incoming>SequenceFlow_04ao07f</bpmn2:incoming>

-      <bpmn2:linkEventDefinition name="FinishProcess" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0b9wd4f" name="Delete Network(s)?" default="SequenceFlow_1f26zbk">

-      <bpmn2:incoming>SequenceFlow_1vwssu7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0cmebdc</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1f26zbk</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0fe690i" name="Delete Additional Networks?" default="SequenceFlow_1n7r495">

-      <bpmn2:incoming>SequenceFlow_04vlq8r</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1n7r495</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_0dfkfh1</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_0dfkfh1" name="Yes" sourceRef="ExclusiveGateway_0fe690i" targetRef="ScriptTask_PrepareNetworkDelete">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_networksDeletedCount") < execution.getVariable("DELVAS_networksCount")}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_0cmebdc" name="Yes" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ScriptTask_PrepareNetworkDelete">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_networksCount") > 0}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1os8cm5">

-      <bpmn2:incoming>SequenceFlow_1n7r495</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_1f26zbk</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1j7n6qx</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_1f26zbk" name="No" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ExclusiveGateway_1os8cm5" />

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0nreq15" name="GoTo vIPR-ATM">

-      <bpmn2:incoming>SequenceFlow_1j7n6qx</bpmn2:incoming>

-      <bpmn2:linkEventDefinition name="vIPR-ATM" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1vwssu7" sourceRef="IntermediateCatchEvent_1nh09nr" targetRef="ExclusiveGateway_0b9wd4f" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1j7n6qx" sourceRef="ExclusiveGateway_1os8cm5" targetRef="IntermediateThrowEvent_0nreq15" />

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0rlqdvq" name="StartVnfs">

-      <bpmn2:outgoing>SequenceFlow_10tbv62</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition name="StartVnfs" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nlocis" name="Delete VNF?" default="SequenceFlow_0w7328u">

-      <bpmn2:incoming>SequenceFlow_10tbv62</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0bvecvm</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_0w7328u</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_04q1qud">

-      <bpmn2:incoming>SequenceFlow_0w7328u</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_1wc8h5g</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0xowenu</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_10tbv62" sourceRef="IntermediateCatchEvent_0rlqdvq" targetRef="ExclusiveGateway_1nlocis" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0bvecvm" name="Yes" sourceRef="ExclusiveGateway_1nlocis" targetRef="ScriptTask_3">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_vnfsCount") > 0}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_0w7328u" name="No" sourceRef="ExclusiveGateway_1nlocis" targetRef="ExclusiveGateway_04q1qud" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0xowenu" sourceRef="ExclusiveGateway_04q1qud" targetRef="IntermediateThrowEvent_4" />

-    <bpmn2:scriptTask id="ScriptTask_04o8gb3" name="Validate Network Delete" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_12ag2bk</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_04vlq8r</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.prepareFalloutRequest(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_0807ukc" sourceRef="ScriptTask_0yk02h3" targetRef="CallActivity_0jw5tqa" />
+      <bpmn2:sequenceFlow id="SequenceFlow_19yywk8" sourceRef="CallActivity_0jw5tqa" targetRef="EndEvent_04xute7" />
+      <bpmn2:sequenceFlow id="SequenceFlow_06llof4" sourceRef="StartEvent_1bwmffk" targetRef="ScriptTask_0yk02h3" />
+    </bpmn2:subProcess>
+    <bpmn2:sequenceFlow id="SequenceFlow_10o22u2" sourceRef="IntermediateCatchEvent_3" targetRef="doDeleteServiceInstance_CallActivity" />
+    <bpmn2:sequenceFlow id="SequenceFlow_12ilko1" sourceRef="IntermediateCatchEvent_4" targetRef="postProcessAndCompletionRequest_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1bwbn7r" sourceRef="ScriptTask_PrepareNetworkDelete" targetRef="doDeleteNetworkInstance_CallActivity" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1n7r495" name="No" sourceRef="ExclusiveGateway_0fe690i" targetRef="ExclusiveGateway_1os8cm5" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1h77psn" sourceRef="ScriptTask_3" targetRef="doDeleteVNFandModules_CallActivity" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1nh09nr" name="StartNetworks">
+      <bpmn2:outgoing>SequenceFlow_1vwssu7</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition name="StartNetworks" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0prlju0" name="GoTo FinishProcess">
+      <bpmn2:incoming>SequenceFlow_04ao07f</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="FinishProcess" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0b9wd4f" name="Delete Network(s)?" default="SequenceFlow_1f26zbk">
+      <bpmn2:incoming>SequenceFlow_1vwssu7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0cmebdc</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1f26zbk</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0fe690i" name="Delete Additional Networks?" default="SequenceFlow_1n7r495">
+      <bpmn2:incoming>SequenceFlow_04vlq8r</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1n7r495</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0dfkfh1</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_0dfkfh1" name="Yes" sourceRef="ExclusiveGateway_0fe690i" targetRef="ScriptTask_PrepareNetworkDelete">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_networksDeletedCount") < execution.getVariable("DELVAS_networksCount")}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0cmebdc" name="Yes" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ScriptTask_PrepareNetworkDelete">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_networksCount") > 0}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1os8cm5">
+      <bpmn2:incoming>SequenceFlow_1n7r495</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1f26zbk</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1j7n6qx</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1f26zbk" name="No" sourceRef="ExclusiveGateway_0b9wd4f" targetRef="ExclusiveGateway_1os8cm5" />
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0nreq15" name="GoTo vIPR-ATM">
+      <bpmn2:incoming>SequenceFlow_1j7n6qx</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="vIPR-ATM" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1vwssu7" sourceRef="IntermediateCatchEvent_1nh09nr" targetRef="ExclusiveGateway_0b9wd4f" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1j7n6qx" sourceRef="ExclusiveGateway_1os8cm5" targetRef="IntermediateThrowEvent_0nreq15" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0rlqdvq" name="StartVnfs">
+      <bpmn2:outgoing>SequenceFlow_10tbv62</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition name="StartVnfs" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nlocis" name="Delete VNF?" default="SequenceFlow_0w7328u">
+      <bpmn2:incoming>SequenceFlow_10tbv62</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0bvecvm</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0w7328u</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_04q1qud">
+      <bpmn2:incoming>SequenceFlow_0w7328u</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1wc8h5g</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0xowenu</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_10tbv62" sourceRef="IntermediateCatchEvent_0rlqdvq" targetRef="ExclusiveGateway_1nlocis" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0bvecvm" name="Yes" sourceRef="ExclusiveGateway_1nlocis" targetRef="ScriptTask_3">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_vnfsCount") > 0}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0w7328u" name="No" sourceRef="ExclusiveGateway_1nlocis" targetRef="ExclusiveGateway_04q1qud" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0xowenu" sourceRef="ExclusiveGateway_04q1qud" targetRef="IntermediateThrowEvent_4" />
+    <bpmn2:scriptTask id="ScriptTask_04o8gb3" name="Validate Network Delete" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_12ag2bk</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_04vlq8r</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.validateNetworkDelete(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_12ag2bk" sourceRef="doDeleteNetworkInstance_CallActivity" targetRef="ScriptTask_04o8gb3" />

-    <bpmn2:sequenceFlow id="SequenceFlow_04vlq8r" sourceRef="ScriptTask_04o8gb3" targetRef="ExclusiveGateway_0fe690i" />

-    <bpmn2:callActivity id="callGetServiceInstance" name="Get&#10;Service&#10;Instance" calledElement="GenericGetService">

-      <bpmn2:extensionElements>

-        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />

-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

-        <camunda:in source="GENGS_type" target="GENGS_type" />

-        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />

-        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />

-        <camunda:out source="GENGS_service" target="GENGS_service" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_0jek18q</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1ttswdr</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:scriptTask id="ScriptTask_05m3m2e" name="Process Response &#38; ready data for subflows" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1ttswdr</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_18103ca</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.validateNetworkDelete(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_12ag2bk" sourceRef="doDeleteNetworkInstance_CallActivity" targetRef="ScriptTask_04o8gb3" />
+    <bpmn2:sequenceFlow id="SequenceFlow_04vlq8r" sourceRef="ScriptTask_04o8gb3" targetRef="ExclusiveGateway_0fe690i" />
+    <bpmn2:callActivity id="callGetServiceInstance" name="Get&#10;Service&#10;Instance" calledElement="GenericGetService">
+      <bpmn2:extensionElements>
+        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="GENGS_type" target="GENGS_type" />
+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
+        <camunda:out source="GENGS_service" target="GENGS_service" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0jek18q</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1ttswdr</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_05m3m2e" name="Process Response &#38; ready data for subflows" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1ttswdr</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_18103ca</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.prepareServiceInstanceDelete(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_112zjtp" name="QueryServiceInstance">

-      <bpmn2:outgoing>SequenceFlow_0jek18q</bpmn2:outgoing>

-      <bpmn2:linkEventDefinition name="QueryServiceInstance" />

-    </bpmn2:intermediateCatchEvent>

-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_162gs5w" name="GoToStartVnfs">

-      <bpmn2:incoming>SequenceFlow_18103ca</bpmn2:incoming>

-      <bpmn2:linkEventDefinition name="StartVnfs" />

-    </bpmn2:intermediateThrowEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_0jek18q" sourceRef="IntermediateCatchEvent_112zjtp" targetRef="callGetServiceInstance" />

-    <bpmn2:sequenceFlow id="SequenceFlow_18103ca" sourceRef="ScriptTask_05m3m2e" targetRef="IntermediateThrowEvent_162gs5w" />

-    <bpmn2:sequenceFlow id="SequenceFlow_04ao07f" sourceRef="doDeleteServiceInstance_CallActivity" targetRef="IntermediateThrowEvent_0prlju0" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1ttswdr" sourceRef="callGetServiceInstance" targetRef="ScriptTask_05m3m2e" />

-    <bpmn2:scriptTask id="ScriptTask_1ildy3f" name="Validate VNF delete" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1dmn40p</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0g2cw86</bpmn2:outgoing>

+def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.prepareServiceInstanceDelete(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_112zjtp" name="QueryServiceInstance">
+      <bpmn2:outgoing>SequenceFlow_0jek18q</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition name="QueryServiceInstance" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_162gs5w" name="GoToStartVnfs">
+      <bpmn2:incoming>SequenceFlow_18103ca</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="StartVnfs" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_0jek18q" sourceRef="IntermediateCatchEvent_112zjtp" targetRef="callGetServiceInstance" />
+    <bpmn2:sequenceFlow id="SequenceFlow_18103ca" sourceRef="ScriptTask_05m3m2e" targetRef="IntermediateThrowEvent_162gs5w" />
+    <bpmn2:sequenceFlow id="SequenceFlow_04ao07f" sourceRef="doDeleteServiceInstance_CallActivity" targetRef="IntermediateThrowEvent_0prlju0" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1ttswdr" sourceRef="callGetServiceInstance" targetRef="ScriptTask_05m3m2e" />
+    <bpmn2:scriptTask id="ScriptTask_1ildy3f" name="Validate VNF delete" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1dmn40p</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0g2cw86</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()

-DeleteGenericMacroServiceNetworkVnf.validateVnfDelete(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1uds6yu" name="Delete Additional VNFs?" default="SequenceFlow_1wc8h5g">

-      <bpmn2:incoming>SequenceFlow_0g2cw86</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0mr8jgt</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1wc8h5g</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_1dmn40p" sourceRef="doDeleteVNFandModules_CallActivity" targetRef="ScriptTask_1ildy3f" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0g2cw86" sourceRef="ScriptTask_1ildy3f" targetRef="ExclusiveGateway_1uds6yu" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0mr8jgt" name="Yes" sourceRef="ExclusiveGateway_1uds6yu" targetRef="ScriptTask_3">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_vnfsDeletedCountt") < execution.getVariable("DELVAS_vnfsCount")}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_1wc8h5g" name="No" sourceRef="ExclusiveGateway_1uds6yu" targetRef="ExclusiveGateway_04q1qud" />

-  </bpmn2:process>

-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteGenericMacroServiceNetworkVnf">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createVIPR_startEvent">

-        <dc:Bounds x="96" y="90" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="82" y="131" width="65" height="22" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

-        <dc:Bounds x="285" y="68" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

-        <di:waypoint xsi:type="dc:Point" x="132" y="108" />

-        <di:waypoint xsi:type="dc:Point" x="285" y="108" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="171" y="108" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity">

-        <dc:Bounds x="476" y="1192" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">

-        <dc:Bounds x="285" y="1193" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_127">

-        <di:waypoint xsi:type="dc:Point" x="385" y="108" />

-        <di:waypoint xsi:type="dc:Point" x="476" y="108" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="271" y="69" width="6" height="6" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask">

-        <dc:Bounds x="476" y="68" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80" targetElement="_BPMNShape_CallActivity_4">

-        <di:waypoint xsi:type="dc:Point" x="385" y="1233" />

-        <di:waypoint xsi:type="dc:Point" x="476" y="1232" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="431" y="1217.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="DeleteVIPR_EndEvent">

-        <dc:Bounds x="1046" y="1213" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1054" y="1254" width="19" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_CallActivity_4" targetElement="_BPMNShape_ScriptTask_337">

-        <di:waypoint xsi:type="dc:Point" x="576" y="1233" />

-        <di:waypoint xsi:type="dc:Point" x="636" y="1233" />

-        <di:waypoint xsi:type="dc:Point" x="636" y="1230" />

-        <di:waypoint xsi:type="dc:Point" x="803" y="1230" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="651" y="1231.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">

-        <dc:Bounds x="686" y="1374" width="405" height="205" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">

-        <dc:Bounds x="754" y="1479" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="772" y="1520" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">

-        <dc:Bounds x="829" y="1457" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">

-        <dc:Bounds x="982" y="1479" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1000" y="1520" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">

-        <di:waypoint xsi:type="dc:Point" x="790" y="1497" />

-        <di:waypoint xsi:type="dc:Point" x="829" y="1497" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="818" y="1497" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">

-        <di:waypoint xsi:type="dc:Point" x="929" y="1497" />

-        <di:waypoint xsi:type="dc:Point" x="962" y="1497" />

-        <di:waypoint xsi:type="dc:Point" x="962" y="1497" />

-        <di:waypoint xsi:type="dc:Point" x="982" y="1497" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="977" y="1497" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_75" bpmnElement="doDeleteServiceInstance_CallActivity">

-        <dc:Bounds x="285" y="1009" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_127">

-        <di:waypoint xsi:type="dc:Point" x="576" y="108" />

-        <di:waypoint xsi:type="dc:Point" x="728" y="108" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="652" y="93" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_337" bpmnElement="ScriptTask_2">

-        <dc:Bounds x="803" y="1191" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_337" targetElement="_BPMNShape_EndEvent_177">

-        <di:waypoint xsi:type="dc:Point" x="903" y="1230" />

-        <di:waypoint xsi:type="dc:Point" x="1046" y="1231" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="975" y="1215.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_76" bpmnElement="doDeleteNetworkInstance_CallActivity">

-        <dc:Bounds x="555" y="722" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_35" bpmnElement="IntermediateCatchEvent_3">

-        <dc:Bounds x="100" y="1031" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="92" y="1067" width="51" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_36" bpmnElement="IntermediateCatchEvent_4">

-        <dc:Bounds x="100" y="1216" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="82" y="1252" width="71" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_51" bpmnElement="IntermediateThrowEvent_4">

-        <dc:Bounds x="1036" y="524" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1011" y="565" width="85" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_341" bpmnElement="ScriptTask_PrepareNetworkDelete">

-        <dc:Bounds x="413" y="719" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_342" bpmnElement="ScriptTask_3">

-        <dc:Bounds x="413" y="435" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_81" bpmnElement="doDeleteVNFandModules_CallActivity">

-        <dc:Bounds x="555" y="435" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_49" bpmnElement="IntermediateThrowEvent_2">

-        <dc:Bounds x="728" y="90" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="703" y="131" width="86" height="26" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="SubProcess_0s6hpty_di" bpmnElement="SubProcess_0s6hpty" isExpanded="true">

-        <dc:Bounds x="52" y="1375" width="598" height="203" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="StartEvent_1bwmffk_di" bpmnElement="StartEvent_1bwmffk">

-        <dc:Bounds x="123" y="1448" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="117" y="1489" width="50" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="CallActivity_0jw5tqa_di" bpmnElement="CallActivity_0jw5tqa">

-        <dc:Bounds x="384" y="1426" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="EndEvent_04xute7_di" bpmnElement="EndEvent_04xute7">

-        <dc:Bounds x="539" y="1448" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="557" y="1489" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_0yk02h3_di" bpmnElement="ScriptTask_0yk02h3">

-        <dc:Bounds x="237" y="1426" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_10o22u2_di" bpmnElement="SequenceFlow_10o22u2">

-        <di:waypoint xsi:type="dc:Point" x="136" y="1049" />

-        <di:waypoint xsi:type="dc:Point" x="285" y="1049" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="211" y="1034" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_12ilko1_di" bpmnElement="SequenceFlow_12ilko1">

-        <di:waypoint xsi:type="dc:Point" x="136" y="1234" />

-        <di:waypoint xsi:type="dc:Point" x="285" y="1233" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="211" y="1218.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0807ukc_di" bpmnElement="SequenceFlow_0807ukc">

-        <di:waypoint xsi:type="dc:Point" x="337" y="1466" />

-        <di:waypoint xsi:type="dc:Point" x="384" y="1466" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="361" y="1451" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_19yywk8_di" bpmnElement="SequenceFlow_19yywk8">

-        <di:waypoint xsi:type="dc:Point" x="484" y="1466" />

-        <di:waypoint xsi:type="dc:Point" x="539" y="1466" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="512" y="1451" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1bwbn7r_di" bpmnElement="SequenceFlow_1bwbn7r">

-        <di:waypoint xsi:type="dc:Point" x="513" y="761" />

-        <di:waypoint xsi:type="dc:Point" x="555" y="760" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="534" y="746" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1n7r495_di" bpmnElement="SequenceFlow_1n7r495">

-        <di:waypoint xsi:type="dc:Point" x="891" y="762" />

-        <di:waypoint xsi:type="dc:Point" x="936" y="762" />

-        <di:waypoint xsi:type="dc:Point" x="936" y="792" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="908" y="747" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1h77psn_di" bpmnElement="SequenceFlow_1h77psn">

-        <di:waypoint xsi:type="dc:Point" x="513" y="475" />

-        <di:waypoint xsi:type="dc:Point" x="555" y="475" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="534" y="460" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="IntermediateCatchEvent_1nh09nr_di" bpmnElement="IntermediateCatchEvent_1nh09nr">

-        <dc:Bounds x="96" y="786" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="80" y="822" width="68" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="IntermediateThrowEvent_0prlju0_di" bpmnElement="IntermediateThrowEvent_0prlju0">

-        <dc:Bounds x="508" y="1031" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="491" y="1072" width="70" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_0b9wd4f_di" bpmnElement="ExclusiveGateway_0b9wd4f" isMarkerVisible="true">

-        <dc:Bounds x="345" y="779" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="408" y="811" width="57" height="26" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_0fe690i_di" bpmnElement="ExclusiveGateway_0fe690i" isMarkerVisible="true">

-        <dc:Bounds x="841" y="737" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="809" y="795" width="82" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0dfkfh1_di" bpmnElement="SequenceFlow_0dfkfh1">

-        <di:waypoint xsi:type="dc:Point" x="866" y="737" />

-        <di:waypoint xsi:type="dc:Point" x="866" y="657" />

-        <di:waypoint xsi:type="dc:Point" x="463" y="657" />

-        <di:waypoint xsi:type="dc:Point" x="463" y="717" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="657" y="642" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0cmebdc_di" bpmnElement="SequenceFlow_0cmebdc">

-        <di:waypoint xsi:type="dc:Point" x="370" y="779" />

-        <di:waypoint xsi:type="dc:Point" x="370" y="759" />

-        <di:waypoint xsi:type="dc:Point" x="413" y="759" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="375" y="769" width="19" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1os8cm5_di" bpmnElement="ExclusiveGateway_1os8cm5" isMarkerVisible="true">

-        <dc:Bounds x="911" y="792" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="936" y="847" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1f26zbk_di" bpmnElement="SequenceFlow_1f26zbk">

-        <di:waypoint xsi:type="dc:Point" x="370" y="829" />

-        <di:waypoint xsi:type="dc:Point" x="370" y="896" />

-        <di:waypoint xsi:type="dc:Point" x="936" y="896" />

-        <di:waypoint xsi:type="dc:Point" x="936" y="842" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="646" y="881" width="14" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="IntermediateThrowEvent_0nreq15_di" bpmnElement="IntermediateThrowEvent_0nreq15">

-        <dc:Bounds x="1046" y="799" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1024" y="840" width="80" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1vwssu7_di" bpmnElement="SequenceFlow_1vwssu7">

-        <di:waypoint xsi:type="dc:Point" x="132" y="804" />

-        <di:waypoint xsi:type="dc:Point" x="345" y="804" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="239" y="789" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1j7n6qx_di" bpmnElement="SequenceFlow_1j7n6qx">

-        <di:waypoint xsi:type="dc:Point" x="961" y="817" />

-        <di:waypoint xsi:type="dc:Point" x="1046" y="817" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1004" y="792" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="IntermediateCatchEvent_0rlqdvq_di" bpmnElement="IntermediateCatchEvent_0rlqdvq">

-        <dc:Bounds x="86" y="540" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="80" y="576" width="45" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1nlocis_di" bpmnElement="ExclusiveGateway_1nlocis" isMarkerVisible="true">

-        <dc:Bounds x="335" y="533" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="395" y="565" width="62" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_04q1qud_di" bpmnElement="ExclusiveGateway_04q1qud" isMarkerVisible="true">

-        <dc:Bounds x="901" y="517" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="926" y="572" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_10tbv62_di" bpmnElement="SequenceFlow_10tbv62">

-        <di:waypoint xsi:type="dc:Point" x="122" y="558" />

-        <di:waypoint xsi:type="dc:Point" x="335" y="558" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="229" y="533" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0bvecvm_di" bpmnElement="SequenceFlow_0bvecvm">

-        <di:waypoint xsi:type="dc:Point" x="360" y="533" />

-        <di:waypoint xsi:type="dc:Point" x="360" y="475" />

-        <di:waypoint xsi:type="dc:Point" x="413" y="475" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="366" y="494" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0w7328u_di" bpmnElement="SequenceFlow_0w7328u">

-        <di:waypoint xsi:type="dc:Point" x="360" y="584" />

-        <di:waypoint xsi:type="dc:Point" x="360" y="607" />

-        <di:waypoint xsi:type="dc:Point" x="926" y="607" />

-        <di:waypoint xsi:type="dc:Point" x="926" y="568" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="606" y="583" width="14" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0xowenu_di" bpmnElement="SequenceFlow_0xowenu">

-        <di:waypoint xsi:type="dc:Point" x="951" y="542" />

-        <di:waypoint xsi:type="dc:Point" x="1036" y="542" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="994" y="517" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_04o8gb3_di" bpmnElement="ScriptTask_04o8gb3">

-        <dc:Bounds x="699" y="722" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_12ag2bk_di" bpmnElement="SequenceFlow_12ag2bk">

-        <di:waypoint xsi:type="dc:Point" x="655" y="762" />

-        <di:waypoint xsi:type="dc:Point" x="699" y="762" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="677" y="737" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_04vlq8r_di" bpmnElement="SequenceFlow_04vlq8r">

-        <di:waypoint xsi:type="dc:Point" x="799" y="762" />

-        <di:waypoint xsi:type="dc:Point" x="820" y="762" />

-        <di:waypoint xsi:type="dc:Point" x="820" y="762" />

-        <di:waypoint xsi:type="dc:Point" x="841" y="762" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="835" y="762" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_0nmoax4_di" bpmnElement="callGetServiceInstance">

-        <dc:Bounds x="285" y="223" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_05m3m2e_di" bpmnElement="ScriptTask_05m3m2e">

-        <dc:Bounds x="476" y="223" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="IntermediateCatchEvent_112zjtp_di" bpmnElement="IntermediateCatchEvent_112zjtp">

-        <dc:Bounds x="96" y="245" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="72" y="281" width="82" height="25" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="IntermediateThrowEvent_162gs5w_di" bpmnElement="IntermediateThrowEvent_162gs5w">

-        <dc:Bounds x="732" y="245" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="713" y="286" width="72" height="13" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0jek18q_di" bpmnElement="SequenceFlow_0jek18q">

-        <di:waypoint xsi:type="dc:Point" x="132" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="285" y="263" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="209" y="248" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_18103ca_di" bpmnElement="SequenceFlow_18103ca">

-        <di:waypoint xsi:type="dc:Point" x="576" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="732" y="263" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="654" y="248" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_04ao07f_di" bpmnElement="SequenceFlow_04ao07f">

-        <di:waypoint xsi:type="dc:Point" x="385" y="1049" />

-        <di:waypoint xsi:type="dc:Point" x="508" y="1049" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="447" y="1034" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1ttswdr_di" bpmnElement="SequenceFlow_1ttswdr">

-        <di:waypoint xsi:type="dc:Point" x="385" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="422" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="422" y="263" />

-        <di:waypoint xsi:type="dc:Point" x="476" y="263" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="437" y="263" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_1ildy3f_di" bpmnElement="ScriptTask_1ildy3f">

-        <dc:Bounds x="687" y="435" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1uds6yu_di" bpmnElement="ExclusiveGateway_1uds6yu" isMarkerVisible="true">

-        <dc:Bounds x="828" y="450" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="797" y="508" width="80" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1dmn40p_di" bpmnElement="SequenceFlow_1dmn40p">

-        <di:waypoint xsi:type="dc:Point" x="655" y="475" />

-        <di:waypoint xsi:type="dc:Point" x="687" y="475" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="671" y="450" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0g2cw86_di" bpmnElement="SequenceFlow_0g2cw86">

-        <di:waypoint xsi:type="dc:Point" x="787" y="475" />

-        <di:waypoint xsi:type="dc:Point" x="828" y="475" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="808" y="460" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0mr8jgt_di" bpmnElement="SequenceFlow_0mr8jgt">

-        <di:waypoint xsi:type="dc:Point" x="853" y="453" />

-        <di:waypoint xsi:type="dc:Point" x="853" y="364" />

-        <di:waypoint xsi:type="dc:Point" x="463" y="364" />

-        <di:waypoint xsi:type="dc:Point" x="463" y="435" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="649" y="349" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1wc8h5g_di" bpmnElement="SequenceFlow_1wc8h5g">

-        <di:waypoint xsi:type="dc:Point" x="878" y="475" />

-        <di:waypoint xsi:type="dc:Point" x="926" y="475" />

-        <di:waypoint xsi:type="dc:Point" x="926" y="517" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="895" y="460" width="14" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_06llof4_di" bpmnElement="SequenceFlow_06llof4">

-        <di:waypoint xsi:type="dc:Point" x="159" y="1466" />

-        <di:waypoint xsi:type="dc:Point" x="237" y="1466" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="198" y="1441" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf()
+DeleteGenericMacroServiceNetworkVnf.validateVnfDelete(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1uds6yu" name="Delete Additional VNFs?" default="SequenceFlow_1wc8h5g">
+      <bpmn2:incoming>SequenceFlow_0g2cw86</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0mr8jgt</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1wc8h5g</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1dmn40p" sourceRef="doDeleteVNFandModules_CallActivity" targetRef="ScriptTask_1ildy3f" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0g2cw86" sourceRef="ScriptTask_1ildy3f" targetRef="ExclusiveGateway_1uds6yu" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0mr8jgt" name="Yes" sourceRef="ExclusiveGateway_1uds6yu" targetRef="ScriptTask_3">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVAS_vnfsDeletedCountt") < execution.getVariable("DELVAS_vnfsCount")}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_1wc8h5g" name="No" sourceRef="ExclusiveGateway_1uds6yu" targetRef="ExclusiveGateway_04q1qud" />
+  </bpmn2:process>
+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteGenericMacroServiceNetworkVnf">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createVIPR_startEvent">
+        <dc:Bounds x="96" y="90" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="82" y="131" width="65" height="22" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="285" y="68" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="132" y="108" />
+        <di:waypoint xsi:type="dc:Point" x="285" y="108" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="171" y="108" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity">
+        <dc:Bounds x="476" y="1192" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
+        <dc:Bounds x="285" y="1193" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_127">
+        <di:waypoint xsi:type="dc:Point" x="385" y="108" />
+        <di:waypoint xsi:type="dc:Point" x="476" y="108" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="271" y="69" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask">
+        <dc:Bounds x="476" y="68" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80" targetElement="_BPMNShape_CallActivity_4">
+        <di:waypoint xsi:type="dc:Point" x="385" y="1233" />
+        <di:waypoint xsi:type="dc:Point" x="476" y="1232" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="431" y="1217.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="DeleteVIPR_EndEvent">
+        <dc:Bounds x="1046" y="1213" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1054" y="1254" width="19" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_CallActivity_4" targetElement="_BPMNShape_ScriptTask_337">
+        <di:waypoint xsi:type="dc:Point" x="576" y="1233" />
+        <di:waypoint xsi:type="dc:Point" x="636" y="1233" />
+        <di:waypoint xsi:type="dc:Point" x="636" y="1230" />
+        <di:waypoint xsi:type="dc:Point" x="803" y="1230" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="651" y="1231.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">
+        <dc:Bounds x="686" y="1374" width="405" height="205" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">
+        <dc:Bounds x="754" y="1479" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="772" y="1520" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">
+        <dc:Bounds x="829" y="1457" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">
+        <dc:Bounds x="982" y="1479" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1000" y="1520" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">
+        <di:waypoint xsi:type="dc:Point" x="790" y="1497" />
+        <di:waypoint xsi:type="dc:Point" x="829" y="1497" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="818" y="1497" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">
+        <di:waypoint xsi:type="dc:Point" x="929" y="1497" />
+        <di:waypoint xsi:type="dc:Point" x="962" y="1497" />
+        <di:waypoint xsi:type="dc:Point" x="962" y="1497" />
+        <di:waypoint xsi:type="dc:Point" x="982" y="1497" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="977" y="1497" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_75" bpmnElement="doDeleteServiceInstance_CallActivity">
+        <dc:Bounds x="285" y="1009" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_127">
+        <di:waypoint xsi:type="dc:Point" x="576" y="108" />
+        <di:waypoint xsi:type="dc:Point" x="728" y="108" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="652" y="93" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_337" bpmnElement="ScriptTask_2">
+        <dc:Bounds x="803" y="1191" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_337" targetElement="_BPMNShape_EndEvent_177">
+        <di:waypoint xsi:type="dc:Point" x="903" y="1230" />
+        <di:waypoint xsi:type="dc:Point" x="1046" y="1231" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="975" y="1215.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_76" bpmnElement="doDeleteNetworkInstance_CallActivity">
+        <dc:Bounds x="555" y="722" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_35" bpmnElement="IntermediateCatchEvent_3">
+        <dc:Bounds x="100" y="1031" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="92" y="1067" width="51" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_36" bpmnElement="IntermediateCatchEvent_4">
+        <dc:Bounds x="100" y="1216" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="82" y="1252" width="71" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_51" bpmnElement="IntermediateThrowEvent_4">
+        <dc:Bounds x="1036" y="524" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1011" y="565" width="85" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_341" bpmnElement="ScriptTask_PrepareNetworkDelete">
+        <dc:Bounds x="413" y="719" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_342" bpmnElement="ScriptTask_3">
+        <dc:Bounds x="413" y="435" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_81" bpmnElement="doDeleteVNFandModules_CallActivity">
+        <dc:Bounds x="555" y="435" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_49" bpmnElement="IntermediateThrowEvent_2">
+        <dc:Bounds x="728" y="90" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="703" y="131" width="86" height="26" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_0s6hpty_di" bpmnElement="SubProcess_0s6hpty" isExpanded="true">
+        <dc:Bounds x="52" y="1375" width="598" height="203" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1bwmffk_di" bpmnElement="StartEvent_1bwmffk">
+        <dc:Bounds x="123" y="1448" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="117" y="1489" width="50" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0jw5tqa_di" bpmnElement="CallActivity_0jw5tqa">
+        <dc:Bounds x="384" y="1426" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_04xute7_di" bpmnElement="EndEvent_04xute7">
+        <dc:Bounds x="539" y="1448" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="557" y="1489" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0yk02h3_di" bpmnElement="ScriptTask_0yk02h3">
+        <dc:Bounds x="237" y="1426" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_10o22u2_di" bpmnElement="SequenceFlow_10o22u2">
+        <di:waypoint xsi:type="dc:Point" x="136" y="1049" />
+        <di:waypoint xsi:type="dc:Point" x="285" y="1049" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="211" y="1034" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_12ilko1_di" bpmnElement="SequenceFlow_12ilko1">
+        <di:waypoint xsi:type="dc:Point" x="136" y="1234" />
+        <di:waypoint xsi:type="dc:Point" x="285" y="1233" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="211" y="1218.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0807ukc_di" bpmnElement="SequenceFlow_0807ukc">
+        <di:waypoint xsi:type="dc:Point" x="337" y="1466" />
+        <di:waypoint xsi:type="dc:Point" x="384" y="1466" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="361" y="1451" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_19yywk8_di" bpmnElement="SequenceFlow_19yywk8">
+        <di:waypoint xsi:type="dc:Point" x="484" y="1466" />
+        <di:waypoint xsi:type="dc:Point" x="539" y="1466" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="512" y="1451" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1bwbn7r_di" bpmnElement="SequenceFlow_1bwbn7r">
+        <di:waypoint xsi:type="dc:Point" x="513" y="761" />
+        <di:waypoint xsi:type="dc:Point" x="555" y="760" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="534" y="746" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1n7r495_di" bpmnElement="SequenceFlow_1n7r495">
+        <di:waypoint xsi:type="dc:Point" x="891" y="762" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="762" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="792" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="908" y="747" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1h77psn_di" bpmnElement="SequenceFlow_1h77psn">
+        <di:waypoint xsi:type="dc:Point" x="513" y="475" />
+        <di:waypoint xsi:type="dc:Point" x="555" y="475" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="534" y="460" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_1nh09nr_di" bpmnElement="IntermediateCatchEvent_1nh09nr">
+        <dc:Bounds x="96" y="786" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="80" y="822" width="68" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_0prlju0_di" bpmnElement="IntermediateThrowEvent_0prlju0">
+        <dc:Bounds x="508" y="1031" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="491" y="1072" width="70" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0b9wd4f_di" bpmnElement="ExclusiveGateway_0b9wd4f" isMarkerVisible="true">
+        <dc:Bounds x="345" y="779" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="408" y="811" width="57" height="26" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0fe690i_di" bpmnElement="ExclusiveGateway_0fe690i" isMarkerVisible="true">
+        <dc:Bounds x="841" y="737" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="809" y="795" width="82" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0dfkfh1_di" bpmnElement="SequenceFlow_0dfkfh1">
+        <di:waypoint xsi:type="dc:Point" x="866" y="737" />
+        <di:waypoint xsi:type="dc:Point" x="866" y="657" />
+        <di:waypoint xsi:type="dc:Point" x="463" y="657" />
+        <di:waypoint xsi:type="dc:Point" x="463" y="717" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="657" y="642" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0cmebdc_di" bpmnElement="SequenceFlow_0cmebdc">
+        <di:waypoint xsi:type="dc:Point" x="370" y="779" />
+        <di:waypoint xsi:type="dc:Point" x="370" y="759" />
+        <di:waypoint xsi:type="dc:Point" x="413" y="759" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="375" y="769" width="19" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1os8cm5_di" bpmnElement="ExclusiveGateway_1os8cm5" isMarkerVisible="true">
+        <dc:Bounds x="911" y="792" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="936" y="847" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1f26zbk_di" bpmnElement="SequenceFlow_1f26zbk">
+        <di:waypoint xsi:type="dc:Point" x="370" y="829" />
+        <di:waypoint xsi:type="dc:Point" x="370" y="896" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="896" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="842" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="646" y="881" width="14" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_0nreq15_di" bpmnElement="IntermediateThrowEvent_0nreq15">
+        <dc:Bounds x="1046" y="799" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1024" y="840" width="80" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1vwssu7_di" bpmnElement="SequenceFlow_1vwssu7">
+        <di:waypoint xsi:type="dc:Point" x="132" y="804" />
+        <di:waypoint xsi:type="dc:Point" x="345" y="804" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="239" y="789" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1j7n6qx_di" bpmnElement="SequenceFlow_1j7n6qx">
+        <di:waypoint xsi:type="dc:Point" x="961" y="817" />
+        <di:waypoint xsi:type="dc:Point" x="1046" y="817" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1004" y="792" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_0rlqdvq_di" bpmnElement="IntermediateCatchEvent_0rlqdvq">
+        <dc:Bounds x="86" y="540" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="80" y="576" width="45" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1nlocis_di" bpmnElement="ExclusiveGateway_1nlocis" isMarkerVisible="true">
+        <dc:Bounds x="335" y="533" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="395" y="565" width="62" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_04q1qud_di" bpmnElement="ExclusiveGateway_04q1qud" isMarkerVisible="true">
+        <dc:Bounds x="901" y="517" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="926" y="572" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_10tbv62_di" bpmnElement="SequenceFlow_10tbv62">
+        <di:waypoint xsi:type="dc:Point" x="122" y="558" />
+        <di:waypoint xsi:type="dc:Point" x="335" y="558" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="229" y="533" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0bvecvm_di" bpmnElement="SequenceFlow_0bvecvm">
+        <di:waypoint xsi:type="dc:Point" x="360" y="533" />
+        <di:waypoint xsi:type="dc:Point" x="360" y="475" />
+        <di:waypoint xsi:type="dc:Point" x="413" y="475" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="366" y="494" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0w7328u_di" bpmnElement="SequenceFlow_0w7328u">
+        <di:waypoint xsi:type="dc:Point" x="360" y="584" />
+        <di:waypoint xsi:type="dc:Point" x="360" y="607" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="607" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="568" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="606" y="583" width="14" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0xowenu_di" bpmnElement="SequenceFlow_0xowenu">
+        <di:waypoint xsi:type="dc:Point" x="951" y="542" />
+        <di:waypoint xsi:type="dc:Point" x="1036" y="542" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="994" y="517" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_04o8gb3_di" bpmnElement="ScriptTask_04o8gb3">
+        <dc:Bounds x="699" y="722" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_12ag2bk_di" bpmnElement="SequenceFlow_12ag2bk">
+        <di:waypoint xsi:type="dc:Point" x="655" y="762" />
+        <di:waypoint xsi:type="dc:Point" x="699" y="762" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="677" y="737" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_04vlq8r_di" bpmnElement="SequenceFlow_04vlq8r">
+        <di:waypoint xsi:type="dc:Point" x="799" y="762" />
+        <di:waypoint xsi:type="dc:Point" x="820" y="762" />
+        <di:waypoint xsi:type="dc:Point" x="820" y="762" />
+        <di:waypoint xsi:type="dc:Point" x="841" y="762" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="835" y="762" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0nmoax4_di" bpmnElement="callGetServiceInstance">
+        <dc:Bounds x="285" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_05m3m2e_di" bpmnElement="ScriptTask_05m3m2e">
+        <dc:Bounds x="476" y="223" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_112zjtp_di" bpmnElement="IntermediateCatchEvent_112zjtp">
+        <dc:Bounds x="96" y="245" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="72" y="281" width="82" height="25" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_162gs5w_di" bpmnElement="IntermediateThrowEvent_162gs5w">
+        <dc:Bounds x="732" y="245" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="713" y="286" width="72" height="13" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0jek18q_di" bpmnElement="SequenceFlow_0jek18q">
+        <di:waypoint xsi:type="dc:Point" x="132" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="285" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="209" y="248" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_18103ca_di" bpmnElement="SequenceFlow_18103ca">
+        <di:waypoint xsi:type="dc:Point" x="576" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="732" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="654" y="248" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_04ao07f_di" bpmnElement="SequenceFlow_04ao07f">
+        <di:waypoint xsi:type="dc:Point" x="385" y="1049" />
+        <di:waypoint xsi:type="dc:Point" x="508" y="1049" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="447" y="1034" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ttswdr_di" bpmnElement="SequenceFlow_1ttswdr">
+        <di:waypoint xsi:type="dc:Point" x="385" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="422" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="422" y="263" />
+        <di:waypoint xsi:type="dc:Point" x="476" y="263" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="437" y="263" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1ildy3f_di" bpmnElement="ScriptTask_1ildy3f">
+        <dc:Bounds x="687" y="435" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1uds6yu_di" bpmnElement="ExclusiveGateway_1uds6yu" isMarkerVisible="true">
+        <dc:Bounds x="828" y="450" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="797" y="508" width="80" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1dmn40p_di" bpmnElement="SequenceFlow_1dmn40p">
+        <di:waypoint xsi:type="dc:Point" x="655" y="475" />
+        <di:waypoint xsi:type="dc:Point" x="687" y="475" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="671" y="450" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0g2cw86_di" bpmnElement="SequenceFlow_0g2cw86">
+        <di:waypoint xsi:type="dc:Point" x="787" y="475" />
+        <di:waypoint xsi:type="dc:Point" x="828" y="475" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="808" y="460" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0mr8jgt_di" bpmnElement="SequenceFlow_0mr8jgt">
+        <di:waypoint xsi:type="dc:Point" x="853" y="453" />
+        <di:waypoint xsi:type="dc:Point" x="853" y="364" />
+        <di:waypoint xsi:type="dc:Point" x="463" y="364" />
+        <di:waypoint xsi:type="dc:Point" x="463" y="435" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="649" y="349" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1wc8h5g_di" bpmnElement="SequenceFlow_1wc8h5g">
+        <di:waypoint xsi:type="dc:Point" x="878" y="475" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="475" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="517" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="895" y="460" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_06llof4_di" bpmnElement="SequenceFlow_06llof4">
+        <di:waypoint xsi:type="dc:Point" x="159" y="1466" />
+        <di:waypoint xsi:type="dc:Point" x="237" y="1466" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="198" y="1441" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn
index b5b10a0..95c0a72 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn
@@ -129,7 +129,7 @@ deleteVnf.prepareCompletionHandlerRequest(execution)]]></bpmn2:script>
     <bpmn2:callActivity id="Task_0ob25pp" name="Delete VNF and Modules" calledElement="DoDeleteVnfAndModules">
       <bpmn2:extensionElements>
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:in source="DELVI_requestId" target="requestId" />
+        <camunda:in source="DELVI_requestId" target="msoRequestId" />
         <camunda:in source="DELVI_vnfId" target="vnfId" />
         <camunda:in source="DELVI_serviceInstanceId" target="serviceInstanceId" />
         <camunda:in source="DELVI_cloudConfiguration" target="cloudConfiguration" />
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn
deleted file mode 100644
index f49149b..0000000
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn
+++ /dev/null
@@ -1,1014 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_MagIIMOUEeW8asg-vCEgWQ" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
-  <bpmn2:process id="UpdateNetworkInstanceInfra" name="UpdateNetworkInstanceInfra" isExecutable="true">
-    <bpmn2:startEvent id="updateNetwork_startEvent" name="Start Flow">
-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="updateNetwork_startEvent" targetRef="preProcessRequest_ScriptTask"/>
-    <bpmn2:scriptTask id="prepareSDNCTopoRequest_ScriptTask" name="Prepare SDNC Topology Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.prepareSDNCRequest(execution)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="prepareSDNCTopoRequest_ScriptTask" targetRef="callAssignSDNCAdapter_CallActivity"/>
-    <bpmn2:scriptTask id="validateSDNCResponse_ScriptTask" name="Validate SDNC Response" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.validateSDNCResponse(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:exclusiveGateway id="isSdncTopoOk_ExclusiveGateway" name="Is SDNC Ok?" default="sdncTopoNo_SequenceFlow">
-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
-      <bpmn2:outgoing>sdncTopoNo_SequenceFlow</bpmn2:outgoing>
-      <bpmn2:outgoing>sdncTopoYes_SequenceFlow</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="sdncTopoNo_SequenceFlow" name="No" sourceRef="isSdncTopoOk_ExclusiveGateway" targetRef="sndcError_EndEvent"/>
-    <bpmn2:sequenceFlow id="sdncTopoYes_SequenceFlow" name="Yes" sourceRef="isSdncTopoOk_ExclusiveGateway" targetRef="callRESTReQuery1NetworkID_ScriptTask">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="validateSDNCResponse_ScriptTask" targetRef="isSdncTopoOk_ExclusiveGateway"/>
-    <bpmn2:boundaryEvent id="BoundaryEvent_4" name="" attachedToRef="validateSDNCResponse_ScriptTask">
-      <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_84" errorRef="Error_2"/>
-    </bpmn2:boundaryEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="BoundaryEvent_4" targetRef="sndcError_EndEvent"/>
-    <bpmn2:endEvent id="sndcError_EndEvent" name="SNDC Error">
-      <bpmn2:incoming>sdncTopoNo_SequenceFlow</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming>
-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_57" errorRef="Error_2"/>
-    </bpmn2:endEvent>
-    <bpmn2:callActivity id="callRollbackSDNCAdapter_CallActivity" name="Call Rollback SDNC Adapter" isForCompensation="true" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="UPDNETI_rollbackSDNCRequest" target="sdncAdapterWorkflowRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:out source="SDNCA_ResponseCode" target="UPDNETI_rollbackSDNCReturnCode"/>
-        <camunda:out source="sdncAdapterResponse" target="UPDNETI_rollbackSDNCResponse"/>
-      </bpmn2:extensionElements>
-    </bpmn2:callActivity>
-    <bpmn2:boundaryEvent id="sndcCompensation_BoundaryEvent" attachedToRef="callAssignSDNCAdapter_CallActivity">
-      <bpmn2:compensateEventDefinition id="CompensateEventDefinition_1" waitForCompletion="true"/>
-    </bpmn2:boundaryEvent>
-    <bpmn2:callActivity id="callAssignSDNCAdapter_CallActivity" name="Call SDNC Assign Adapter V1 Sub-process" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="UPDNETI_changeAssignSDNCRequest" target="sdncAdapterWorkflowRequest"/>
-        <camunda:out source="sdncAdapterResponse" target="UPDNETI_changeAssignSDNCResponse"/>
-        <camunda:out source="SDNCA_ResponseCode" target="UPDNETI_sdncReturnCode"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:out source="WorkflowException" target="UPDNETI_WorkflowException"/>
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator"/>
-        <camunda:in variables="all"/>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="callAssignSDNCAdapter_CallActivity" targetRef="validateSDNCResponse_ScriptTask"/>
-    <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process &amp; Completion Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.postProcessResponse(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="callCompleteMsoProcess_CallActivity"/>
-    <bpmn2:subProcess id="subProcessException_SubProcess" name="Subprocess For Exception / FalloutHandler " triggeredByEvent="true">
-      <bpmn2:exclusiveGateway id="isRollbackOn_Network_ExclusiveGateway" name="Is Rollback On?" default="isRollbackOn_NoNetwork_SequenceFlow">
-        <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
-        <bpmn2:outgoing>isRollbackOn_YesNetwork_SequenceFlow</bpmn2:outgoing>
-        <bpmn2:outgoing>isRollbackOn_NoNetwork_SequenceFlow</bpmn2:outgoing>
-      </bpmn2:exclusiveGateway>
-      <bpmn2:sequenceFlow id="isRollbackOn_YesNetwork_SequenceFlow" name="Yes" sourceRef="isRollbackOn_Network_ExclusiveGateway" targetRef="isPONR_ExclusiveGateway">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_rollbackEnabled") == true}]]></bpmn2:conditionExpression>
-      </bpmn2:sequenceFlow>
-      <bpmn2:sequenceFlow id="isRollbackOn_NoNetwork_SequenceFlow" name="No" sourceRef="isRollbackOn_Network_ExclusiveGateway" targetRef="InclusiveGateway_6"/>
-      <bpmn2:startEvent id="subProcessStart_StartEvent" name="Fault Start">
-        <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" errorRef="Error_2"/>
-      </bpmn2:startEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="subProcessStart_StartEvent" targetRef="isRollbackOn_Network_ExclusiveGateway"/>
-      <bpmn2:exclusiveGateway id="isPONR_ExclusiveGateway" name="isPONR?" default="isPONR_No_SequenceFlow">
-        <bpmn2:incoming>isRollbackOn_YesNetwork_SequenceFlow</bpmn2:incoming>
-        <bpmn2:outgoing>isPONR_Yes_SequenceFlow</bpmn2:outgoing>
-        <bpmn2:outgoing>isPONR_No_SequenceFlow</bpmn2:outgoing>
-      </bpmn2:exclusiveGateway>
-      <bpmn2:sequenceFlow id="isPONR_Yes_SequenceFlow" name="Yes" sourceRef="isPONR_ExclusiveGateway" targetRef="InclusiveGateway_6">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isPONR") == true}]]></bpmn2:conditionExpression>
-      </bpmn2:sequenceFlow>
-      <bpmn2:sequenceFlow id="isPONR_No_SequenceFlow" name="No" sourceRef="isPONR_ExclusiveGateway" targetRef="isNetworkOk_ExclusiveGateway"/>
-      <bpmn2:exclusiveGateway id="isNetworkOk_ExclusiveGateway" name="is Network Ok?" default="isNetworkOk_No_SequenceFlow">
-        <bpmn2:incoming>isPONR_No_SequenceFlow</bpmn2:incoming>
-        <bpmn2:outgoing>isNetworkOk_No_SequenceFlow</bpmn2:outgoing>
-        <bpmn2:outgoing>isNetworkOk_Yes_SequenceFlow</bpmn2:outgoing>
-      </bpmn2:exclusiveGateway>
-      <bpmn2:sequenceFlow id="isNetworkOk_No_SequenceFlow" name="No" sourceRef="isNetworkOk_ExclusiveGateway" targetRef="sdncOk_ExclusiveGateway"/>
-      <bpmn2:sequenceFlow id="isNetworkOk_Yes_SequenceFlow" name="Yes" sourceRef="isNetworkOk_ExclusiveGateway" targetRef="sdncOk_ExclusiveGateway">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isNetworkRollbackNeeded") == true}]]></bpmn2:conditionExpression>
-      </bpmn2:sequenceFlow>
-      <bpmn2:exclusiveGateway id="sdncOk_ExclusiveGateway" name="is Sdnc Ok?" default="sdncOk_No_ExclusiveGateway">
-        <bpmn2:incoming>isNetworkOk_No_SequenceFlow</bpmn2:incoming>
-        <bpmn2:incoming>isNetworkOk_Yes_SequenceFlow</bpmn2:incoming>
-        <bpmn2:outgoing>sdncOk_Yeso_ExclusiveGateway</bpmn2:outgoing>
-        <bpmn2:outgoing>sdncOk_No_ExclusiveGateway</bpmn2:outgoing>
-      </bpmn2:exclusiveGateway>
-      <bpmn2:sequenceFlow id="sdncOk_Yeso_ExclusiveGateway" name="Yes" sourceRef="sdncOk_ExclusiveGateway" targetRef="prepareSDNCRollbackRequest_ScriptTask">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isSdncRollbackNeeded" ) == true}]]></bpmn2:conditionExpression>
-      </bpmn2:sequenceFlow>
-      <bpmn2:sequenceFlow id="sdncOk_No_ExclusiveGateway" name="No" sourceRef="sdncOk_ExclusiveGateway" targetRef="validateRollbacksResponse_ScriptTask_2"/>
-      <bpmn2:scriptTask id="prepareSDNCRollbackRequest_ScriptTask" name="Prepare SDNCRollback Request" scriptFormat="groovy">
-        <bpmn2:incoming>sdncOk_Yeso_ExclusiveGateway</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_53</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.prepareSDNCRollbackRequest(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_53" name="" sourceRef="prepareSDNCRollbackRequest_ScriptTask" targetRef="sdncTopoRollback_IntermediateThrowEvent"/>
-      <bpmn2:intermediateThrowEvent id="sdncTopoRollback_IntermediateThrowEvent" name="SDNC Rollback">
-        <bpmn2:incoming>SequenceFlow_53</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_55</bpmn2:outgoing>
-        <bpmn2:compensateEventDefinition id="sndc_CompensateEventDefinition" activityRef="callRollbackSDNCAdapter_CallActivity" waitForCompletion="true"/>
-      </bpmn2:intermediateThrowEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_55" name="" sourceRef="sdncTopoRollback_IntermediateThrowEvent" targetRef="validateRollbacksResponse_ScriptTask_2"/>
-      <bpmn2:scriptTask id="prepareDBInfraErrorRequest_ScriptTask" name="Prepare DB Infra Error" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_47</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.prepareDBRequestError(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="prepareDBInfraErrorRequest_ScriptTask" targetRef="callDBInfraErrorUpdate_ServiceTask_1"/>
-      <bpmn2:serviceTask id="callDBInfraErrorUpdate_ServiceTask_1" name="Call DB Infra Error Update">
-        <bpmn2:extensionElements>
-          <camunda:connector>
-            <camunda:connectorId>http-connector</camunda:connectorId>
-            <camunda:inputOutput>
-              <camunda:inputParameter name="url">${URN_mso_adapters_db_endpoint}</camunda:inputParameter>
-              <camunda:inputParameter name="payload">${UPDNETI_updateDBRequest}</camunda:inputParameter>
-              <camunda:inputParameter name="headers">
-                <camunda:map>
-                  <camunda:entry key="content-type">application/soap+xml</camunda:entry>
-                </camunda:map>
-              </camunda:inputParameter>
-              <camunda:inputParameter name="method">POST</camunda:inputParameter>
-              <camunda:outputParameter name="UPDNETI_updateDBResponse">${response}</camunda:outputParameter>
-              <camunda:outputParameter name="UPDNETI_dbReturnCode">${statusCode}</camunda:outputParameter>
-            </camunda:inputOutput>
-          </camunda:connector>
-        </bpmn2:extensionElements>
-        <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
-      </bpmn2:serviceTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="callDBInfraErrorUpdate_ServiceTask_1" targetRef="prepareFalloutHandler_ScriptTask"/>
-      <bpmn2:callActivity id="faultHandler_CallActivity" name="Call FalloutHandlerV1" calledElement="FalloutHandler">
-        <bpmn2:extensionElements>
-          <camunda:in variables="all"/>
-          <camunda:out variables="all"/>
-          <camunda:in source="UPDNETI_FalloutHandlerRequest" target="FalloutHandlerRequest"/>
-          <camunda:in source="mso-request-id" target="mso-request-id"/>
-          <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-          <camunda:out source="FH_ResponseCode" target="FH_ResponseCode"/>
-          <camunda:out source="FalloutHandlerResponse" target="FalloutHandlerResponse"/>
-          <camunda:out source="FH_ErrorResponse" target="FH_ErrorResponse"/>
-        </bpmn2:extensionElements>
-        <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      </bpmn2:callActivity>
-      <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="faultHandler_CallActivity" targetRef="EndEvent_4"/>
-      <bpmn2:endEvent id="EndEvent_4">
-        <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
-      </bpmn2:endEvent>
-      <bpmn2:scriptTask id="validateRollbacksResponse_ScriptTask_2" name="Validate Rollback Responses" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_55</bpmn2:incoming>
-        <bpmn2:incoming>sdncOk_No_ExclusiveGateway</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.validateRollbackResponses(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="validateRollbacksResponse_ScriptTask_2" targetRef="InclusiveGateway_6"/>
-      <bpmn2:inclusiveGateway id="InclusiveGateway_6">
-        <bpmn2:incoming>isRollbackOn_NoNetwork_SequenceFlow</bpmn2:incoming>
-        <bpmn2:incoming>isPONR_Yes_SequenceFlow</bpmn2:incoming>
-        <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_47</bpmn2:outgoing>
-      </bpmn2:inclusiveGateway>
-      <bpmn2:sequenceFlow id="SequenceFlow_47" name="" sourceRef="InclusiveGateway_6" targetRef="prepareDBInfraErrorRequest_ScriptTask"/>
-      <bpmn2:scriptTask id="prepareFalloutHandler_ScriptTask" name="Prepare FalloutHandler" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def buildErrorResponse = new UpdateNetworkInstanceInfra()
-buildErrorResponse.buildErrorResponse(execution)
-]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="prepareFalloutHandler_ScriptTask" targetRef="faultHandler_CallActivity"/>
-    </bpmn2:subProcess>
-    <bpmn2:scriptTask id="callRESTReQuery2NetworkID_ScriptTask" name="Call REST ReQuery2 Network Id in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="callRESTReQuery2NetworkID_ScriptTask" targetRef="callRESTUpdateContrailNetwork_ScriptTask"/>
-    <bpmn2:scriptTask id="callRESTUpdateContrailNetwork_ScriptTask" name="Call REST Update Contrail Network in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_46</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTUpdateContrailAAINetwork(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_46" name="PONR" sourceRef="callRESTUpdateContrailNetwork_ScriptTask" targetRef="prepareDBInfraRequest_ScriptTask"/>
-    <bpmn2:scriptTask id="prepareDBInfraRequest_ScriptTask" name="Prepare DB Infra Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_46</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.prepareDBRequest(execution)
-
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_37" name="" sourceRef="prepareDBInfraRequest_ScriptTask" targetRef="callDBInfra_ServiceTask"/>
-    <bpmn2:serviceTask id="callDBInfra_ServiceTask" name="Call DB Infra Update">
-      <bpmn2:extensionElements>
-        <camunda:connector>
-          <camunda:connectorId>http-connector</camunda:connectorId>
-          <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_db_endpoint}</camunda:inputParameter>
-            <camunda:inputParameter name="payload">${UPDNETI_updateDBRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="headers">
-              <camunda:map>
-                <camunda:entry key="content-type">application/soap+xml</camunda:entry>
-              </camunda:map>
-            </camunda:inputParameter>
-            <camunda:inputParameter name="method">POST</camunda:inputParameter>
-            <camunda:outputParameter name="UPDNETI_createDBResponse">${response}</camunda:outputParameter>
-            <camunda:outputParameter name="UPDNETI_dbReturnCode">${statusCode}</camunda:outputParameter>
-          </camunda:inputOutput>
-        </camunda:connector>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_37</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
-    </bpmn2:serviceTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="callDBInfra_ServiceTask" targetRef="postProcessAndCompletionRequest_ScriptTask"/>
-    <bpmn2:callActivity id="callCompleteMsoProcess_CallActivity" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
-      <bpmn2:extensionElements>
-        <camunda:in variables="all"/>
-        <camunda:out variables="all"/>
-        <camunda:in source="UPDNETI_CompleteMsoProcessRequest" target="CompleteMsoProcessRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:out source="CMSO_ResponseCode" target="CMSO_ResponseCode"/>
-        <camunda:out source="CompleteMsoProcessResponse" target="CompleteMsoProcessResponse"/>
-        <camunda:out source="CMSO_ErrorResponse" target="CMSO_ErrorResponse"/>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="callCompleteMsoProcess_CallActivity" targetRef="EndEvent_3"/>
-    <bpmn2:endEvent id="EndEvent_3">
-      <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:subProcess id="unexpectedErrors_SubProcess" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
-      <bpmn2:scriptTask id="ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.processJavaException(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1"/>
-      <bpmn2:startEvent id="StartEvent_1">
-        <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" errorRef="Error_1"/>
-      </bpmn2:startEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1"/>
-      <bpmn2:endEvent id="EndEvent_1">
-        <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
-      </bpmn2:endEvent>
-    </bpmn2:subProcess>
-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.preProcessRequest(execution)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask"/>
-    <bpmn2:scriptTask id="callRESTQueryCloudRegion_ScriptTask" name="Call REST Query Cloud Region " scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="callRESTQueryCloudRegion_ScriptTask" targetRef="prepareSDNCTopoRequest_ScriptTask"/>
-    <bpmn2:scriptTask id="callRESTQueryNetworkId_ScriptTask" name="Call REST Query Network Id In AAI" scriptFormat="groovy">
-      <bpmn2:incoming>siFoundYes</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTQueryAAINetworkId(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="callRESTQueryNetworkId_ScriptTask" targetRef="callRESTQueryCloudRegion_ScriptTask"/>
-    <bpmn2:endEvent id="EndEvent_2">
-      <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>
-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_97" errorRef="Error_2"/>
-    </bpmn2:endEvent>
-    <bpmn2:scriptTask id="workflowExceptionSINotFound" name="Create Workflow Exception" scriptFormat="groovy">
-      <bpmn2:incoming>siFoundNo</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.utils.*
-ExceptionUtil exceptionUtil = new ExceptionUtil()
-exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found")]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_30" name="" sourceRef="workflowExceptionSINotFound" targetRef="EndEvent_2"/>
-    <bpmn2:exclusiveGateway id="siFoundCheck" name="is SI Found?" default="siFoundNo">
-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
-      <bpmn2:outgoing>siFoundYes</bpmn2:outgoing>
-      <bpmn2:outgoing>siFoundNo</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="siFoundYes" name="Yes" sourceRef="siFoundCheck" targetRef="callRESTQueryNetworkId_ScriptTask">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGSI_FoundIndicator" ) == true && execution.getVariable("GENGSI_SuccessIndicator" ) == true}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="siFoundNo" name="No" sourceRef="siFoundCheck" targetRef="workflowExceptionSINotFound"/>
-    <bpmn2:callActivity id="callGetServiceInstance" name="Get&#xD;&#xA;Service&#xD;&#xA;Instance" calledElement="GenericGetService">
-      <bpmn2:extensionElements>
-        <camunda:in source="UPDNETI_serviceInstanceId" target="GENGS_serviceInstanceId"/>
-        <camunda:out source="GENGS_serviceInstance" target="UPDNETI_serviceInstanceId"/>
-        <camunda:out source="GENGS_FoundIndicator" target="GENGSI_FoundIndicator"/>
-        <camunda:out source="GENGS_SuccessIndicator" target="GENGSI_SuccessIndicator"/>
-        <camunda:out source="GENGS_siResourceLink" target="GENGSI_siResourceLink"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:in source="GENGS_type" target="GENGS_type"/>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="callGetServiceInstance" targetRef="siFoundCheck"/>
-    <bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new  UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.sendSyncResponse(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="sendSyncAckResponse_ScriptTask" targetRef="callGetServiceInstance"/>
-    <bpmn2:scriptTask id="validateUpdatePONetwork_ScriptTask" name="Validate Update PO Network" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_59</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.validateUpdateNetworkResponse(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="validateUpdatePONetwork_ScriptTask" targetRef="callRESTReQuery2NetworkID_ScriptTask"/>
-    <bpmn2:serviceTask id="callUpdateNetwork_ServiceTask" name="Call Update Network">
-      <bpmn2:extensionElements>
-        <camunda:connector>
-          <camunda:connectorId>http-connector</camunda:connectorId>
-          <camunda:inputOutput>
-            <camunda:inputParameter name="payload">${UPDNETI_updateNetworkRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="url">${URN_mso_adapters_network_rest_endpoint}/${UPDNETI_networkId}</camunda:inputParameter>
-            <camunda:inputParameter name="headers">
-              <camunda:map>
-                <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
-                <camunda:entry key="content-type">application/xml</camunda:entry>
-              </camunda:map>
-            </camunda:inputParameter>
-            <camunda:inputParameter name="method">PUT</camunda:inputParameter>
-            <camunda:outputParameter name="UPDNETI_networkReturnCode">${statusCode}</camunda:outputParameter>
-            <camunda:outputParameter name="UPDNETI_updateNetworkResponse">${response}</camunda:outputParameter>
-          </camunda:inputOutput>
-        </camunda:connector>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_59</bpmn2:outgoing>
-    </bpmn2:serviceTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_59" name="" sourceRef="callUpdateNetwork_ServiceTask" targetRef="validateUpdatePONetwork_ScriptTask"/>
-    <bpmn2:scriptTask id="prepareNetworkRequest_ScriptTask" name="Prepare Create Network Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_61</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.prepareUpdateNetworkRequest(execution)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="callUpdateNetwork_ServiceTask"/>
-    <bpmn2:scriptTask id="callRESTQueryNetworkTableRef_ScriptTask" name="Call REST Query Network TableRef in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTQueryAAINetworkTableRef(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="callRESTQueryNetworkTableRef_ScriptTask" targetRef="prepareNetworkRequest_ScriptTask"/>
-    <bpmn2:scriptTask id="callRESTReQuery1NetworkID_ScriptTask" name="Call REST ReQuery1 Network Id in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>sdncTopoYes_SequenceFlow</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="callRESTReQuery1NetworkID_ScriptTask" targetRef="callRESTQueryVpnBinding_ScriptTask"/>
-    <bpmn2:scriptTask id="callRESTQueryVpnBinding_ScriptTask" name="Call REST Query Vpn Binding in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTQueryAAINetworkVpnBinding(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="callRESTQueryVpnBinding_ScriptTask" targetRef="callRESTQueryNetworkPolicy_ScriptTask"/>
-    <bpmn2:scriptTask id="callRESTQueryNetworkPolicy_ScriptTask" name="Call REST Query Network Policy in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()
-UpdateNetworkInstanceInfra.callRESTQueryAAINetworkPolicy(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="callRESTQueryNetworkPolicy_ScriptTask" targetRef="callRESTQueryNetworkTableRef_ScriptTask"/>
-    <bpmn2:association id="Association_1" sourceRef="sndcCompensation_BoundaryEvent" targetRef="callRollbackSDNCAdapter_CallActivity"/>
-  </bpmn2:process>
-  <bpmn2:error id="Error_2" errorCode="MSOWorkflowException" name="MSOWorkflowException"/>
-  <bpmn2:error id="Error_1" errorCode="java.lang.Exception" name="java.lang.Exception"/>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="UpdateNetworkInstanceInfra">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="updateNetwork_startEvent">
-        <dc:Bounds height="36.0" width="36.0" x="192.0" y="185.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="34.0" x="193.0" y="226.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="350.0" y="163.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
-        <di:waypoint xsi:type="dc:Point" x="228.0" y="203.0"/>
-        <di:waypoint xsi:type="dc:Point" x="350.0" y="203.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="249.0" y="203.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateUpdatePONetwork_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1343.0" y="1311.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_3" bpmnElement="faultHandler_CallActivity">
-        <dc:Bounds height="80.0" width="100.0" x="996.0" y="806.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_83" bpmnElement="callUpdateNetwork_ServiceTask">
-        <dc:Bounds height="80.0" width="100.0" x="1342.0" y="1176.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1343.0" y="276.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity">
-        <dc:Bounds height="80.0" width="100.0" x="137.0" y="1395.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
-        <dc:Bounds height="567.0" width="1122.0" x="17.0" y="585.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
-        <dc:Bounds height="36.0" width="36.0" x="48.0" y="1040.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="67.0" x="33.0" y="1081.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_79" bpmnElement="prepareFalloutHandler_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="756.0" y="806.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="1523.0" y="520.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="125.0" x="1487.0" y="569.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="sdncTopoNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_EndEvent_124">
-        <di:waypoint xsi:type="dc:Point" x="1573.0" y="545.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1682.0" y="546.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="1577.0" y="546.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="sdncTopoYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_ScriptTask_336">
-        <di:waypoint xsi:type="dc:Point" x="1523.0" y="545.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="545.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="576.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="1500.0" y="545.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="347.0" y="1392.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_83" bpmnElement="prepareDBInfraRequest_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="792.0" y="1390.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_86" bpmnElement="callDBInfra_ServiceTask">
-        <dc:Bounds height="80.0" width="100.0" x="564.0" y="1392.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
-        <dc:Bounds height="36.0" width="36.0" x="1682.0" y="528.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="74.0" x="1663.0" y="569.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callAssignSDNCAdapter_CallActivity">
-        <dc:Bounds height="80.0" width="100.0" x="1341.0" y="395.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_29" bpmnElement="sndcCompensation_BoundaryEvent">
-        <dc:Bounds height="36.0" width="36.0" x="1323.0" y="434.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="82.0" x="1280.0" y="474.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_67" targetElement="_BPMNShape_CallActivity_19">
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="356.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="374.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="374.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="395.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1389.0" y="374.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_CallActivity_19" targetElement="_BPMNShape_ScriptTask_131">
-        <di:waypoint xsi:type="dc:Point" x="1441.0" y="435.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1499.0" y="435.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1473.0" y="435.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_Association_1" bpmnElement="Association_1" sourceElement="_BPMNShape_BoundaryEvent_29" targetElement="_BPMNShape_CallActivity_21">
-        <di:waypoint xsi:type="dc:Point" x="1323.0" y="447.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1290.0" y="438.0"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_127">
-        <di:waypoint xsi:type="dc:Point" x="450.0" y="203.0"/>
-        <di:waypoint xsi:type="dc:Point" x="516.0" y="203.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="481.0" y="203.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="516.0" y="163.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ExclusiveGateway_90">
-        <di:waypoint xsi:type="dc:Point" x="84.0" y="1058.0"/>
-        <di:waypoint xsi:type="dc:Point" x="131.0" y="1058.0"/>
-        <di:waypoint xsi:type="dc:Point" x="131.0" y="1057.0"/>
-        <di:waypoint xsi:type="dc:Point" x="161.0" y="1057.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="96.0" y="1058.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_24" bpmnElement="sdncTopoRollback_IntermediateThrowEvent">
-        <dc:Bounds height="36.0" width="36.0" x="470.0" y="867.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="96.0" x="440.0" y="906.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_79" targetElement="_BPMNShape_CallActivity_3">
-        <di:waypoint xsi:type="dc:Point" x="856.0" y="846.0"/>
-        <di:waypoint xsi:type="dc:Point" x="996.0" y="846.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="881.0" y="846.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1499.0" y="395.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_131" targetElement="_BPMNShape_ExclusiveGateway_67">
-        <di:waypoint xsi:type="dc:Point" x="1549.0" y="475.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1549.0" y="492.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1548.0" y="492.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1548.0" y="520.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1545.0" y="503.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_40" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ServiceTask_86" targetElement="_BPMNShape_ScriptTask_80">
-        <di:waypoint xsi:type="dc:Point" x="564.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="506.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="506.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="447.0" y="1432.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="528.0" y="1432.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80" targetElement="_BPMNShape_CallActivity_4">
-        <di:waypoint xsi:type="dc:Point" x="347.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="292.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="292.0" y="1435.0"/>
-        <di:waypoint xsi:type="dc:Point" x="237.0" y="1435.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="290.0" y="1512.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_21" bpmnElement="callRollbackSDNCAdapter_CallActivity">
-        <dc:Bounds height="80.0" width="100.0" x="1190.0" y="384.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_133" bpmnElement="callRESTQueryNetworkId_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="984.0" y="100.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTReQuery2NetworkID_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1176.0" y="1390.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_135" bpmnElement="callRESTUpdateContrailNetwork_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="984.0" y="1392.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_135">
-        <di:waypoint xsi:type="dc:Point" x="1176.0" y="1430.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1118.0" y="1430.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1118.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1084.0" y="1432.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1143.0" y="1657.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_58" bpmnElement="SequenceFlow_37" sourceElement="_BPMNShape_ScriptTask_83" targetElement="_BPMNShape_ServiceTask_86">
-        <di:waypoint xsi:type="dc:Point" x="792.0" y="1430.0"/>
-        <di:waypoint xsi:type="dc:Point" x="691.0" y="1430.0"/>
-        <di:waypoint xsi:type="dc:Point" x="691.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="664.0" y="1432.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="773.0" y="1430.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_65" bpmnElement="SequenceFlow_46" sourceElement="_BPMNShape_ScriptTask_135" targetElement="_BPMNShape_ScriptTask_83">
-        <di:waypoint xsi:type="dc:Point" x="984.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="926.0" y="1432.0"/>
-        <di:waypoint xsi:type="dc:Point" x="926.0" y="1430.0"/>
-        <di:waypoint xsi:type="dc:Point" x="892.0" y="1430.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="947.0" y="1432.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="callRESTQueryVpnBinding_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1341.0" y="688.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_215">
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="768.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="810.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1388.0" y="781.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_87" bpmnElement="SequenceFlow_59" sourceElement="_BPMNShape_ServiceTask_83" targetElement="_BPMNShape_ScriptTask_63">
-        <di:waypoint xsi:type="dc:Point" x="1392.0" y="1256.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="1311.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1390.0" y="1284.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="prepareNetworkRequest_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1342.0" y="1052.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ServiceTask_83">
-        <di:waypoint xsi:type="dc:Point" x="1392.0" y="1132.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1392.0" y="1176.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1389.0" y="1159.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="isRollbackOn_Network_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="161.0" y="1032.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="98.0" x="138.0" y="1092.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="isRollbackOn_YesNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ExclusiveGateway_215">
-        <di:waypoint xsi:type="dc:Point" x="186.0" y="1032.0"/>
-        <di:waypoint xsi:type="dc:Point" x="186.0" y="1004.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="186.0" y="1020.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="isRollbackOn_NoNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_InclusiveGateway_24">
-        <di:waypoint xsi:type="dc:Point" x="211.0" y="1057.0"/>
-        <di:waypoint xsi:type="dc:Point" x="361.0" y="1057.0"/>
-        <di:waypoint xsi:type="dc:Point" x="361.0" y="1004.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="211.0" y="1062.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="callRESTQueryNetworkPolicy_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1341.0" y="810.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_60" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ScriptTask_335">
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="890.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="926.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1388.0" y="900.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_24" bpmnElement="InclusiveGateway_6">
-        <dc:Bounds height="50.0" width="50.0" x="336.0" y="954.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="361.0" y="1009.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="isPONR_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="161.0" y="954.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="60.0" x="88.0" y="969.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_InclusiveGateway_24">
-        <di:waypoint xsi:type="dc:Point" x="211.0" y="979.0"/>
-        <di:waypoint xsi:type="dc:Point" x="336.0" y="979.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="204.0" y="983.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_85" bpmnElement="isPONR_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_ExclusiveGateway_216">
-        <di:waypoint xsi:type="dc:Point" x="186.0" y="954.0"/>
-        <di:waypoint xsi:type="dc:Point" x="186.0" y="884.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="191.0" y="933.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_216" bpmnElement="isNetworkOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="161.0" y="834.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="95.0" x="68.0" y="849.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_86" bpmnElement="isNetworkOk_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_216" targetElement="_BPMNShape_ExclusiveGateway_217">
-        <di:waypoint xsi:type="dc:Point" x="211.0" y="859.0"/>
-        <di:waypoint xsi:type="dc:Point" x="273.0" y="859.0"/>
-        <di:waypoint xsi:type="dc:Point" x="273.0" y="781.0"/>
-        <di:waypoint xsi:type="dc:Point" x="336.0" y="781.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="211.0" y="863.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_90" bpmnElement="isNetworkOk_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_216" targetElement="_BPMNShape_ExclusiveGateway_217">
-        <di:waypoint xsi:type="dc:Point" x="186.0" y="834.0"/>
-        <di:waypoint xsi:type="dc:Point" x="186.0" y="781.0"/>
-        <di:waypoint xsi:type="dc:Point" x="273.0" y="781.0"/>
-        <di:waypoint xsi:type="dc:Point" x="336.0" y="781.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="192.0" y="814.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_217" bpmnElement="sdncOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="336.0" y="756.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="78.0" x="323.0" y="722.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="_BPMNShape_ScriptTask_261">
-        <di:waypoint xsi:type="dc:Point" x="386.0" y="781.0"/>
-        <di:waypoint xsi:type="dc:Point" x="438.0" y="781.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="386.0" y="779.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_93" bpmnElement="sdncOk_No_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="_BPMNShape_ScriptTask_262">
-        <di:waypoint xsi:type="dc:Point" x="361.0" y="806.0"/>
-        <di:waypoint xsi:type="dc:Point" x="362.0" y="845.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="366.0" y="806.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds height="36.0" width="36.0" x="169.0" y="1536.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="187.0" y="1577.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_CallActivity_4" targetElement="_BPMNShape_EndEvent_177">
-        <di:waypoint xsi:type="dc:Point" x="187.0" y="1475.0"/>
-        <di:waypoint xsi:type="dc:Point" x="187.0" y="1536.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="184.0" y="1475.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_178" bpmnElement="EndEvent_4">
-        <dc:Bounds height="36.0" width="36.0" x="1028.0" y="924.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="1046.0" y="965.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_CallActivity_3" targetElement="_BPMNShape_EndEvent_178">
-        <di:waypoint xsi:type="dc:Point" x="1046.0" y="886.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1046.0" y="924.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1043.0" y="888.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ServiceTask_97" targetElement="_BPMNShape_ScriptTask_79">
-        <di:waypoint xsi:type="dc:Point" x="676.0" y="846.0"/>
-        <di:waypoint xsi:type="dc:Point" x="756.0" y="846.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="686.0" y="846.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_97" bpmnElement="callDBInfraErrorUpdate_ServiceTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="576.0" y="806.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_218" bpmnElement="prepareDBInfraErrorRequest_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="576.0" y="940.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_218" targetElement="_BPMNShape_ServiceTask_97">
-        <di:waypoint xsi:type="dc:Point" x="626.0" y="940.0"/>
-        <di:waypoint xsi:type="dc:Point" x="626.0" y="886.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="623.0" y="927.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_245" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1200.0" y="100.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_53" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_245" targetElement="_BPMNShape_ScriptTask_67">
-        <di:waypoint xsi:type="dc:Point" x="1300.0" y="140.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1394.0" y="140.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="259.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="276.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1314.0" y="140.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_38" bpmnElement="BoundaryEvent_4">
-        <dc:Bounds height="36.0" width="36.0" x="1581.0" y="377.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_69" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_BoundaryEvent_38" targetElement="_BPMNShape_EndEvent_124">
-        <di:waypoint xsi:type="dc:Point" x="1617.0" y="395.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1700.0" y="394.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1700.0" y="528.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1697.0" y="467.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_261" bpmnElement="prepareSDNCRollbackRequest_ScriptTask">
-        <dc:Bounds height="79.0" width="100.0" x="438.0" y="742.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_262" bpmnElement="validateRollbacksResponse_ScriptTask_2">
-        <dc:Bounds height="80.0" width="100.0" x="312.0" y="845.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_76" bpmnElement="SequenceFlow_47" sourceElement="_BPMNShape_InclusiveGateway_24" targetElement="_BPMNShape_ScriptTask_218">
-        <di:waypoint xsi:type="dc:Point" x="386.0" y="979.0"/>
-        <di:waypoint xsi:type="dc:Point" x="548.0" y="979.0"/>
-        <di:waypoint xsi:type="dc:Point" x="548.0" y="980.0"/>
-        <di:waypoint xsi:type="dc:Point" x="576.0" y="980.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="393.0" y="979.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_84" bpmnElement="SequenceFlow_53" sourceElement="_BPMNShape_ScriptTask_261" targetElement="_BPMNShape_IntermediateThrowEvent_24">
-        <di:waypoint xsi:type="dc:Point" x="488.0" y="820.0"/>
-        <di:waypoint xsi:type="dc:Point" x="488.0" y="867.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="485.0" y="847.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_88" bpmnElement="SequenceFlow_55" sourceElement="_BPMNShape_IntermediateThrowEvent_24" targetElement="_BPMNShape_ScriptTask_262">
-        <di:waypoint xsi:type="dc:Point" x="470.0" y="885.0"/>
-        <di:waypoint xsi:type="dc:Point" x="441.0" y="885.0"/>
-        <di:waypoint xsi:type="dc:Point" x="441.0" y="885.0"/>
-        <di:waypoint xsi:type="dc:Point" x="412.0" y="885.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="448.0" y="885.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_262" targetElement="_BPMNShape_InclusiveGateway_24">
-        <di:waypoint xsi:type="dc:Point" x="362.0" y="925.0"/>
-        <di:waypoint xsi:type="dc:Point" x="361.0" y="954.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="358.0" y="948.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_134">
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="1391.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="1430.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1310.0" y="1430.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1276.0" y="1430.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1390.0" y="1425.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
-        <dc:Bounds height="188.0" width="394.0" x="21.0" y="381.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="54.0" y="458.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="72.0" y="499.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="ScriptTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="169.0" y="436.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_220" bpmnElement="EndEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="330.0" y="458.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="348.0" y="499.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_270">
-        <di:waypoint xsi:type="dc:Point" x="90.0" y="476.0"/>
-        <di:waypoint xsi:type="dc:Point" x="169.0" y="476.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="129.0" y="476.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_270" targetElement="_BPMNShape_EndEvent_220">
-        <di:waypoint xsi:type="dc:Point" x="269.0" y="476.0"/>
-        <di:waypoint xsi:type="dc:Point" x="330.0" y="476.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="301.0" y="476.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_72" bpmnElement="callGetServiceInstance">
-        <dc:Bounds height="80.0" width="100.0" x="686.0" y="163.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_244" bpmnElement="siFoundCheck" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="836.0" y="177.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="79.0" x="891.0" y="195.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_CallActivity_72" targetElement="_BPMNShape_ExclusiveGateway_244">
-        <di:waypoint xsi:type="dc:Point" x="786.0" y="203.0"/>
-        <di:waypoint xsi:type="dc:Point" x="805.0" y="203.0"/>
-        <di:waypoint xsi:type="dc:Point" x="805.0" y="202.0"/>
-        <di:waypoint xsi:type="dc:Point" x="836.0" y="202.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="799.0" y="203.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="siFoundYes" sourceElement="_BPMNShape_ExclusiveGateway_244" targetElement="_BPMNShape_ScriptTask_133">
-        <di:waypoint xsi:type="dc:Point" x="861.0" y="177.0"/>
-        <di:waypoint xsi:type="dc:Point" x="861.0" y="140.0"/>
-        <di:waypoint xsi:type="dc:Point" x="910.0" y="140.0"/>
-        <di:waypoint xsi:type="dc:Point" x="984.0" y="140.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="868.0" y="157.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_247" bpmnElement="EndEvent_2">
-        <dc:Bounds height="36.0" width="36.0" x="1155.0" y="278.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="1173.0" y="319.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_331" bpmnElement="workflowExceptionSINotFound">
-        <dc:Bounds height="80.0" width="100.0" x="984.0" y="256.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="siFoundNo" sourceElement="_BPMNShape_ExclusiveGateway_244" targetElement="_BPMNShape_ScriptTask_331">
-        <di:waypoint xsi:type="dc:Point" x="861.0" y="227.0"/>
-        <di:waypoint xsi:type="dc:Point" x="861.0" y="296.0"/>
-        <di:waypoint xsi:type="dc:Point" x="984.0" y="296.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="871.0" y="233.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ScriptTask_331" targetElement="_BPMNShape_EndEvent_247">
-        <di:waypoint xsi:type="dc:Point" x="1084.0" y="296.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1155.0" y="296.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1103.0" y="296.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_133" targetElement="_BPMNShape_ScriptTask_245">
-        <di:waypoint xsi:type="dc:Point" x="1084.0" y="140.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1200.0" y="140.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1127.0" y="140.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ScriptTask_127" targetElement="_BPMNShape_CallActivity_72">
-        <di:waypoint xsi:type="dc:Point" x="616.0" y="203.0"/>
-        <di:waypoint xsi:type="dc:Point" x="686.0" y="203.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="632.0" y="203.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="callRESTQueryNetworkTableRef_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1341.0" y="926.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_335" targetElement="_BPMNShape_ScriptTask_157">
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="1006.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1392.0" y="1052.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1388.0" y="1028.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_336" bpmnElement="callRESTReQuery1NetworkID_ScriptTask">
-        <dc:Bounds height="80.0" width="100.0" x="1343.0" y="576.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_336" targetElement="_BPMNShape_ScriptTask_156">
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="656.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1393.0" y="672.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="672.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1391.0" y="688.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1390.0" y="666.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
index ecd23f0..5488350 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
@@ -623,12 +623,12 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <dc:Bounds x="1590" y="155" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
-        <dc:Bounds x="25" y="610" width="1266" height="686" />
+        <dc:Bounds x="31" y="608" width="1266" height="686" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
-        <dc:Bounds x="101" y="1168" width="36" height="36" />
+        <dc:Bounds x="107" y="1166" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="95" y="1209" width="50" height="12" />
+          <dc:Bounds x="101" y="1207" width="50" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoOk_ExclusiveGateway" isMarkerVisible="true">
@@ -675,10 +675,10 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50">
-        <di:waypoint xsi:type="dc:Point" x="137" y="1186" />
-        <di:waypoint xsi:type="dc:Point" x="164" y="1186" />
+        <di:waypoint xsi:type="dc:Point" x="143" y="1184" />
+        <di:waypoint xsi:type="dc:Point" x="170" y="1184" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="151" y="1171" width="0" height="0" />
+          <dc:Bounds x="157" y="1169" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
@@ -795,46 +795,46 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="isPONR_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="298" y="1062" width="50" height="50" />
+        <dc:Bounds x="304" y="1060" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="242" y="1080" width="46" height="12" />
+          <dc:Bounds x="248" y="1078" width="46" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
-        <di:waypoint xsi:type="dc:Point" x="348" y="1087" />
-        <di:waypoint xsi:type="dc:Point" x="451" y="1087" />
-        <di:waypoint xsi:type="dc:Point" x="451" y="1161" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="1085" />
+        <di:waypoint xsi:type="dc:Point" x="457" y="1085" />
+        <di:waypoint xsi:type="dc:Point" x="457" y="1159" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="345" y="1090" width="18" height="12" />
+          <dc:Bounds x="351" y="1088" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_85" bpmnElement="isPONR_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
-        <di:waypoint xsi:type="dc:Point" x="323" y="1062" />
-        <di:waypoint xsi:type="dc:Point" x="323" y="1005" />
+        <di:waypoint xsi:type="dc:Point" x="329" y="1060" />
+        <di:waypoint xsi:type="dc:Point" x="329" y="1003" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="333" y="1053" width="14" height="12" />
+          <dc:Bounds x="339" y="1051" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_217" bpmnElement="sdncOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="521" y="847" width="50" height="50" />
+        <dc:Bounds x="527" y="845" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="579" y="860" width="72" height="24" />
+          <dc:Bounds x="585" y="858" width="72" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="_BPMNShape_ScriptTask_261">
-        <di:waypoint xsi:type="dc:Point" x="546" y="847" />
-        <di:waypoint xsi:type="dc:Point" x="546" y="778" />
-        <di:waypoint xsi:type="dc:Point" x="707" y="778" />
+        <di:waypoint xsi:type="dc:Point" x="552" y="845" />
+        <di:waypoint xsi:type="dc:Point" x="552" y="776" />
+        <di:waypoint xsi:type="dc:Point" x="713" y="776" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="553" y="831" width="18" height="12" />
+          <dc:Bounds x="559" y="829" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_93" bpmnElement="sdncOk_No_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217">
-        <di:waypoint xsi:type="dc:Point" x="545" y="896" />
-        <di:waypoint xsi:type="dc:Point" x="545" y="980" />
-        <di:waypoint xsi:type="dc:Point" x="707" y="980" />
+        <di:waypoint xsi:type="dc:Point" x="551" y="894" />
+        <di:waypoint xsi:type="dc:Point" x="551" y="978" />
+        <di:waypoint xsi:type="dc:Point" x="713" y="978" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="553" y="897" width="14" height="12" />
+          <dc:Bounds x="559" y="895" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_245" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
@@ -861,7 +861,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_261" bpmnElement="prepareSDNCRollbackRequest_ScriptTask">
-        <dc:Bounds x="880" y="832" width="100" height="79" />
+        <dc:Bounds x="886" y="830" width="100" height="79" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_134">
         <di:waypoint xsi:type="dc:Point" x="1507" y="1338" />
@@ -1074,24 +1074,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0f9d94i_di" bpmnElement="isSDNCActivate_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="298" y="955" width="50" height="50" />
+        <dc:Bounds x="304" y="953" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="204" y="968" width="84" height="24" />
+          <dc:Bounds x="210" y="966" width="84" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0cly7z2_di" bpmnElement="SequenceFlow_0cly7z2">
-        <di:waypoint xsi:type="dc:Point" x="323" y="955" />
-        <di:waypoint xsi:type="dc:Point" x="323" y="912" />
+        <di:waypoint xsi:type="dc:Point" x="329" y="953" />
+        <di:waypoint xsi:type="dc:Point" x="329" y="910" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="329" y="939" width="18" height="12" />
+          <dc:Bounds x="335" y="937" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_12tlymf_di" bpmnElement="SequenceFlow_12tlymf">
-        <di:waypoint xsi:type="dc:Point" x="348" y="980" />
-        <di:waypoint xsi:type="dc:Point" x="451" y="980" />
-        <di:waypoint xsi:type="dc:Point" x="451" y="897" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="978" />
+        <di:waypoint xsi:type="dc:Point" x="457" y="978" />
+        <di:waypoint xsi:type="dc:Point" x="457" y="895" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="344" y="990" width="14" height="12" />
+          <dc:Bounds x="350" y="988" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1ts3ph0_di" bpmnElement="isSdncRpc1_ExclusiveGateway1" isMarkerVisible="true">
@@ -1133,24 +1133,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_00dh41t_di" bpmnElement="isSdncRpc4_ExclusiveGateway4" isMarkerVisible="true">
-        <dc:Bounds x="707" y="753" width="50" height="50" />
+        <dc:Bounds x="713" y="751" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="701" y="712" width="76" height="24" />
+          <dc:Bounds x="707" y="710" width="76" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0suu90e_di" bpmnElement="isSdncRpc4Yes_SequenceFlow4">
-        <di:waypoint xsi:type="dc:Point" x="732" y="803" />
-        <di:waypoint xsi:type="dc:Point" x="732" y="832" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="801" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="830" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="737" y="802" width="18" height="12" />
+          <dc:Bounds x="743" y="800" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0xnyl6e_di" bpmnElement="isSdncRpc4No_SequenceFlow4">
-        <di:waypoint xsi:type="dc:Point" x="757" y="778" />
-        <di:waypoint xsi:type="dc:Point" x="930" y="778" />
-        <di:waypoint xsi:type="dc:Point" x="930" y="832" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="776" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="776" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="830" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="766" y="757" width="14" height="12" />
+          <dc:Bounds x="772" y="755" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1gghe34_di" bpmnElement="isSdncRpc2_ExclusiveGateway2" isMarkerVisible="true">
@@ -1178,7 +1178,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <dc:Bounds x="1312" y="395" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_19o9l99_di" bpmnElement="Task_0q6pzpn">
-        <dc:Bounds x="682" y="832" width="100" height="80" />
+        <dc:Bounds x="688" y="830" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1te02c4_di" bpmnElement="EndEvent_1te02c4">
         <dc:Bounds x="467" y="1426" width="36" height="36" />
@@ -1187,9 +1187,9 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1kpt4kc_di" bpmnElement="EndEvent_1kpt4kc">
-        <dc:Bounds x="1154" y="1077" width="36" height="36" />
+        <dc:Bounds x="1160" y="1075" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1173" y="1113" width="0" height="0" />
+          <dc:Bounds x="1179" y="1111" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0ti2ctu_di" bpmnElement="EndEvent_0ti2ctu">
@@ -1211,17 +1211,17 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <dc:Bounds x="699" y="1404" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0myjg9k_di" bpmnElement="ScriptTask_0myjg9k">
-        <dc:Bounds x="682" y="1055" width="100" height="80" />
+        <dc:Bounds x="688" y="1053" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0b8j5rw_di" bpmnElement="SequenceFlow_0b8j5rw">
-        <di:waypoint xsi:type="dc:Point" x="373" y="872" />
-        <di:waypoint xsi:type="dc:Point" x="426" y="872" />
+        <di:waypoint xsi:type="dc:Point" x="379" y="870" />
+        <di:waypoint xsi:type="dc:Point" x="432" y="870" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="400" y="857" width="0" height="0" />
+          <dc:Bounds x="406" y="855" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_17adm0m_di" bpmnElement="Task_1imzwi3">
-        <dc:Bounds x="273" y="832" width="100" height="80" />
+        <dc:Bounds x="279" y="830" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ipz2ze_di" bpmnElement="SequenceFlow_1ipz2ze">
         <di:waypoint xsi:type="dc:Point" x="1454" y="1578" />
@@ -1233,98 +1233,98 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1u07hp7_di" bpmnElement="CallActivity_1u07hp7">
-        <dc:Bounds x="835" y="1055" width="100" height="80" />
+        <dc:Bounds x="841" y="1053" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0vzsyrd_di" bpmnElement="SequenceFlow_0vzsyrd">
-        <di:waypoint xsi:type="dc:Point" x="935" y="1095" />
-        <di:waypoint xsi:type="dc:Point" x="1001" y="1095" />
+        <di:waypoint xsi:type="dc:Point" x="941" y="1093" />
+        <di:waypoint xsi:type="dc:Point" x="1007" y="1093" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="968" y="1080" width="0" height="0" />
+          <dc:Bounds x="974" y="1078" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0bwpkkb_di" bpmnElement="SequenceFlow_0bwpkkb">
-        <di:waypoint xsi:type="dc:Point" x="732" y="912" />
-        <di:waypoint xsi:type="dc:Point" x="732" y="955" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="910" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="953" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="747" y="924" width="0" height="0" />
+          <dc:Bounds x="753" y="922" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0lndbvr_di" bpmnElement="SequenceFlow_0lndbvr">
-        <di:waypoint xsi:type="dc:Point" x="930" y="911" />
-        <di:waypoint xsi:type="dc:Point" x="930" y="980" />
-        <di:waypoint xsi:type="dc:Point" x="757" y="980" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="909" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="978" />
+        <di:waypoint xsi:type="dc:Point" x="763" y="978" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="945" y="946" width="0" height="0" />
+          <dc:Bounds x="951" y="944" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_096tad6_di" bpmnElement="SequenceFlow_096tad6">
-        <di:waypoint xsi:type="dc:Point" x="782" y="1095" />
-        <di:waypoint xsi:type="dc:Point" x="835" y="1095" />
+        <di:waypoint xsi:type="dc:Point" x="788" y="1093" />
+        <di:waypoint xsi:type="dc:Point" x="841" y="1093" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="809" y="1080" width="0" height="0" />
+          <dc:Bounds x="815" y="1078" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="TextAnnotation_1py1p84_di" bpmnElement="TextAnnotation_1py1p84">
-        <dc:Bounds x="1030" y="903" width="252" height="119" />
+        <dc:Bounds x="1036" y="901" width="252" height="119" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Association_0nketgd_di" bpmnElement="Association_0nketgd">
-        <di:waypoint xsi:type="dc:Point" x="935" y="1071" />
-        <di:waypoint xsi:type="dc:Point" x="1035" y="1022" />
+        <di:waypoint xsi:type="dc:Point" x="941" y="1069" />
+        <di:waypoint xsi:type="dc:Point" x="1041" y="1020" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0w2ekuz_di" bpmnElement="ScriptTask_0w2ekuz">
-        <dc:Bounds x="1001" y="1055" width="100" height="80" />
+        <dc:Bounds x="1007" y="1053" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1qwubew_di" bpmnElement="SequenceFlow_1qwubew">
-        <di:waypoint xsi:type="dc:Point" x="1101" y="1095" />
-        <di:waypoint xsi:type="dc:Point" x="1154" y="1095" />
+        <di:waypoint xsi:type="dc:Point" x="1107" y="1093" />
+        <di:waypoint xsi:type="dc:Point" x="1160" y="1093" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1128" y="1070" width="0" height="0" />
+          <dc:Bounds x="1134" y="1068" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1r7vhm5_di" bpmnElement="isRollbackOn_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="298" y="1161" width="50" height="50" />
+        <dc:Bounds x="304" y="1159" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="284" y="1211" width="78" height="12" />
+          <dc:Bounds x="290" y="1209" width="78" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_19kcbiw_di" bpmnElement="isRollbackOn_SequenceFlow_Yes">
-        <di:waypoint xsi:type="dc:Point" x="323" y="1161" />
-        <di:waypoint xsi:type="dc:Point" x="323" y="1112" />
+        <di:waypoint xsi:type="dc:Point" x="329" y="1159" />
+        <di:waypoint xsi:type="dc:Point" x="329" y="1110" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="331" y="1144" width="18" height="12" />
+          <dc:Bounds x="337" y="1142" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0pl3e54_di" bpmnElement="isRollbackOn_SequenceFlow_No">
-        <di:waypoint xsi:type="dc:Point" x="348" y="1186" />
-        <di:waypoint xsi:type="dc:Point" x="426" y="1186" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="1184" />
+        <di:waypoint xsi:type="dc:Point" x="432" y="1184" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="349" y="1192" width="14" height="12" />
+          <dc:Bounds x="355" y="1190" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_0zl5xa8_di" bpmnElement="ExclusiveGateway_1qb2vwe">
-        <dc:Bounds x="707" y="955" width="50" height="50" />
+        <dc:Bounds x="713" y="953" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="732" y="1005" width="0" height="0" />
+          <dc:Bounds x="738" y="1003" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_15sffxc_di" bpmnElement="SequenceFlow_15sffxc">
-        <di:waypoint xsi:type="dc:Point" x="732" y="1005" />
-        <di:waypoint xsi:type="dc:Point" x="732" y="1055" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="1003" />
+        <di:waypoint xsi:type="dc:Point" x="738" y="1053" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="747" y="1030" width="0" height="0" />
+          <dc:Bounds x="753" y="1028" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_0t3i8it_di" bpmnElement="ExclusiveGateway_1bk0tqd">
-        <dc:Bounds x="426" y="847" width="50" height="50" />
+        <dc:Bounds x="432" y="845" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="451" y="897" width="0" height="0" />
+          <dc:Bounds x="457" y="895" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0k7y7b5_di" bpmnElement="SequenceFlow_0k7y7b5">
-        <di:waypoint xsi:type="dc:Point" x="476" y="872" />
-        <di:waypoint xsi:type="dc:Point" x="521" y="872" />
+        <di:waypoint xsi:type="dc:Point" x="482" y="870" />
+        <di:waypoint xsi:type="dc:Point" x="527" y="870" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="499" y="847" width="0" height="0" />
+          <dc:Bounds x="505" y="845" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0p3v749_di" bpmnElement="ScriptTask_0p3v749">
@@ -1338,17 +1338,17 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_1eochiz_di" bpmnElement="ExclusiveGateway_1umhuft">
-        <dc:Bounds x="426" y="1161" width="50" height="50" />
+        <dc:Bounds x="432" y="1159" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="451" y="1211" width="0" height="0" />
+          <dc:Bounds x="457" y="1209" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_17nx822_di" bpmnElement="SequenceFlow_17nx822">
-        <di:waypoint xsi:type="dc:Point" x="476" y="1186" />
-        <di:waypoint xsi:type="dc:Point" x="1051" y="1186" />
-        <di:waypoint xsi:type="dc:Point" x="1051" y="1135" />
+        <di:waypoint xsi:type="dc:Point" x="482" y="1184" />
+        <di:waypoint xsi:type="dc:Point" x="1057" y="1184" />
+        <di:waypoint xsi:type="dc:Point" x="1057" y="1133" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="764" y="1171" width="0" height="0" />
+          <dc:Bounds x="770" y="1169" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="TextAnnotation_1orb6o6_di" bpmnElement="TextAnnotation_1orb6o6">
@@ -1359,20 +1359,20 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <di:waypoint xsi:type="dc:Point" x="1621" y="1278" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="TextAnnotation_0wjpv6r_di" bpmnElement="TextAnnotation_0wjpv6r">
-        <dc:Bounds x="335" y="737" width="180" height="36" />
+        <dc:Bounds x="341" y="735" width="180" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Association_0eolbkz_di" bpmnElement="Association_0eolbkz">
-        <di:waypoint xsi:type="dc:Point" x="446" y="852" />
-        <di:waypoint xsi:type="dc:Point" x="429" y="773" />
+        <di:waypoint xsi:type="dc:Point" x="452" y="850" />
+        <di:waypoint xsi:type="dc:Point" x="435" y="771" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0j3058g_di" bpmnElement="ScriptTask_0j3058g">
-        <dc:Bounds x="164" y="1146" width="100" height="80" />
+        <dc:Bounds x="170" y="1144" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_10ttvwn_di" bpmnElement="SequenceFlow_10ttvwn">
-        <di:waypoint xsi:type="dc:Point" x="264" y="1186" />
-        <di:waypoint xsi:type="dc:Point" x="298" y="1186" />
+        <di:waypoint xsi:type="dc:Point" x="270" y="1184" />
+        <di:waypoint xsi:type="dc:Point" x="304" y="1184" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="281" y="1161" width="0" height="0" />
+          <dc:Bounds x="287" y="1159" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
index a770c8c..19fd490 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
@@ -1,390 +1,431 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="DoCreateServiceInstance" name="DoCreateServiceInstance" isExecutable="true">

-    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />

-    <bpmn2:scriptTask id="getAAICustomerById_scriptTask" name="Get AAI Customer By globalCustomerId " scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DoCreateServiceInstance" name="DoCreateServiceInstance" isExecutable="true">
+    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:scriptTask id="getAAICustomerById_scriptTask" name="Get AAI Customer By globalCustomerId " scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def dcsi = new DoCreateServiceInstance()

-dcsi.getAAICustomerById(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="ExclusiveGateway_09wkav2" />

-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

+def dcsi = new DoCreateServiceInstance()
+dcsi.getAAICustomerById(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="ExclusiveGateway_09wkav2" />
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def dcsi = new DoCreateServiceInstance()

-dcsi.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="callGenericGetService" targetRef="ScriptTask_0i8cqdy" />

-    <bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_156ih25</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>

+def dcsi = new DoCreateServiceInstance()
+dcsi.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="callGenericGetService" targetRef="ScriptTask_0i8cqdy" />
+    <bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_156ih25</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def dcsi = new DoCreateServiceInstance()

-dcsi.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="Post Process SDNC Assign Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

+def dcsi = new DoCreateServiceInstance()
+dcsi.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="Post Process SDNC Assign Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def dcsi = new DoCreateServiceInstance()

-dcsi.postProcessSDNCAssign(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:callActivity id="CallSDNCAdapterServiceTopologyAssign" name="Call SDNC Adapter Service Topology Assign" calledElement="sdncAdapter">

-      <bpmn2:extensionElements>

-        <camunda:in source="sdncAssignRequest" target="sdncAdapterWorkflowRequest" />

-        <camunda:in source="msoRequestId" target="mso-request-id" />

-        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />

-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="getAAICustomerById_scriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterServiceTopologyAssign" />

-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallSDNCAdapterServiceTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />

-    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="EndEvent_3" />

-    <bpmn2:callActivity id="callGenericGetService" name="Call GenericGetService" calledElement="GenericGetService">

-      <bpmn2:extensionElements>

-        <camunda:in source="serviceInstanceName" target="GENGS_serviceInstanceName" />

-        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />

-        <camunda:in sourceExpression="service-instance" target="GENGS_type" />

-        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />

-        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:callActivity id="callGenericPutService" name="Call Generic Put Service" calledElement="GenericPutService">

-      <bpmn2:extensionElements>

-        <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" />

-        <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" />

-        <camunda:in source="subscriptionServiceType" target="GENPS_serviceType" />

-        <camunda:in sourceExpression="service-instance" target="GENPS_type" />

-        <camunda:in source="serviceInstanceData" target="GENPS_payload" />

-        <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" />

-        <camunda:in source="msoRequestId" target="GENPS_requesId" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_1w01tqs</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_129ih1g</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:sequenceFlow id="SequenceFlow_129ih1g" sourceRef="callGenericPutService" targetRef="ScriptTask_0q37vn9" />

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="sdncVersion is 1610 or serviceInstance name is populated?" default="SequenceFlow_1uw2p9a">

-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericGetService">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("serviceInstanceName" )  != null && execution.getVariable("serviceInstanceName" )  != "" ) || execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericPutService" />

-    <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_0yljq9y">

-        <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition />

-      </bpmn2:startEvent>

-      <bpmn2:endEvent id="EndEvent_117lkk3">

-        <bpmn2:incoming>SequenceFlow_1xzgv5k</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:callActivity id="CallActivity_1srx6p6" name="Call DoCreateServiceInstanceRollback" calledElement="DoCreateServiceInstanceRollback">

-        <bpmn2:extensionElements>

-          <camunda:in source="msoRequestId" target="mso-request-id" />

-          <camunda:in source="rollbackData" target="rollbackData" />

-          <camunda:out source="rolledBack" target="rolledBack" />

-          <camunda:in source="disableRollback" target="disableRollback" />

-          <camunda:out source="rollbackError" target="rollbackErrror" />

-        </bpmn2:extensionElements>

-        <bpmn2:incoming>SequenceFlow_1lqktwf</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0eumzpf</bpmn2:outgoing>

-      </bpmn2:callActivity>

-      <bpmn2:sequenceFlow id="SequenceFlow_0eumzpf" sourceRef="CallActivity_1srx6p6" targetRef="ScriptTask_1p0vyip" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="ScriptTask_0ocetux" />

-      <bpmn2:scriptTask id="ScriptTask_0ocetux" name="Pre Process Rollback" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1lqktwf</bpmn2:outgoing>

+def dcsi = new DoCreateServiceInstance()
+dcsi.postProcessSDNCAssign(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="CallSDNCAdapterServiceTopologyAssign" name="Call SDNC Adapter Service Topology Assign" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="sdncAssignRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="msoRequestId" target="mso-request-id" />
+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_01q6pl4</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="getAAICustomerById_scriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterServiceTopologyAssign" />
+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallSDNCAdapterServiceTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="CallActivity_1707jgc" />
+    <bpmn2:callActivity id="callGenericGetService" name="Call GenericGetService" calledElement="GenericGetService">
+      <bpmn2:extensionElements>
+        <camunda:in source="serviceInstanceName" target="GENGS_serviceInstanceName" />
+        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />
+        <camunda:in sourceExpression="service-instance" target="GENGS_type" />
+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
+        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:callActivity id="callGenericPutService" name="Call Generic Put Service" calledElement="GenericPutService">
+      <bpmn2:extensionElements>
+        <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" />
+        <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" />
+        <camunda:in source="subscriptionServiceType" target="GENPS_serviceType" />
+        <camunda:in sourceExpression="service-instance" target="GENPS_type" />
+        <camunda:in source="serviceInstanceData" target="GENPS_payload" />
+        <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" />
+        <camunda:in source="msoRequestId" target="GENPS_requesId" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1w01tqs</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_129ih1g</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_129ih1g" sourceRef="callGenericPutService" targetRef="ScriptTask_0q37vn9" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="sdncVersion is 1610 or serviceInstance name is populated?" default="SequenceFlow_1uw2p9a">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericGetService">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("serviceInstanceName" )  != null && execution.getVariable("serviceInstanceName" )  != "" ) || execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericPutService" />
+    <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_0yljq9y">
+        <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_117lkk3">
+        <bpmn2:incoming>SequenceFlow_1xzgv5k</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:callActivity id="CallActivity_1srx6p6" name="Call DoCreateServiceInstanceRollback" calledElement="DoCreateServiceInstanceRollback">
+        <bpmn2:extensionElements>
+          <camunda:in source="msoRequestId" target="mso-request-id" />
+          <camunda:in source="rollbackData" target="rollbackData" />
+          <camunda:out source="rolledBack" target="rolledBack" />
+          <camunda:in source="disableRollback" target="disableRollback" />
+          <camunda:out source="rollbackError" target="rollbackErrror" />
+        </bpmn2:extensionElements>
+        <bpmn2:incoming>SequenceFlow_1lqktwf</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0eumzpf</bpmn2:outgoing>
+      </bpmn2:callActivity>
+      <bpmn2:sequenceFlow id="SequenceFlow_0eumzpf" sourceRef="CallActivity_1srx6p6" targetRef="ScriptTask_1p0vyip" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="ScriptTask_0ocetux" />
+      <bpmn2:scriptTask id="ScriptTask_0ocetux" name="Pre Process Rollback" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1lqktwf</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def dcsi = new DoCreateServiceInstance()

-dcsi.preProcessRollback(execution)

-]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_1lqktwf" sourceRef="ScriptTask_0ocetux" targetRef="CallActivity_1srx6p6" />

-      <bpmn2:scriptTask id="ScriptTask_1p0vyip" name="Post Process Rollback" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_0eumzpf</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1xzgv5k</bpmn2:outgoing>

+def dcsi = new DoCreateServiceInstance()
+dcsi.preProcessRollback(execution)
+]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_1lqktwf" sourceRef="ScriptTask_0ocetux" targetRef="CallActivity_1srx6p6" />
+      <bpmn2:scriptTask id="ScriptTask_1p0vyip" name="Post Process Rollback" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0eumzpf</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1xzgv5k</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def dcsi = new DoCreateServiceInstance()

-dcsi.postProcessRollback(execution)

-]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_1xzgv5k" sourceRef="ScriptTask_1p0vyip" targetRef="EndEvent_117lkk3" />

-    </bpmn2:subProcess>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nk6aol" name="sdncVersion is 1610?" default="SequenceFlow_156ih25">

-      <bpmn2:incoming>SequenceFlow_1dd86x8</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_156ih25</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_00v4npo</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_156ih25" name="no" sourceRef="ExclusiveGateway_1nk6aol" targetRef="PreProcessSDNCAssignRequest" />

-    <bpmn2:endEvent id="EndEvent_10659gr">

-      <bpmn2:incoming>SequenceFlow_00v4npo</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_00v4npo" name="yes" sourceRef="ExclusiveGateway_1nk6aol" targetRef="EndEvent_10659gr">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion" ) == "1610"}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:scriptTask id="ScriptTask_0i8cqdy" name="Post Process AAI GET" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1w01tqs</bpmn2:outgoing>

+def dcsi = new DoCreateServiceInstance()
+dcsi.postProcessRollback(execution)
+]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_1xzgv5k" sourceRef="ScriptTask_1p0vyip" targetRef="EndEvent_117lkk3" />
+    </bpmn2:subProcess>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nk6aol" name="sdncVersion is 1610?" default="SequenceFlow_156ih25">
+      <bpmn2:incoming>SequenceFlow_1dd86x8</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_156ih25</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_00v4npo</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_156ih25" name="no" sourceRef="ExclusiveGateway_1nk6aol" targetRef="PreProcessSDNCAssignRequest" />
+    <bpmn2:endEvent id="EndEvent_10659gr">
+      <bpmn2:incoming>SequenceFlow_00v4npo</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_00v4npo" name="yes" sourceRef="ExclusiveGateway_1nk6aol" targetRef="EndEvent_10659gr">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion" ) == "1610"}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:scriptTask id="ScriptTask_0i8cqdy" name="Post Process AAI GET" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1w01tqs</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def dcsi = new DoCreateServiceInstance()

-dcsi.postProcessAAIGET(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1w01tqs" sourceRef="ScriptTask_0i8cqdy" targetRef="callGenericPutService" />

-    <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_129ih1g</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1dd86x8</bpmn2:outgoing>

+def dcsi = new DoCreateServiceInstance()
+dcsi.postProcessAAIGET(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1w01tqs" sourceRef="ScriptTask_0i8cqdy" targetRef="callGenericPutService" />
+    <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_129ih1g</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1dd86x8</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def ddsi = new DoCreateServiceInstance()

-ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" />

-  </bpmn2:process>

-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstance">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">

-        <dc:Bounds x="152" y="79" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="147" y="120" width="48" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

-        <dc:Bounds x="245" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

-        <di:waypoint xsi:type="dc:Point" x="188" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="245" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="217" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="getAAICustomerById_scriptTask">

-        <dc:Bounds x="393" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_62">

-        <di:waypoint xsi:type="dc:Point" x="493" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="565" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="529" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

-        <dc:Bounds x="1142" y="886" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1160" y="927" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_4">

-        <di:waypoint xsi:type="dc:Point" x="839" y="94" />

-        <di:waypoint xsi:type="dc:Point" x="971" y="94" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="905" y="79" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_334" bpmnElement="PreProcessSDNCAssignRequest">

-        <dc:Bounds x="972" y="578" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="PostProcessSDNCAssignRequest">

-        <dc:Bounds x="972" y="864" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_74" bpmnElement="CallSDNCAdapterServiceTopologyAssign">

-        <dc:Bounds x="972" y="721" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_62">

-        <di:waypoint xsi:type="dc:Point" x="345" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="393" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="369" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_334" targetElement="_BPMNShape_CallActivity_74">

-        <di:waypoint xsi:type="dc:Point" x="1020" y="658" />

-        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />

-        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />

-        <di:waypoint xsi:type="dc:Point" x="1020" y="715" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1035" y="692" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_74" targetElement="_BPMNShape_ScriptTask_335">

-        <di:waypoint xsi:type="dc:Point" x="1022" y="801" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="864" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1037" y="840" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_335">

-        <di:waypoint xsi:type="dc:Point" x="1072" y="904" />

-        <di:waypoint xsi:type="dc:Point" x="1111" y="904" />

-        <di:waypoint xsi:type="dc:Point" x="1111" y="904" />

-        <di:waypoint xsi:type="dc:Point" x="1142" y="904" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1126" y="904" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericGetService">

-        <dc:Bounds x="739" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="callGenericPutService">

-        <dc:Bounds x="972" y="206" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_129ih1g_di" bpmnElement="SequenceFlow_129ih1g">

-        <di:waypoint xsi:type="dc:Point" x="1023" y="286" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="336" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1023" y="296" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">

-        <dc:Bounds x="565" y="72" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="547" y="7" width="81" height="62" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">

-        <di:waypoint xsi:type="dc:Point" x="615" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="739" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="635" y="76" width="18" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">

-        <di:waypoint xsi:type="dc:Point" x="590" y="122" />

-        <di:waypoint xsi:type="dc:Point" x="590" y="246" />

-        <di:waypoint xsi:type="dc:Point" x="972" y="246" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="594" y="132.89706349694825" width="12" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">

-        <dc:Bounds x="99" y="531" width="783" height="195" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">

-        <dc:Bounds x="195" y="608" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="213" y="649" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3">

-        <dc:Bounds x="828" y="608" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="846" y="649" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="CallActivity_1srx6p6_di" bpmnElement="CallActivity_1srx6p6">

-        <dc:Bounds x="493" y="586" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0eumzpf_di" bpmnElement="SequenceFlow_0eumzpf">

-        <di:waypoint xsi:type="dc:Point" x="593" y="626" />

-        <di:waypoint xsi:type="dc:Point" x="661" y="626" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="627" y="611" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11">

-        <di:waypoint xsi:type="dc:Point" x="231" y="626" />

-        <di:waypoint xsi:type="dc:Point" x="330" y="626" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="281" y="611" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true">

-        <dc:Bounds x="997" y="460" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="903" y="472" width="75" height="24" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_156ih25_di" bpmnElement="SequenceFlow_156ih25">

-        <di:waypoint xsi:type="dc:Point" x="1022" y="510" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="545" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="545" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="575" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1039" y="510.8721806797853" width="12" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="EndEvent_10659gr_di" bpmnElement="EndEvent_10659gr">

-        <dc:Bounds x="1103" y="467" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1121" y="508" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_00v4npo_di" bpmnElement="SequenceFlow_00v4npo">

-        <di:waypoint xsi:type="dc:Point" x="1047" y="485" />

-        <di:waypoint xsi:type="dc:Point" x="1103" y="485" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1063" y="461" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0i8cqdy_di" bpmnElement="ScriptTask_0i8cqdy">

-        <dc:Bounds x="971" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1w01tqs_di" bpmnElement="SequenceFlow_1w01tqs">

-        <di:waypoint xsi:type="dc:Point" x="1021" y="137" />

-        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />

-        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />

-        <di:waypoint xsi:type="dc:Point" x="1021" y="206" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1036" y="172" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9">

-        <dc:Bounds x="972" y="336" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1dd86x8_di" bpmnElement="SequenceFlow_1dd86x8">

-        <di:waypoint xsi:type="dc:Point" x="1022" y="416" />

-        <di:waypoint xsi:type="dc:Point" x="1022" y="460" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1037" y="438" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux">

-        <dc:Bounds x="330" y="586" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1lqktwf_di" bpmnElement="SequenceFlow_1lqktwf">

-        <di:waypoint xsi:type="dc:Point" x="430" y="626" />

-        <di:waypoint xsi:type="dc:Point" x="493" y="626" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="462" y="611" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_1p0vyip_di" bpmnElement="ScriptTask_1p0vyip">

-        <dc:Bounds x="661" y="586" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1xzgv5k_di" bpmnElement="SequenceFlow_1xzgv5k">

-        <di:waypoint xsi:type="dc:Point" x="761" y="626" />

-        <di:waypoint xsi:type="dc:Point" x="793" y="626" />

-        <di:waypoint xsi:type="dc:Point" x="793" y="626" />

-        <di:waypoint xsi:type="dc:Point" x="828" y="626" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="808" y="626" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+def ddsi = new DoCreateServiceInstance()
+ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" />
+    <bpmn2:callActivity id="CallActivity_1707jgc" name="Call GenericGetService2" calledElement="GenericGetService">
+      <bpmn2:extensionElements>
+        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />
+        <camunda:in sourceExpression="service-instance" target="GENGS_type" />
+        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />
+        <camunda:in source="subscriptionServiceType" target="GENGS_serviceType" />
+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
+        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="GENGS_service" target="GENGS_service" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0tx5frq</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_0tx5frq" sourceRef="CallActivity_1707jgc" targetRef="ScriptTask_1tp0fcx" />
+    <bpmn2:sequenceFlow id="SequenceFlow_01q6pl4" sourceRef="ScriptTask_1tp0fcx" targetRef="EndEvent_3" />
+    <bpmn2:scriptTask id="ScriptTask_1tp0fcx" name="Post Process AAI GET2" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0tx5frq</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_01q6pl4</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def dcsi = new DoCreateServiceInstance()
+dcsi.postProcessAAIGET2(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+  </bpmn2:process>
+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstance">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">
+        <dc:Bounds x="152" y="79" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="147" y="120" width="48" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="245" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="188" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="245" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="217" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="getAAICustomerById_scriptTask">
+        <dc:Bounds x="393" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_62">
+        <di:waypoint xsi:type="dc:Point" x="493" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="565" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="529" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
+        <dc:Bounds x="1115" y="1165" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1133" y="1206" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_4">
+        <di:waypoint xsi:type="dc:Point" x="839" y="94" />
+        <di:waypoint xsi:type="dc:Point" x="971" y="94" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="905" y="79" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_334" bpmnElement="PreProcessSDNCAssignRequest">
+        <dc:Bounds x="972" y="578" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="PostProcessSDNCAssignRequest">
+        <dc:Bounds x="972" y="864" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_74" bpmnElement="CallSDNCAdapterServiceTopologyAssign">
+        <dc:Bounds x="972" y="721" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_62">
+        <di:waypoint xsi:type="dc:Point" x="345" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="393" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="369" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_334" targetElement="_BPMNShape_CallActivity_74">
+        <di:waypoint xsi:type="dc:Point" x="1020" y="658" />
+        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />
+        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />
+        <di:waypoint xsi:type="dc:Point" x="1020" y="715" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1035" y="692" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_74" targetElement="_BPMNShape_ScriptTask_335">
+        <di:waypoint xsi:type="dc:Point" x="1022" y="801" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="864" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1037" y="840" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_335">
+        <di:waypoint xsi:type="dc:Point" x="1024" y="944" />
+        <di:waypoint xsi:type="dc:Point" x="1024" y="994" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1039" y="969" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericGetService">
+        <dc:Bounds x="739" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="callGenericPutService">
+        <dc:Bounds x="972" y="206" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_129ih1g_di" bpmnElement="SequenceFlow_129ih1g">
+        <di:waypoint xsi:type="dc:Point" x="1023" y="286" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="336" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1023" y="296" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">
+        <dc:Bounds x="565" y="72" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="547" y="7" width="81" height="62" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">
+        <di:waypoint xsi:type="dc:Point" x="615" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="739" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="635" y="76" width="18" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">
+        <di:waypoint xsi:type="dc:Point" x="590" y="122" />
+        <di:waypoint xsi:type="dc:Point" x="590" y="246" />
+        <di:waypoint xsi:type="dc:Point" x="972" y="246" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="594" y="132.89706349694825" width="12" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">
+        <dc:Bounds x="99" y="531" width="783" height="195" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">
+        <dc:Bounds x="195" y="608" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="213" y="649" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3">
+        <dc:Bounds x="828" y="608" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="846" y="649" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1srx6p6_di" bpmnElement="CallActivity_1srx6p6">
+        <dc:Bounds x="493" y="586" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0eumzpf_di" bpmnElement="SequenceFlow_0eumzpf">
+        <di:waypoint xsi:type="dc:Point" x="593" y="626" />
+        <di:waypoint xsi:type="dc:Point" x="661" y="626" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="627" y="611" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11">
+        <di:waypoint xsi:type="dc:Point" x="231" y="626" />
+        <di:waypoint xsi:type="dc:Point" x="330" y="626" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="281" y="611" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true">
+        <dc:Bounds x="997" y="460" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="903" y="472" width="75" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_156ih25_di" bpmnElement="SequenceFlow_156ih25">
+        <di:waypoint xsi:type="dc:Point" x="1022" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="545" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="545" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="575" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1039" y="510.8721806797853" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_10659gr_di" bpmnElement="EndEvent_10659gr">
+        <dc:Bounds x="1103" y="467" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1121" y="508" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_00v4npo_di" bpmnElement="SequenceFlow_00v4npo">
+        <di:waypoint xsi:type="dc:Point" x="1047" y="485" />
+        <di:waypoint xsi:type="dc:Point" x="1103" y="485" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1063" y="461" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0i8cqdy_di" bpmnElement="ScriptTask_0i8cqdy">
+        <dc:Bounds x="971" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1w01tqs_di" bpmnElement="SequenceFlow_1w01tqs">
+        <di:waypoint xsi:type="dc:Point" x="1021" y="137" />
+        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />
+        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />
+        <di:waypoint xsi:type="dc:Point" x="1021" y="206" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1036" y="172" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9">
+        <dc:Bounds x="972" y="336" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1dd86x8_di" bpmnElement="SequenceFlow_1dd86x8">
+        <di:waypoint xsi:type="dc:Point" x="1022" y="416" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="460" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1037" y="438" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux">
+        <dc:Bounds x="330" y="586" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1lqktwf_di" bpmnElement="SequenceFlow_1lqktwf">
+        <di:waypoint xsi:type="dc:Point" x="430" y="626" />
+        <di:waypoint xsi:type="dc:Point" x="493" y="626" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="462" y="611" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1p0vyip_di" bpmnElement="ScriptTask_1p0vyip">
+        <dc:Bounds x="661" y="586" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1xzgv5k_di" bpmnElement="SequenceFlow_1xzgv5k">
+        <di:waypoint xsi:type="dc:Point" x="761" y="626" />
+        <di:waypoint xsi:type="dc:Point" x="793" y="626" />
+        <di:waypoint xsi:type="dc:Point" x="793" y="626" />
+        <di:waypoint xsi:type="dc:Point" x="828" y="626" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="808" y="626" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1707jgc_di" bpmnElement="CallActivity_1707jgc">
+        <dc:Bounds x="972" y="994" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0tx5frq_di" bpmnElement="SequenceFlow_0tx5frq">
+        <di:waypoint xsi:type="dc:Point" x="1022" y="1074" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="1143" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1037" y="1108.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_01q6pl4_di" bpmnElement="SequenceFlow_01q6pl4">
+        <di:waypoint xsi:type="dc:Point" x="1072" y="1183" />
+        <di:waypoint xsi:type="dc:Point" x="1115" y="1183" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1094" y="1168" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1tp0fcx_di" bpmnElement="ScriptTask_1tp0fcx">
+        <dc:Bounds x="972" y="1143" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn
index 80ace28..6c24696 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn
@@ -1,338 +1,379 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="DoCreateServiceInstanceRollback" name="DoCreateServiceInstanceRollback" isExecutable="true">

-    <bpmn2:startEvent id="createSIRollback_startEvent" name="Start Flow">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSIRollback_startEvent" targetRef="preProcessRequest_ScriptTask" />

-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DoCreateServiceInstanceRollback" name="DoCreateServiceInstanceRollback" isExecutable="true">
+    <bpmn2:startEvent id="createSIRollback_startEvent" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSIRollback_startEvent" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def rbk = new DoCreateServiceInstanceRollback()

-rbk.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>SequenceFlow_01l4ssl</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for Errors" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_1">

-        <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" />

-      </bpmn2:startEvent>

-      <bpmn2:endEvent id="EndEvent_1">

-        <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />

-      <bpmn2:scriptTask id="ScriptTask_1" name="Handle Errors" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

+def rbk = new DoCreateServiceInstanceRollback()
+rbk.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_01l4ssl</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for Errors" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_1">
+        <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_1">
+        <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />
+      <bpmn2:scriptTask id="ScriptTask_1" name="Handle Errors" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def rbk= new DoCreateServiceInstanceRollback()

-rbk.processRollbackException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />

-    </bpmn2:subProcess>

-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="ExclusiveGateway_19tbjgn" />

-    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">

-      <bpmn2:extensionElements>

-        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />

-        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />

-        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />

-        <camunda:in sourceExpression="service-instance" target="GENDS_type" />

-        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />

-        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />

-        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />

-        <camunda:out source="WorkflowException" target="WorkflowExecption" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1x9eh33</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="RollbackSDNC?" default="SequenceFlow_1uw2p9a">

-      <bpmn2:incoming>SequenceFlow_06aasqh</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="CallActivity_0ak0ezb">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackSDNC" )  == "true"}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="ExclusiveGateway_0ii31dq" />

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0ii31dq" name="RollBackAAI?" default="SequenceFlow_1n7wade">

-      <bpmn2:documentation>rollback AAI</bpmn2:documentation>

-      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_0khjo7l</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1n7wade</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1x9eh33</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_1n7wade" name="no" sourceRef="ExclusiveGateway_0ii31dq" targetRef="PostProcess_ScriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="PostProcess_ScriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1x9eh33" name="yes" sourceRef="ExclusiveGateway_0ii31dq" targetRef="callGenericDeleteService">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackAAI" )  == "true"}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />

-    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Rollback" calledElement="sdncAdapter">

-      <bpmn2:extensionElements>

-        <camunda:in source="sdncRollbackRequest" target="sdncAdapterWorkflowRequest" />

-        <camunda:in source="msoRequestId" target="mso-request-id" />

-        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />

-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Rollback " scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0khjo7l</bpmn2:outgoing>

+def rbk= new DoCreateServiceInstanceRollback()
+rbk.processRollbackException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
+    </bpmn2:subProcess>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="ExclusiveGateway_19tbjgn" />
+    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">
+      <bpmn2:extensionElements>
+        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />
+        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />
+        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />
+        <camunda:in sourceExpression="service-instance" target="GENDS_type" />
+        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />
+        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />
+        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />
+        <camunda:out source="WorkflowException" target="WorkflowExecption" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1x9eh33</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="RollbackSDNC?" default="SequenceFlow_1uw2p9a">
+      <bpmn2:incoming>SequenceFlow_06aasqh</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="CallActivity_0ak0ezb">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackSDNC" )  == "true"}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="ExclusiveGateway_0ii31dq" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0ii31dq" name="RollBackAAI?" default="SequenceFlow_1n7wade">
+      <bpmn2:documentation>rollback AAI</bpmn2:documentation>
+      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1njogr1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1n7wade</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1x9eh33</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1n7wade" name="no" sourceRef="ExclusiveGateway_0ii31dq" targetRef="PostProcess_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="PostProcess_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1x9eh33" name="yes" sourceRef="ExclusiveGateway_0ii31dq" targetRef="callGenericDeleteService">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackAAI" )  == "true"}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />
+    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Deactivate" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="sdncDeactivate" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="msoRequestId" target="mso-request-id" />
+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="sdncDeactivateResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Deactivate" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0khjo7l</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def rbk= new DoCreateServiceInstanceRollback()

-rbk.validateSDNCResponse(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_0khjo7l" sourceRef="ScriptTask_1uxr0cx" targetRef="ExclusiveGateway_0ii31dq" />

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_19tbjgn" name="skip Rollback" default="SequenceFlow_06aasqh">

-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_06aasqh</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1rzlaoy</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:scriptTask id="PostProcess_ScriptTask" name="Post Process Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_1n7wade</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_1rzlaoy</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_01l4ssl</bpmn2:outgoing>

+String response = execution.getVariable("sdncDeactivateResponse")
+def rbk= new DoCreateServiceInstanceRollback()
+rbk.validateSDNCResponse(execution, response, "deactivate")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0khjo7l" sourceRef="ScriptTask_1uxr0cx" targetRef="CallActivity_0ppz9nd" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_19tbjgn" name="skip Rollback" default="SequenceFlow_06aasqh">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_06aasqh</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1rzlaoy</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:scriptTask id="PostProcess_ScriptTask" name="Post Process Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1n7wade</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1rzlaoy</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_01l4ssl</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def rbk = new DoCreateServiceInstanceRollback()

-rbk.postProcessRequest(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_01l4ssl" sourceRef="PostProcess_ScriptTask" targetRef="EndEvent_3" />

-    <bpmn2:sequenceFlow id="SequenceFlow_06aasqh" name="no" sourceRef="ExclusiveGateway_19tbjgn" targetRef="ExclusiveGateway_09wkav2" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1rzlaoy" name="yes" sourceRef="ExclusiveGateway_19tbjgn" targetRef="PostProcess_ScriptTask">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("skipRollback" )  == true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:subProcess id="SubProcess_11bi8mc" name="Java Exception Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_1gxe17c">

-        <bpmn2:outgoing>SequenceFlow_1ch4xrf</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition errorRef="Error_1" />

-      </bpmn2:startEvent>

-      <bpmn2:scriptTask id="ScriptTask_15yddb0" name="Process Java Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_1ch4xrf</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_1pjk2ff</bpmn2:outgoing>

+def rbk = new DoCreateServiceInstanceRollback()
+rbk.postProcessRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_01l4ssl" sourceRef="PostProcess_ScriptTask" targetRef="EndEvent_3" />
+    <bpmn2:sequenceFlow id="SequenceFlow_06aasqh" name="no" sourceRef="ExclusiveGateway_19tbjgn" targetRef="ExclusiveGateway_09wkav2" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1rzlaoy" name="yes" sourceRef="ExclusiveGateway_19tbjgn" targetRef="PostProcess_ScriptTask">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("skipRollback" )  == true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:subProcess id="SubProcess_11bi8mc" name="Java Exception Handling Sub Process" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_1gxe17c">
+        <bpmn2:outgoing>SequenceFlow_1ch4xrf</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition errorRef="Error_1" />
+      </bpmn2:startEvent>
+      <bpmn2:scriptTask id="ScriptTask_15yddb0" name="Process Java Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_1ch4xrf</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_1pjk2ff</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def rbk= new DoCreateServiceInstanceRollback()

-rbk.processRollbackJavaException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:endEvent id="EndEvent_12e3h6k">

-        <bpmn2:incoming>SequenceFlow_1pjk2ff</bpmn2:incoming>

-        <bpmn2:terminateEventDefinition />

-      </bpmn2:endEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_1ch4xrf" name="" sourceRef="StartEvent_1gxe17c" targetRef="ScriptTask_15yddb0" />

-      <bpmn2:sequenceFlow id="SequenceFlow_1pjk2ff" name="" sourceRef="ScriptTask_15yddb0" targetRef="EndEvent_12e3h6k" />

-    </bpmn2:subProcess>

-  </bpmn2:process>

-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstanceRollback">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSIRollback_startEvent">

-        <dc:Bounds x="151" y="79" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="146" y="120" width="48" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

-        <dc:Bounds x="234" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

-        <di:waypoint xsi:type="dc:Point" x="187" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="234" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="211" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

-        <dc:Bounds x="1166" y="358" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1184" y="399" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">

-        <dc:Bounds x="286" y="318" width="467" height="193" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">

-        <dc:Bounds x="354" y="384" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="372" y="425" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">

-        <dc:Bounds x="647" y="384" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="665" y="425" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">

-        <di:waypoint xsi:type="dc:Point" x="390" y="402" />

-        <di:waypoint xsi:type="dc:Point" x="458" y="402" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="425" y="387" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61">

-        <di:waypoint xsi:type="dc:Point" x="334" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="367" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="367" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="393" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="382" y="97" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">

-        <dc:Bounds x="1134" y="53" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">

-        <dc:Bounds x="527" y="72" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="512" y="129" width="80" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">

-        <di:waypoint xsi:type="dc:Point" x="577" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="640" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="601" y="101.351489674803" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">

-        <di:waypoint xsi:type="dc:Point" x="552" y="72" />

-        <di:waypoint xsi:type="dc:Point" x="552" y="-23" />

-        <di:waypoint xsi:type="dc:Point" x="1021" y="-23" />

-        <di:waypoint xsi:type="dc:Point" x="1021" y="72" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="635" y="-43" width="12" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_0ii31dq_di" bpmnElement="ExclusiveGateway_0ii31dq" isMarkerVisible="true">

-        <dc:Bounds x="996" y="72" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="939" y="113" width="66" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1n7wade_di" bpmnElement="SequenceFlow_1n7wade">

-        <di:waypoint xsi:type="dc:Point" x="1021" y="122" />

-        <di:waypoint xsi:type="dc:Point" x="1021" y="246" />

-        <di:waypoint xsi:type="dc:Point" x="1134" y="246" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1030" y="124.63737966405313" width="13" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">

-        <di:waypoint xsi:type="dc:Point" x="1184" y="133" />

-        <di:waypoint xsi:type="dc:Point" x="1184" y="206" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1199" y="169.5" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1x9eh33_di" bpmnElement="SequenceFlow_1x9eh33">

-        <di:waypoint xsi:type="dc:Point" x="1046" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="1134" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1082" y="82" width="18" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">

-        <di:waypoint xsi:type="dc:Point" x="743" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="820" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="782" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">

-        <dc:Bounds x="640" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">

-        <dc:Bounds x="823" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0khjo7l_di" bpmnElement="SequenceFlow_0khjo7l">

-        <di:waypoint xsi:type="dc:Point" x="923" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="996" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="960" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_19tbjgn_di" bpmnElement="ExclusiveGateway_19tbjgn" isMarkerVisible="true">

-        <dc:Bounds x="393" y="72" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="385" y="38" width="65" height="12" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">

-        <dc:Bounds x="458" y="362" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">

-        <di:waypoint xsi:type="dc:Point" x="558" y="402" />

-        <di:waypoint xsi:type="dc:Point" x="647" y="402" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="603" y="387" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_1wk55es_di" bpmnElement="PostProcess_ScriptTask">

-        <dc:Bounds x="1134" y="206" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_01l4ssl_di" bpmnElement="SequenceFlow_01l4ssl">

-        <di:waypoint xsi:type="dc:Point" x="1184" y="286" />

-        <di:waypoint xsi:type="dc:Point" x="1184" y="358" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1199" y="322" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_06aasqh_di" bpmnElement="SequenceFlow_06aasqh">

-        <di:waypoint xsi:type="dc:Point" x="443" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="527" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="479" y="82" width="12" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1rzlaoy_di" bpmnElement="SequenceFlow_1rzlaoy">

-        <di:waypoint xsi:type="dc:Point" x="418" y="122" />

-        <di:waypoint xsi:type="dc:Point" x="418" y="268" />

-        <di:waypoint xsi:type="dc:Point" x="1131" y="272" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="424" y="195" width="18" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="SubProcess_11bi8mc_di" bpmnElement="SubProcess_11bi8mc" isExpanded="true">

-        <dc:Bounds x="325" y="576" width="419" height="150" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="StartEvent_1gxe17c_di" bpmnElement="StartEvent_1gxe17c">

-        <dc:Bounds x="360" y="628" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="378" y="669" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_15yddb0_di" bpmnElement="ScriptTask_15yddb0">

-        <dc:Bounds x="468" y="606" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="EndEvent_12e3h6k_di" bpmnElement="EndEvent_12e3h6k">

-        <dc:Bounds x="618" y="628" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="636" y="669" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1ch4xrf_di" bpmnElement="SequenceFlow_1ch4xrf">

-        <di:waypoint xsi:type="dc:Point" x="396" y="646" />

-        <di:waypoint xsi:type="dc:Point" x="468" y="646" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="421" y="646" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1pjk2ff_di" bpmnElement="SequenceFlow_1pjk2ff">

-        <di:waypoint xsi:type="dc:Point" x="568" y="646" />

-        <di:waypoint xsi:type="dc:Point" x="618" y="646" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="593" y="646" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+def rbk= new DoCreateServiceInstanceRollback()
+rbk.processRollbackJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:endEvent id="EndEvent_12e3h6k">
+        <bpmn2:incoming>SequenceFlow_1pjk2ff</bpmn2:incoming>
+        <bpmn2:terminateEventDefinition />
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_1ch4xrf" name="" sourceRef="StartEvent_1gxe17c" targetRef="ScriptTask_15yddb0" />
+      <bpmn2:sequenceFlow id="SequenceFlow_1pjk2ff" name="" sourceRef="ScriptTask_15yddb0" targetRef="EndEvent_12e3h6k" />
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="ScriptTask_1awt1ds" name="Post Process SDNC Delete">
+      <bpmn2:incoming>SequenceFlow_006g9e8</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1njogr1</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+String response = execution.getVariable("sdncDeleteResponse")
+def rbk= new DoCreateServiceInstanceRollback()
+rbk.validateSDNCResponse(execution, response, "delete")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="CallActivity_0ppz9nd" name="Call SDNC Service Topology Dekete" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="sdncDelete" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="msoRequestId" target="mso-request-id" />
+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="sdncDeleteResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0khjo7l</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_006g9e8</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_006g9e8" sourceRef="CallActivity_0ppz9nd" targetRef="ScriptTask_1awt1ds" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1njogr1" sourceRef="ScriptTask_1awt1ds" targetRef="ExclusiveGateway_0ii31dq" />
+  </bpmn2:process>
+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstanceRollback">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSIRollback_startEvent">
+        <dc:Bounds x="151" y="79" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="146" y="120" width="48" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="234" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="187" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="234" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="211" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
+        <dc:Bounds x="1208" y="350" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1226" y="391" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">
+        <dc:Bounds x="508" y="323" width="467" height="193" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">
+        <dc:Bounds x="576" y="389" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="594" y="430" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">
+        <dc:Bounds x="869" y="389" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="887" y="430" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">
+        <di:waypoint xsi:type="dc:Point" x="612" y="407" />
+        <di:waypoint xsi:type="dc:Point" x="680" y="407" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="647" y="392" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="334" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="366" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="350" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">
+        <dc:Bounds x="1167" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">
+        <dc:Bounds x="448" y="72" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="433" y="129" width="79" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">
+        <di:waypoint xsi:type="dc:Point" x="498" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="539" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="501" y="100" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">
+        <di:waypoint xsi:type="dc:Point" x="473" y="72" />
+        <di:waypoint xsi:type="dc:Point" x="473" y="-23" />
+        <di:waypoint xsi:type="dc:Point" x="1071" y="-23" />
+        <di:waypoint xsi:type="dc:Point" x="1071" y="72" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="751" y="-41" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0ii31dq_di" bpmnElement="ExclusiveGateway_0ii31dq" isMarkerVisible="true">
+        <dc:Bounds x="1046" y="72" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1094" y="104" width="66" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1n7wade_di" bpmnElement="SequenceFlow_1n7wade">
+        <di:waypoint xsi:type="dc:Point" x="1071" y="122" />
+        <di:waypoint xsi:type="dc:Point" x="1071" y="241" />
+        <di:waypoint xsi:type="dc:Point" x="1176" y="241" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1081" y="124.63709677419354" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">
+        <di:waypoint xsi:type="dc:Point" x="1217" y="137" />
+        <di:waypoint xsi:type="dc:Point" x="1217" y="201" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1232" y="169" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1x9eh33_di" bpmnElement="SequenceFlow_1x9eh33">
+        <di:waypoint xsi:type="dc:Point" x="1096" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1167" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1126" y="82" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">
+        <di:waypoint xsi:type="dc:Point" x="639" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="655" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">
+        <dc:Bounds x="539" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">
+        <dc:Bounds x="671" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0khjo7l_di" bpmnElement="SequenceFlow_0khjo7l">
+        <di:waypoint xsi:type="dc:Point" x="771" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="796" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="784" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_19tbjgn_di" bpmnElement="ExclusiveGateway_19tbjgn" isMarkerVisible="true">
+        <dc:Bounds x="366" y="72" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="358" y="54" width="65" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">
+        <dc:Bounds x="680" y="367" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">
+        <di:waypoint xsi:type="dc:Point" x="780" y="407" />
+        <di:waypoint xsi:type="dc:Point" x="869" y="407" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="825" y="392" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1wk55es_di" bpmnElement="PostProcess_ScriptTask">
+        <dc:Bounds x="1176" y="201" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_01l4ssl_di" bpmnElement="SequenceFlow_01l4ssl">
+        <di:waypoint xsi:type="dc:Point" x="1226" y="281" />
+        <di:waypoint xsi:type="dc:Point" x="1226" y="350" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1241" y="315.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_06aasqh_di" bpmnElement="SequenceFlow_06aasqh">
+        <di:waypoint xsi:type="dc:Point" x="416" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="448" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="426" y="82" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1rzlaoy_di" bpmnElement="SequenceFlow_1rzlaoy">
+        <di:waypoint xsi:type="dc:Point" x="391" y="122" />
+        <di:waypoint xsi:type="dc:Point" x="391" y="268" />
+        <di:waypoint xsi:type="dc:Point" x="1176" y="267" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="397" y="195" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="SubProcess_11bi8mc_di" bpmnElement="SubProcess_11bi8mc" isExpanded="true">
+        <dc:Bounds x="325" y="576" width="419" height="150" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1gxe17c_di" bpmnElement="StartEvent_1gxe17c">
+        <dc:Bounds x="360" y="628" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="378" y="669" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_15yddb0_di" bpmnElement="ScriptTask_15yddb0">
+        <dc:Bounds x="468" y="606" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_12e3h6k_di" bpmnElement="EndEvent_12e3h6k">
+        <dc:Bounds x="618" y="628" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="636" y="669" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ch4xrf_di" bpmnElement="SequenceFlow_1ch4xrf">
+        <di:waypoint xsi:type="dc:Point" x="396" y="646" />
+        <di:waypoint xsi:type="dc:Point" x="468" y="646" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="421" y="646" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1pjk2ff_di" bpmnElement="SequenceFlow_1pjk2ff">
+        <di:waypoint xsi:type="dc:Point" x="568" y="646" />
+        <di:waypoint xsi:type="dc:Point" x="618" y="646" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="593" y="646" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1awt1ds_di" bpmnElement="ScriptTask_1awt1ds">
+        <dc:Bounds x="921" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0ppz9nd_di" bpmnElement="CallActivity_0ppz9nd">
+        <dc:Bounds x="796" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_006g9e8_di" bpmnElement="SequenceFlow_006g9e8">
+        <di:waypoint xsi:type="dc:Point" x="896" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="921" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="909" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1njogr1_di" bpmnElement="SequenceFlow_1njogr1">
+        <di:waypoint xsi:type="dc:Point" x="1021" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1046" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1034" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn
index 5e88527..8411c56 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn
@@ -9,7 +9,7 @@
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-DoCreateVnf createVnf = new DoCreateVnf()

+DoCreateVnf createVnf = new DoCreateVnf()
 createVnf.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="initialization" targetRef="callGetService" />
@@ -42,7 +42,7 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found
       <bpmn2:outgoing>found</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="notFound" name="No" sourceRef="serviceInstanceFound" targetRef="buildWorkflowException" />
-    <bpmn2:sequenceFlow id="found" name="Yes" sourceRef="serviceInstanceFound" targetRef="callGetVnf">
+    <bpmn2:sequenceFlow id="found" name="Yes" sourceRef="serviceInstanceFound" targetRef="ExclusiveGateway_0j73e7c">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true && execution.getVariable("GENGS_SuccessIndicator" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:exclusiveGateway id="vnfExist" name="Vnf Already Exist?" default="vnfExistYes">
@@ -64,7 +64,7 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>found</bpmn2:incoming>
+      <bpmn2:incoming>VnfNameSpecified1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="callGetVnf" targetRef="vnfExist" />
@@ -86,9 +86,10 @@ exceptionUtil.buildWorkflowException(execution, 5000, "Generic Vnf Already Exist
     </bpmn2:endEvent>
     <bpmn2:scriptTask id="prepareCreateGenericVnf" name="Prepare&#10;&#10;Create Vnf Payload" scriptFormat="groovy">
       <bpmn2:incoming>vnfExistNo</bpmn2:incoming>
+      <bpmn2:incoming>VnfNameNotSpecified1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-DoCreateVnf createVnf = new DoCreateVnf()

+DoCreateVnf createVnf = new DoCreateVnf()
 createVnf.prepareCreateGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="prepareCreateGenericVnf" targetRef="callPutVnf" />
@@ -123,21 +124,20 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
       <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="StartEvent_2" targetRef="processJavaError" />
     </bpmn2:subProcess>
     <bpmn2:endEvent id="EndEvent_3">
-      <bpmn2:incoming>SequenceFlow_15z3gpq</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_0ay5l4b</bpmn2:incoming>
+      <bpmn2:incoming>SdncInteractionNotEnabled</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0bj7c4s</bpmn2:incoming>
       <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_35" />
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_1q6udwm" sourceRef="preProcessSDNCAssignRequest" targetRef="callSDNCAdapterVNFTopologyAssign" />
     <bpmn2:sequenceFlow id="SequenceFlow_15knw0q" sourceRef="callSDNCAdapterVNFTopologyAssign" targetRef="postProcessSDNCAssignRequest" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0c5h00o" sourceRef="postProcessSDNCAssignRequest" targetRef="preProcessSDNCActivateRequest" />
     <bpmn2:sequenceFlow id="SequenceFlow_1lalmvp" sourceRef="preProcessSDNCActivateRequest" targetRef="callSDNCAdapterVNFTopologyActivate" />
     <bpmn2:sequenceFlow id="SequenceFlow_0eb41vb" sourceRef="callSDNCAdapterVNFTopologyActivate" targetRef="postProcessSDNCActivateRequest" />
-    <bpmn2:sequenceFlow id="SequenceFlow_15z3gpq" sourceRef="postProcessSDNCActivateRequest" targetRef="EndEvent_3" />
+    <bpmn2:sequenceFlow id="SequenceFlow_15z3gpq" sourceRef="postProcessSDNCActivateRequest" targetRef="Task_053tb0h" />
     <bpmn2:scriptTask id="preProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0ttqcwx</bpmn2:incoming>
+      <bpmn2:incoming>SdncInteractionEnabled</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1q6udwm</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-DoCreateVnf createVnf = new DoCreateVnf()

+DoCreateVnf createVnf = new DoCreateVnf()
 createVnf.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="callSDNCAdapterVNFTopologyAssign" name="Call SDNC Adapter VNF Topology Assign" calledElement="sdncAdapter">
@@ -155,19 +155,20 @@ createVnf.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
     </bpmn2:callActivity>
     <bpmn2:scriptTask id="postProcessSDNCAssignRequest" name="PostProcess SDNC Assign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_15knw0q</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0c5h00o</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-

-String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")

-

-def createVnfInfra = new DoCreateVnf()

+      <bpmn2:outgoing>SequenceFlow_0lnh79j</bpmn2:outgoing>
+
+String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")
+
+def createVnfInfra = new DoCreateVnf()
 createVnfInfra.validateSDNCResponse(execution, response, "assign")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="preProcessSDNCActivateRequest" name="PreProcess SDNC Activate Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0c5h00o</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1q1poly</bpmn2:incoming>
+      <bpmn2:incoming>VnfNameSpecified2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1lalmvp</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-DoCreateVnf createVnf = new DoCreateVnf()

+DoCreateVnf createVnf = new DoCreateVnf()
 createVnf.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="callSDNCAdapterVNFTopologyActivate" name="Call SDNC Adapter VNF Topology Activate" calledElement="sdncAdapter">
@@ -187,30 +188,102 @@ createVnf.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_0eb41vb</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15z3gpq</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-

-String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")

-

-def createVnfInfra = new DoCreateVnf()

+
+String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")
+
+def createVnfInfra = new DoCreateVnf()
 createVnfInfra.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_045rm8i" name="Is SDNC Interaction Enabled?" default="SequenceFlow_0ay5l4b">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_045rm8i" name="Is SDNC Interaction Enabled?" default="SdncInteractionNotEnabled">
       <bpmn2:incoming>SequenceFlow_1gc18ih</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0ttqcwx</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_0ay5l4b</bpmn2:outgoing>
+      <bpmn2:outgoing>SdncInteractionEnabled</bpmn2:outgoing>
+      <bpmn2:outgoing>SdncInteractionNotEnabled</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_0ttqcwx" name="yes" sourceRef="ExclusiveGateway_045rm8i" targetRef="preProcessSDNCAssignRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion" ) == '1707'}]]></bpmn2:conditionExpression>
+    <bpmn2:sequenceFlow id="SdncInteractionEnabled" name="Yes" sourceRef="ExclusiveGateway_045rm8i" targetRef="preProcessSDNCAssignRequest">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DoCVNF_sdncVersion" ) != '1702'}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_0ay5l4b" name="no" sourceRef="ExclusiveGateway_045rm8i" targetRef="EndEvent_3" />
+    <bpmn2:sequenceFlow id="SdncInteractionNotEnabled" name="No" sourceRef="ExclusiveGateway_045rm8i" targetRef="EndEvent_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_0seif8n" sourceRef="callPutVnf" targetRef="postProcessCreateGenericVnf" />
     <bpmn2:sequenceFlow id="SequenceFlow_1gc18ih" sourceRef="postProcessCreateGenericVnf" targetRef="ExclusiveGateway_045rm8i" />
     <bpmn2:scriptTask id="postProcessCreateGenericVnf" name="PostProcess Create Generic Vnf" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0seif8n</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1gc18ih</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-DoCreateVnf createVnf = new DoCreateVnf()

+DoCreateVnf createVnf = new DoCreateVnf()
 createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0j73e7c" name="Vnf-name specified?" default="VnfNameSpecified1">
+      <bpmn2:incoming>found</bpmn2:incoming>
+      <bpmn2:outgoing>VnfNameNotSpecified1</bpmn2:outgoing>
+      <bpmn2:outgoing>VnfNameSpecified1</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="VnfNameNotSpecified1" name="No" sourceRef="ExclusiveGateway_0j73e7c" targetRef="prepareCreateGenericVnf">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DoCVNF_vnfName" ) == null}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="VnfNameSpecified1" name="Yes" sourceRef="ExclusiveGateway_0j73e7c" targetRef="callGetVnf" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1h9jdgr" sourceRef="PreProcessSDNCGetRequest" targetRef="CallSDNCAdapterVNFTopologyGet" />
+    <bpmn2:sequenceFlow id="SequenceFlow_14xac2y" sourceRef="CallSDNCAdapterVNFTopologyGet" targetRef="PostProcessSDNCGetRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1q1poly" sourceRef="PostProcessSDNCGetRequest" targetRef="preProcessSDNCActivateRequest" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0qnhlm1" name="Vnf-name specified?" default="VnfNameSpecified2">
+      <bpmn2:incoming>SequenceFlow_0lnh79j</bpmn2:incoming>
+      <bpmn2:outgoing>VnfNameNotSpecified2</bpmn2:outgoing>
+      <bpmn2:outgoing>VnfNameSpecified2</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_0lnh79j" sourceRef="postProcessSDNCAssignRequest" targetRef="ExclusiveGateway_0qnhlm1" />
+    <bpmn2:sequenceFlow id="VnfNameNotSpecified2" name="No" sourceRef="ExclusiveGateway_0qnhlm1" targetRef="PreProcessSDNCGetRequest">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DoCVNF_vnfName" ) == null}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="VnfNameSpecified2" name="Yes" sourceRef="ExclusiveGateway_0qnhlm1" targetRef="preProcessSDNCActivateRequest" />
+    <bpmn2:scriptTask id="PreProcessSDNCGetRequest" name="PreProcess SDNC Get Request" scriptFormat="groovy">
+      <bpmn2:incoming>VnfNameNotSpecified2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1h9jdgr</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+DoCreateVnf createVnf = new DoCreateVnf()
+createVnf.preProcessSDNCGetRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="CallSDNCAdapterVNFTopologyGet" name="Call SDNC Adapter VNF Topology Get" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="DoCVNF_getSDNCRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="DoCVNF_getSDNCAdapterResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1h9jdgr</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_14xac2y</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="PostProcessSDNCGetRequest" name="PostProcess SDNC Get Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_14xac2y</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1q1poly</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+
+String response = execution.getVariable("DoCVNF_getSDNCAdapterResponse")
+
+def createVnfInfra = new DoCreateVnf()
+createVnfInfra.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0bj7c4s" sourceRef="UpdateAAIOrchestrationStatus" targetRef="EndEvent_3" />
+    <bpmn2:callActivity id="UpdateAAIOrchestrationStatus" name="Update AAI Orchestration Status to Active" calledElement="UpdateAAIGenericVnf">
+      <bpmn2:extensionElements>
+        <camunda:in source="DoCVNF_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-id" target="mso-service-id" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0nhsdmj</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0bj7c4s</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_0nhsdmj" sourceRef="Task_053tb0h" targetRef="UpdateAAIOrchestrationStatus" />
+    <bpmn2:scriptTask id="Task_053tb0h" name="Prepare Update AAI Generic VNF" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_15z3gpq</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0nhsdmj</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def doCreateVnf = new DoCreateVnf()
+doCreateVnf.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
   </bpmn2:process>
   <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
   <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
@@ -243,27 +316,27 @@ createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
         <dc:Bounds x="406" y="200" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_229" bpmnElement="serviceInstanceFound" isMarkerVisible="true">
-        <dc:Bounds x="642" y="214" width="50" height="50" />
+        <dc:Bounds x="552" y="215" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="678" y="244" width="148" height="22" />
+          <dc:Bounds x="536" y="267" width="82" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_CallActivity_59" targetElement="_BPMNShape_ExclusiveGateway_229">
         <di:waypoint xsi:type="dc:Point" x="506" y="240" />
-        <di:waypoint xsi:type="dc:Point" x="642" y="239" />
+        <di:waypoint xsi:type="dc:Point" x="552" y="240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="574" y="224.5" width="0" height="0" />
+          <dc:Bounds x="529" y="225" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_293" bpmnElement="buildWorkflowException">
         <dc:Bounds x="720" y="115" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="notFound" sourceElement="_BPMNShape_ExclusiveGateway_229" targetElement="_BPMNShape_ScriptTask_293">
-        <di:waypoint xsi:type="dc:Point" x="667" y="214" />
-        <di:waypoint xsi:type="dc:Point" x="667" y="155" />
+        <di:waypoint xsi:type="dc:Point" x="577" y="215" />
+        <di:waypoint xsi:type="dc:Point" x="577" y="155" />
         <di:waypoint xsi:type="dc:Point" x="720" y="155" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="666" y="174" width="22" height="22" />
+          <dc:Bounds x="580" y="174.4237288135593" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_225" bpmnElement="EndEvent_1">
@@ -280,11 +353,10 @@ createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="found" sourceElement="_BPMNShape_ExclusiveGateway_229" targetElement="_BPMNShape_CallActivity_60">
-        <di:waypoint xsi:type="dc:Point" x="667" y="264" />
-        <di:waypoint xsi:type="dc:Point" x="667" y="328" />
-        <di:waypoint xsi:type="dc:Point" x="720" y="328" />
+        <di:waypoint xsi:type="dc:Point" x="602" y="240" />
+        <di:waypoint xsi:type="dc:Point" x="646" y="240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="666" y="282" width="29" height="22" />
+          <dc:Bounds x="614" y="216.01288698145387" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_60" bpmnElement="callGetVnf">
@@ -339,9 +411,9 @@ createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_228" bpmnElement="EndEvent_3">
-        <dc:Bounds x="1126" y="537" width="36" height="36" />
+        <dc:Bounds x="1765" y="537" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1144" y="578" width="0" height="0" />
+          <dc:Bounds x="1783" y="578" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_300" targetElement="_BPMNShape_CallActivity_61">
@@ -400,32 +472,25 @@ createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
           <dc:Bounds x="470" y="540" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0c5h00o_di" bpmnElement="SequenceFlow_0c5h00o">
-        <di:waypoint xsi:type="dc:Point" x="593" y="555" />
-        <di:waypoint xsi:type="dc:Point" x="640" y="555" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="617" y="540" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1lalmvp_di" bpmnElement="SequenceFlow_1lalmvp">
-        <di:waypoint xsi:type="dc:Point" x="740" y="555" />
-        <di:waypoint xsi:type="dc:Point" x="794" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1100" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1156" y="555" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="767" y="540" width="0" height="0" />
+          <dc:Bounds x="1128" y="540" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0eb41vb_di" bpmnElement="SequenceFlow_0eb41vb">
-        <di:waypoint xsi:type="dc:Point" x="894" y="555" />
-        <di:waypoint xsi:type="dc:Point" x="949" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1256" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1304" y="555" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="922" y="540" width="0" height="0" />
+          <dc:Bounds x="1280" y="540" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_15z3gpq_di" bpmnElement="SequenceFlow_15z3gpq">
-        <di:waypoint xsi:type="dc:Point" x="1049" y="555" />
-        <di:waypoint xsi:type="dc:Point" x="1126" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1404" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1445" y="555" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1088" y="540" width="0" height="0" />
+          <dc:Bounds x="1425" y="540" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_01h1rx2_di" bpmnElement="preProcessSDNCAssignRequest">
@@ -438,36 +503,37 @@ createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
         <dc:Bounds x="493" y="515" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1rr2xrc_di" bpmnElement="preProcessSDNCActivateRequest">
-        <dc:Bounds x="640" y="515" width="100" height="80" />
+        <dc:Bounds x="1000" y="515" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1ieo30p_di" bpmnElement="callSDNCAdapterVNFTopologyActivate">
-        <dc:Bounds x="794" y="515" width="100" height="80" />
+        <dc:Bounds x="1156" y="515" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_04votlb_di" bpmnElement="postProcessSDNCActivateRequest">
-        <dc:Bounds x="949" y="515" width="100" height="80" />
+        <dc:Bounds x="1304" y="515" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_045rm8i_di" bpmnElement="ExclusiveGateway_045rm8i" isMarkerVisible="true">
-        <dc:Bounds x="1336" y="215" width="50" height="50" />
+        <dc:Bounds x="1758" y="215" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1334" y="163" width="54" height="36" />
+          <dc:Bounds x="1756" y="163" width="54" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0ttqcwx_di" bpmnElement="SequenceFlow_0ttqcwx">
-        <di:waypoint xsi:type="dc:Point" x="1361" y="265" />
-        <di:waypoint xsi:type="dc:Point" x="1361" y="475" />
+      <bpmndi:BPMNEdge id="SequenceFlow_0ttqcwx_di" bpmnElement="SdncInteractionEnabled">
+        <di:waypoint xsi:type="dc:Point" x="1783" y="265" />
+        <di:waypoint xsi:type="dc:Point" x="1783" y="475" />
         <di:waypoint xsi:type="dc:Point" x="106" y="475" />
         <di:waypoint xsi:type="dc:Point" x="106" y="555" />
         <di:waypoint xsi:type="dc:Point" x="206" y="555" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="726" y="460" width="18" height="12" />
+          <dc:Bounds x="941" y="460" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0ay5l4b_di" bpmnElement="SequenceFlow_0ay5l4b">
-        <di:waypoint xsi:type="dc:Point" x="1361" y="265" />
-        <di:waypoint xsi:type="dc:Point" x="1361" y="555" />
-        <di:waypoint xsi:type="dc:Point" x="1162" y="555" />
+      <bpmndi:BPMNEdge id="SequenceFlow_0ay5l4b_di" bpmnElement="SdncInteractionNotEnabled">
+        <di:waypoint xsi:type="dc:Point" x="1783" y="265" />
+        <di:waypoint xsi:type="dc:Point" x="1783" y="401" />
+        <di:waypoint xsi:type="dc:Point" x="1783" y="401" />
+        <di:waypoint xsi:type="dc:Point" x="1783" y="537" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1400" y="398" width="12" height="12" />
+          <dc:Bounds x="1812" y="431.09791911764705" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0seif8n_di" bpmnElement="SequenceFlow_0seif8n">
@@ -479,14 +545,114 @@ createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1gc18ih_di" bpmnElement="SequenceFlow_1gc18ih">
         <di:waypoint xsi:type="dc:Point" x="1313" y="240" />
-        <di:waypoint xsi:type="dc:Point" x="1336" y="240" />
+        <di:waypoint xsi:type="dc:Point" x="1758" y="240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1325" y="225" width="0" height="0" />
+          <dc:Bounds x="1536" y="225" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0y55cyz_di" bpmnElement="postProcessCreateGenericVnf">
         <dc:Bounds x="1213" y="200" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0j73e7c_di" bpmnElement="ExclusiveGateway_0j73e7c" isMarkerVisible="true">
+        <dc:Bounds x="646" y="215" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="653" y="184" width="51" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0k2oavy_di" bpmnElement="VnfNameNotSpecified1">
+        <di:waypoint xsi:type="dc:Point" x="696" y="240" />
+        <di:waypoint xsi:type="dc:Point" x="935" y="240" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="809" y="215" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1pwgmrg_di" bpmnElement="VnfNameSpecified1">
+        <di:waypoint xsi:type="dc:Point" x="671" y="265" />
+        <di:waypoint xsi:type="dc:Point" x="671" y="328" />
+        <di:waypoint xsi:type="dc:Point" x="720" y="328" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="677" y="286.5" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1h9jdgr_di" bpmnElement="SequenceFlow_1h9jdgr">
+        <di:waypoint xsi:type="dc:Point" x="777" y="693" />
+        <di:waypoint xsi:type="dc:Point" x="799" y="693" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="788" y="678" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_14xac2y_di" bpmnElement="SequenceFlow_14xac2y">
+        <di:waypoint xsi:type="dc:Point" x="899" y="693" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="693" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="913" y="678" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1q1poly_di" bpmnElement="SequenceFlow_1q1poly">
+        <di:waypoint xsi:type="dc:Point" x="1026" y="693" />
+        <di:waypoint xsi:type="dc:Point" x="1050" y="693" />
+        <di:waypoint xsi:type="dc:Point" x="1050" y="595" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1038" y="678" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0qnhlm1_di" bpmnElement="ExclusiveGateway_0qnhlm1" isMarkerVisible="true">
+        <dc:Bounds x="625" y="530" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="624" y="495" width="51" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0lnh79j_di" bpmnElement="SequenceFlow_0lnh79j">
+        <di:waypoint xsi:type="dc:Point" x="593" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="625" y="555" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="609" y="530" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1mh1y3w_di" bpmnElement="VnfNameNotSpecified2">
+        <di:waypoint xsi:type="dc:Point" x="650" y="580" />
+        <di:waypoint xsi:type="dc:Point" x="650" y="693" />
+        <di:waypoint xsi:type="dc:Point" x="677" y="693" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="626" y="622" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_175qbtt_di" bpmnElement="VnfNameSpecified2">
+        <di:waypoint xsi:type="dc:Point" x="675" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1000" y="555" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="829" y="530" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1cpb0sg_di" bpmnElement="PreProcessSDNCGetRequest">
+        <dc:Bounds x="677" y="653" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0h8tpji_di" bpmnElement="CallSDNCAdapterVNFTopologyGet">
+        <dc:Bounds x="799" y="653" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1orism0_di" bpmnElement="PostProcessSDNCGetRequest">
+        <dc:Bounds x="926" y="653" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0bj7c4s_di" bpmnElement="SequenceFlow_0bj7c4s">
+        <di:waypoint xsi:type="dc:Point" x="1700" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1765" y="555" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1733" y="540" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0a4a9lx_di" bpmnElement="UpdateAAIOrchestrationStatus">
+        <dc:Bounds x="1600" y="515" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0nhsdmj_di" bpmnElement="SequenceFlow_0nhsdmj">
+        <di:waypoint xsi:type="dc:Point" x="1545" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1600" y="555" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1573" y="540" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0aonzix_di" bpmnElement="Task_053tb0h">
+        <dc:Bounds x="1445" y="515" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn
index 4339575..be54119 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn
@@ -13,7 +13,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:callActivity id="CreateBaseVfModule" name="Create Base VF Module" calledElement="DoCreateVfModule">
       <bpmn:extensionElements>
-        <camunda:in source="requestId" target="requestId" />
+        <camunda:in source="msoRequestId" target="msoRequestId" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:in source="disableRollback" target="disableRollback" />
         <camunda:in source="vnfType" target="vnfType" />
@@ -36,6 +36,9 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script>
         <camunda:in source="vnfModelInfo" target="vnfModelInfo" />
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
         <camunda:in source="sdncVersion" target="sdncVersion" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="false" target="usePreload" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1hf7k7q</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1ixcnb6</bpmn:outgoing>
@@ -44,7 +47,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_1xd3ri5" sourceRef="PreProcessRequest" targetRef="CreateVNF" />
     <bpmn:callActivity id="CreateAddOnVfModule" name="Create Add-On VF Module" calledElement="DoCreateVfModule">
       <bpmn:extensionElements>
-        <camunda:in source="requestId" target="requestId" />
+        <camunda:in source="msoRequestId" target="msoRequestId" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:in source="disableRollback" target="disableRollback" />
         <camunda:in source="vnfType" target="vnfType" />
@@ -67,6 +70,9 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script>
         <camunda:in source="vnfModelInfo" target="vnfModelInfo" />
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
         <camunda:in source="sdncVersion" target="sdncVersion" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="false" target="usePreload" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1lh21yl</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1llbx0k</bpmn:outgoing>
@@ -97,7 +103,7 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_132bohl" name="No" sourceRef="ExclusiveGateway_1vyqr5o" targetRef="EndEvent_0v6povc" />
     <bpmn:callActivity id="CreateVNF" name="Create VNF" calledElement="DoCreateVnf">
       <bpmn:extensionElements>
-        <camunda:in source="requestId" target="requestId" />
+        <camunda:in source="msoRequestId" target="msoRequestId" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:in source="disableRollback" target="disableRollback" />
         <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
@@ -105,7 +111,6 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script>
         <camunda:in source="vnfType" target="vnfType" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="vnfId" target="vnfId" />
-        <camunda:in source="cloudConfiguration" target="cloudConfiguration" />
         <camunda:in source="vnfInputParameters" target="vnfInputParameters" />
         <camunda:in source="productFamilyId" target="productFamilyId" />
         <camunda:out source="vnfId" target="vnfId" />
@@ -115,6 +120,9 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script>
         <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
         <camunda:in source="sdncVersion" target="sdncVersion" />
+        <camunda:out source="vnfName" target="vnfName" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1xd3ri5</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_08i3uo6</bpmn:outgoing>
@@ -141,10 +149,10 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script>
       <bpmn:outgoing>SequenceFlow_1vrogpr</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="SequenceFlow_0jz6bqn" name="yes" sourceRef="ExclusiveGateway_1vyqr5o" targetRef="PreProcessAddOnModule">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[![CDATA[#{execution.getVariable("addOnModulesDeployed") <  execution.getVariable("addOnModulesToDeploy")}]]]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("addOnModulesDeployed") <  execution.getVariable("addOnModulesToDeploy")}]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_0kld3qt" name="yes" sourceRef="ExclusiveGateway_1hx9s0y" targetRef="GenerateAddOnModuleName">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[![CDATA[#{execution.getVariable("instancesOfThisModuleDeployed") < execution.getVariable("initialCount")}]]]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("instancesOfThisModuleDeployed") < execution.getVariable("initialCount")}]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_1mguf2m" sourceRef="Task_1lfmdks" targetRef="ExclusiveGateway_1hx9s0y" />
     <bpmn:sequenceFlow id="SequenceFlow_1vrogpr" name="no" sourceRef="ExclusiveGateway_1hx9s0y" targetRef="FinishProcessingInitialCountDeployment" />
@@ -159,6 +167,7 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script>
         <camunda:in source="basePersonaModelId" target="personaModelId" />
         <camunda:out source="vfModuleName" target="baseVfModuleName" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1ifw9tw</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1hf7k7q</bpmn:outgoing>
@@ -171,6 +180,7 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script>
         <camunda:in source="addOnPersonaModelId" target="personaModelId" />
         <camunda:out source="vfModuleName" target="addOnVfModuleName" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0kld3qt</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1lh21yl</bpmn:outgoing>
@@ -193,7 +203,27 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]></bpm
 def doCreateVnfAndModules = new DoCreateVnfAndModules()
 doCreateVnfAndModules.validateBaseModule(execution)]]></bpmn:script>
     </bpmn:scriptTask>
+    <bpmn:subProcess id="SubProcess_1ktx0cx" name="Java Exception Handling Sub Process" triggeredByEvent="true">
+      <bpmn:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
+        <bpmn:incoming>SequenceFlow_11bmhi4</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_1kjlzrn</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+ExceptionUtil exceptionUtil = new ExceptionUtil()
+exceptionUtil.processJavaException(execution)]]></bpmn:script>
+      </bpmn:scriptTask>
+      <bpmn:endEvent id="EndEvent_2">
+        <bpmn:incoming>SequenceFlow_1kjlzrn</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:startEvent id="StartEvent_2">
+        <bpmn:outgoing>SequenceFlow_11bmhi4</bpmn:outgoing>
+        <bpmn:errorEventDefinition errorRef="Error_1" />
+      </bpmn:startEvent>
+      <bpmn:sequenceFlow id="SequenceFlow_11bmhi4" name="" sourceRef="StartEvent_2" targetRef="processJavaError" />
+      <bpmn:sequenceFlow id="SequenceFlow_1kjlzrn" name="" sourceRef="processJavaError" targetRef="EndEvent_2" />
+    </bpmn:subProcess>
   </bpmn:process>
+  <bpmn:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
+  <bpmn:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVnfAndModules">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
@@ -374,6 +404,38 @@ doCreateVnfAndModules.validateBaseModule(execution)]]></bpmn:script>
       <bpmndi:BPMNShape id="ScriptTask_1obevnp_di" bpmnElement="Task_054rz9i">
         <dc:Bounds x="1030" y="125" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_1ktx0cx_di" bpmnElement="SubProcess_1ktx0cx" isExpanded="true">
+        <dc:Bounds x="208" y="438" width="313" height="169" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1j93kr8_di" bpmnElement="processJavaError">
+        <dc:Bounds x="316" y="484" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_1s63ccl_di" bpmnElement="EndEvent_2">
+        <dc:Bounds x="461" y="506" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="479" y="547" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_028j51v_di" bpmnElement="StartEvent_2">
+        <dc:Bounds x="233" y="506" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="251" y="547" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_11bmhi4_di" bpmnElement="SequenceFlow_11bmhi4">
+        <di:waypoint xsi:type="dc:Point" x="269" y="524" />
+        <di:waypoint xsi:type="dc:Point" x="316" y="524" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="290" y="524" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1kjlzrn_di" bpmnElement="SequenceFlow_1kjlzrn">
+        <di:waypoint xsi:type="dc:Point" x="416" y="524" />
+        <di:waypoint xsi:type="dc:Point" x="461" y="524" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="436" y="524" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn
index 9d21cc8..49274bd 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn
@@ -1,332 +1,373 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.6.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

-  <bpmn2:process id="DoDeleteServiceInstance" name="DoDeleteServiceInstance" isExecutable="true">

-    <bpmn2:startEvent id="deleteSI_startEven" name="Start Flow">

-      <bpmn2:outgoing>SequenceFlow_0jfgn05</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0jfgn05</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1jqc16k</bpmn2:outgoing>

+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DoDeleteServiceInstance" name="DoDeleteServiceInstance" isExecutable="true">
+    <bpmn2:startEvent id="deleteSI_startEven" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_0jfgn05</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0jfgn05</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1jqc16k</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def ddsi = new DoDeleteServiceInstance()

-ddsi.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>SequenceFlow_1wyvxwi</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">

-      <bpmn2:extensionElements>

-        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />

-        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />

-        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />

-        <camunda:in sourceExpression="service-instance" target="GENDS_type" />

-        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />

-        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />

-        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />

-        <camunda:out source="WorkflowException" target="WorkflowExcpeton" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1w8ao21</bpmn2:incoming>

-      <bpmn2:incoming>SequenceFlow_0riudmc</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="ScriptTask_1ybdq3e" />

-    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />

-    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Delete" calledElement="sdncAdapter">

-      <bpmn2:extensionElements>

-        <camunda:in source="sdncDelete" target="sdncAdapterWorkflowRequest" />

-        <camunda:in source="msoRequestId" target="mso-request-id" />

-        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />

-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_0rtflal</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Delete" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1w8ao21</bpmn2:outgoing>

+def ddsi = new DoDeleteServiceInstance()
+ddsi.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_1wyvxwi</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">
+      <bpmn2:extensionElements>
+        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />
+        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />
+        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />
+        <camunda:in sourceExpression="service-instance" target="GENDS_type" />
+        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />
+        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />
+        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />
+        <camunda:out source="WorkflowException" target="WorkflowExcpeton" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0riudmc</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0znbzxu</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="ScriptTask_1ybdq3e" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />
+    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Deactivate" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="sdncDeactivate" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="msoRequestId" target="mso-request-id" />
+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="sdncDeactivateResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0rtflal</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Deactivate" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1w8ao21</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def ddsi = new DoDeleteServiceInstance()

-ddsi.postProcessSDNCDelete(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_0jfgn05" sourceRef="deleteSI_startEven" targetRef="preProcessRequest_ScriptTask" />

-    <bpmn2:scriptTask id="ScriptTask_0xxwbdq" name="PreProcess SDNC Delete" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1dwch0k</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0rtflal</bpmn2:outgoing>

+
+String response = execution.getVariable("sdncDeactivateResponse")
+def ddsi = new DoDeleteServiceInstance()
+ddsi.postProcessSDNCDelete(execution, response, "deactivate")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0jfgn05" sourceRef="deleteSI_startEven" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:scriptTask id="ScriptTask_0xxwbdq" name="PreProcess SDNC Delete" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1dwch0k</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0rtflal</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def ddsi = new DoDeleteServiceInstance()

-ddsi.preProcessSDNCDelete(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_0rtflal" sourceRef="ScriptTask_0xxwbdq" targetRef="CallActivity_0ak0ezb" />

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0590oev" name="SI found in AAI" default="SequenceFlow_05jfuko">

-      <bpmn2:incoming>SequenceFlow_1up0j5r</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1hcfvcj</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_05jfuko</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_1hcfvcj" name="yes" sourceRef="ExclusiveGateway_0590oev" targetRef="ExclusiveGateway_1mrh7us">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true}]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:endEvent id="EndEvent_0ronxsz">

-      <bpmn2:incoming>SequenceFlow_05jfuko</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_05jfuko" name="no" sourceRef="ExclusiveGateway_0590oev" targetRef="EndEvent_0ronxsz" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1w8ao21" sourceRef="ScriptTask_1uxr0cx" targetRef="callGenericDeleteService" />

-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1mrh7us" name="sdncVersion is 1610 " default="SequenceFlow_1dwch0k">

-      <bpmn2:incoming>SequenceFlow_1hcfvcj</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0riudmc</bpmn2:outgoing>

-      <bpmn2:outgoing>SequenceFlow_1dwch0k</bpmn2:outgoing>

-    </bpmn2:exclusiveGateway>

-    <bpmn2:sequenceFlow id="SequenceFlow_0riudmc" name="yes" sourceRef="ExclusiveGateway_1mrh7us" targetRef="callGenericDeleteService">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>

-    </bpmn2:sequenceFlow>

-    <bpmn2:sequenceFlow id="SequenceFlow_1dwch0k" name="no" sourceRef="ExclusiveGateway_1mrh7us" targetRef="ScriptTask_0xxwbdq" />

-    <bpmn2:callActivity id="CallActivity_1s8pf0x" name="Call AAI Generic GetService" calledElement="GenericGetService">

-      <bpmn2:extensionElements>

-        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />

-        <camunda:in sourceExpression="service-instance" target="GENGS_type" />

-        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />

-        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />

-        <camunda:out source="WorkflowException" target="WorkflowException" />

-        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />

-        <camunda:out source="GENGS_service" target="GENGS_service" />

-      </bpmn2:extensionElements>

-      <bpmn2:incoming>SequenceFlow_1jqc16k</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1grea1r</bpmn2:outgoing>

-    </bpmn2:callActivity>

-    <bpmn2:sequenceFlow id="SequenceFlow_1jqc16k" sourceRef="preProcessRequest_ScriptTask" targetRef="CallActivity_1s8pf0x" />

-    <bpmn2:scriptTask id="ScriptTask_02da0lj" name="Post Process AAI GET" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1grea1r</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1up0j5r</bpmn2:outgoing>

+def ddsi = new DoDeleteServiceInstance()
+ddsi.preProcessSDNCDelete(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0rtflal" sourceRef="ScriptTask_0xxwbdq" targetRef="CallActivity_0ak0ezb" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0590oev" name="SI found in AAI" default="SequenceFlow_05jfuko">
+      <bpmn2:incoming>SequenceFlow_1up0j5r</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1hcfvcj</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_05jfuko</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1hcfvcj" name="yes" sourceRef="ExclusiveGateway_0590oev" targetRef="ExclusiveGateway_1mrh7us">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:endEvent id="EndEvent_0ronxsz">
+      <bpmn2:incoming>SequenceFlow_05jfuko</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_05jfuko" name="no" sourceRef="ExclusiveGateway_0590oev" targetRef="EndEvent_0ronxsz" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1w8ao21" sourceRef="ScriptTask_1uxr0cx" targetRef="CallActivity_1c5wru8" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1mrh7us" name="sdncVersion is 1610 " default="SequenceFlow_1dwch0k">
+      <bpmn2:incoming>SequenceFlow_1hcfvcj</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0riudmc</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1dwch0k</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_0riudmc" name="yes" sourceRef="ExclusiveGateway_1mrh7us" targetRef="callGenericDeleteService">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_1dwch0k" name="no" sourceRef="ExclusiveGateway_1mrh7us" targetRef="ScriptTask_0xxwbdq" />
+    <bpmn2:callActivity id="CallActivity_1s8pf0x" name="Call AAI Generic GetService" calledElement="GenericGetService">
+      <bpmn2:extensionElements>
+        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />
+        <camunda:in sourceExpression="service-instance" target="GENGS_type" />
+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
+        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />
+        <camunda:out source="GENGS_service" target="GENGS_service" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1jqc16k</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1grea1r</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_1jqc16k" sourceRef="preProcessRequest_ScriptTask" targetRef="CallActivity_1s8pf0x" />
+    <bpmn2:scriptTask id="ScriptTask_02da0lj" name="Post Process AAI GET" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1grea1r</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1up0j5r</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def ddsi = new DoDeleteServiceInstance()

-ddsi.postProcessAAIGET(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1grea1r" sourceRef="CallActivity_1s8pf0x" targetRef="ScriptTask_02da0lj" />

-    <bpmn2:sequenceFlow id="SequenceFlow_1up0j5r" sourceRef="ScriptTask_02da0lj" targetRef="ExclusiveGateway_0590oev" />

-    <bpmn2:scriptTask id="ScriptTask_1ybdq3e" name="Post Process AAI Delete" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_1wyvxwi</bpmn2:outgoing>

+def ddsi = new DoDeleteServiceInstance()
+ddsi.postProcessAAIGET(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1grea1r" sourceRef="CallActivity_1s8pf0x" targetRef="ScriptTask_02da0lj" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1up0j5r" sourceRef="ScriptTask_02da0lj" targetRef="ExclusiveGateway_0590oev" />
+    <bpmn2:scriptTask id="ScriptTask_1ybdq3e" name="Post Process AAI Delete" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1wyvxwi</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def ddsi = new DoDeleteServiceInstance()

-ddsi.postProcessAAIDEL(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_1wyvxwi" sourceRef="ScriptTask_1ybdq3e" targetRef="EndEvent_3" />

-    <bpmn2:subProcess id="SubProcess_1jggn82" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">

-      <bpmn2:startEvent id="StartEvent_1antv0y">

-        <bpmn2:outgoing>SequenceFlow_0u33vy6</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition errorRef="Error_1" />

-      </bpmn2:startEvent>

-      <bpmn2:endEvent id="EndEvent_03iywf6">

-        <bpmn2:incoming>SequenceFlow_0hevfee</bpmn2:incoming>

-      </bpmn2:endEvent>

-      <bpmn2:scriptTask id="ScriptTask_1va95un" name="Log / Print Unexpected Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_0u33vy6</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0hevfee</bpmn2:outgoing>

+def ddsi = new DoDeleteServiceInstance()
+ddsi.postProcessAAIDEL(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1wyvxwi" sourceRef="ScriptTask_1ybdq3e" targetRef="EndEvent_3" />
+    <bpmn2:subProcess id="SubProcess_1jggn82" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
+      <bpmn2:startEvent id="StartEvent_1antv0y">
+        <bpmn2:outgoing>SequenceFlow_0u33vy6</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition errorRef="Error_1" />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_03iywf6">
+        <bpmn2:incoming>SequenceFlow_0hevfee</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:scriptTask id="ScriptTask_1va95un" name="Log / Print Unexpected Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0u33vy6</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0hevfee</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

-ExceptionUtil ex = new ExceptionUtil()

-ex.processJavaException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_0u33vy6" name="" sourceRef="StartEvent_1antv0y" targetRef="ScriptTask_1va95un" />

-      <bpmn2:sequenceFlow id="SequenceFlow_0hevfee" name="" sourceRef="ScriptTask_1va95un" targetRef="EndEvent_03iywf6" />

-    </bpmn2:subProcess>

-  </bpmn2:process>

-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteServiceInstance">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteSI_startEven">

-        <dc:Bounds x="-334" y="79" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="-340" y="120" width="49" height="13" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

-        <dc:Bounds x="-229" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

-        <dc:Bounds x="1384" y="201" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1402" y="242" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">

-        <dc:Bounds x="1159" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">

-        <di:waypoint xsi:type="dc:Point" x="1259" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="1350" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1305" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">

-        <di:waypoint xsi:type="dc:Point" x="902" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="972" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="937" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">

-        <dc:Bounds x="802" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">

-        <dc:Bounds x="972" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0jfgn05_di" bpmnElement="SequenceFlow_0jfgn05">

-        <di:waypoint xsi:type="dc:Point" x="-298" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="-229" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="-247" y="97" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0xxwbdq_di" bpmnElement="ScriptTask_0xxwbdq">

-        <dc:Bounds x="617" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0rtflal_di" bpmnElement="SequenceFlow_0rtflal">

-        <di:waypoint xsi:type="dc:Point" x="717" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="802" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="760" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_0590oev_di" bpmnElement="ExclusiveGateway_0590oev" isMarkerVisible="true">

-        <dc:Bounds x="305" y="72" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="293" y="51" width="73" height="13" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1hcfvcj_di" bpmnElement="SequenceFlow_1hcfvcj">

-        <di:waypoint xsi:type="dc:Point" x="355" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="420" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="459" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="384" y="99.03416045409814" width="17" height="13" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="EndEvent_0ronxsz_di" bpmnElement="EndEvent_0ronxsz">

-        <dc:Bounds x="312" y="186" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="330" y="227" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_05jfuko_di" bpmnElement="SequenceFlow_05jfuko">

-        <di:waypoint xsi:type="dc:Point" x="330" y="122" />

-        <di:waypoint xsi:type="dc:Point" x="330" y="186" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="310" y="127.1200546314796" width="13" height="13" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1w8ao21_di" bpmnElement="SequenceFlow_1w8ao21">

-        <di:waypoint xsi:type="dc:Point" x="1072" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="1127" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="1156" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1100" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ExclusiveGateway_1mrh7us_di" bpmnElement="ExclusiveGateway_1mrh7us" isMarkerVisible="true">

-        <dc:Bounds x="463" y="72" width="50" height="50" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="451" y="122" width="73" height="25" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0riudmc_di" bpmnElement="SequenceFlow_0riudmc">

-        <di:waypoint xsi:type="dc:Point" x="488" y="72" />

-        <di:waypoint xsi:type="dc:Point" x="488" y="-20" />

-        <di:waypoint xsi:type="dc:Point" x="1209" y="-20" />

-        <di:waypoint xsi:type="dc:Point" x="1209" y="57" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="841" y="-35" width="17" height="13" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1dwch0k_di" bpmnElement="SequenceFlow_1dwch0k">

-        <di:waypoint xsi:type="dc:Point" x="513" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="558" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="558" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="617" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="526" y="73" width="12" height="13" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="CallActivity_1s8pf0x_di" bpmnElement="CallActivity_1s8pf0x">

-        <dc:Bounds x="-64" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1jqc16k_di" bpmnElement="SequenceFlow_1jqc16k">

-        <di:waypoint xsi:type="dc:Point" x="-129" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="-64" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="-85" y="97" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_02da0lj_di" bpmnElement="ScriptTask_02da0lj">

-        <dc:Bounds x="107" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1grea1r_di" bpmnElement="SequenceFlow_1grea1r">

-        <di:waypoint xsi:type="dc:Point" x="36" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="73" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="73" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="107" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="88" y="97" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_1up0j5r_di" bpmnElement="SequenceFlow_1up0j5r">

-        <di:waypoint xsi:type="dc:Point" x="207" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="256" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="256" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="305" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="271" y="97" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_1ybdq3e_di" bpmnElement="ScriptTask_1ybdq3e">

-        <dc:Bounds x="1352" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_1wyvxwi_di" bpmnElement="SequenceFlow_1wyvxwi">

-        <di:waypoint xsi:type="dc:Point" x="1402" y="137" />

-        <di:waypoint xsi:type="dc:Point" x="1402" y="201" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="1417" y="169" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="SubProcess_1jggn82_di" bpmnElement="SubProcess_1jggn82" isExpanded="true">

-        <dc:Bounds x="266" y="409" width="467" height="193" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="StartEvent_1antv0y_di" bpmnElement="StartEvent_1antv0y">

-        <dc:Bounds x="334" y="475" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="352" y="516" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="EndEvent_03iywf6_di" bpmnElement="EndEvent_03iywf6">

-        <dc:Bounds x="627" y="475" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="645" y="516" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="ScriptTask_1va95un_di" bpmnElement="ScriptTask_1va95un">

-        <dc:Bounds x="438" y="453" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0u33vy6_di" bpmnElement="SequenceFlow_0u33vy6">

-        <di:waypoint xsi:type="dc:Point" x="370" y="493" />

-        <di:waypoint xsi:type="dc:Point" x="438" y="493" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="404" y="478" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_0hevfee_di" bpmnElement="SequenceFlow_0hevfee">

-        <di:waypoint xsi:type="dc:Point" x="538" y="493" />

-        <di:waypoint xsi:type="dc:Point" x="627" y="493" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="583" y="478" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+ExceptionUtil ex = new ExceptionUtil()
+ex.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_0u33vy6" name="" sourceRef="StartEvent_1antv0y" targetRef="ScriptTask_1va95un" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0hevfee" name="" sourceRef="ScriptTask_1va95un" targetRef="EndEvent_03iywf6" />
+    </bpmn2:subProcess>
+    <bpmn2:callActivity id="CallActivity_1c5wru8" name="Call SDNC Service Topology Delete" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="sdncDelete" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="msoRequestId" target="mso-request-id" />
+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="sdncDeleteResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1w8ao21</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_14x55db</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="ScriptTask_0lc115e" name="Post Process SDNC Delete" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_14x55db</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0znbzxu</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+
+String response = execution.getVariable("sdncDeleteResponse")
+def ddsi = new DoDeleteServiceInstance()
+ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_14x55db" sourceRef="CallActivity_1c5wru8" targetRef="ScriptTask_0lc115e" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0znbzxu" sourceRef="ScriptTask_0lc115e" targetRef="callGenericDeleteService" />
+  </bpmn2:process>
+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteServiceInstance">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteSI_startEven">
+        <dc:Bounds x="-334" y="79" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-340" y="120" width="49" height="13" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="-229" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
+        <dc:Bounds x="1384" y="201" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1402" y="242" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">
+        <dc:Bounds x="1202" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">
+        <di:waypoint xsi:type="dc:Point" x="1302" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1352" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1327" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">
+        <di:waypoint xsi:type="dc:Point" x="738" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="776" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="757" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">
+        <dc:Bounds x="638" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">
+        <dc:Bounds x="776" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0jfgn05_di" bpmnElement="SequenceFlow_0jfgn05">
+        <di:waypoint xsi:type="dc:Point" x="-298" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="-229" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-247" y="97" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0xxwbdq_di" bpmnElement="ScriptTask_0xxwbdq">
+        <dc:Bounds x="492" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0rtflal_di" bpmnElement="SequenceFlow_0rtflal">
+        <di:waypoint xsi:type="dc:Point" x="592" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="638" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="615" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0590oev_di" bpmnElement="ExclusiveGateway_0590oev" isMarkerVisible="true">
+        <dc:Bounds x="305" y="72" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="293" y="51" width="73" height="13" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1hcfvcj_di" bpmnElement="SequenceFlow_1hcfvcj">
+        <di:waypoint xsi:type="dc:Point" x="355" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="403" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="384" y="99" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_0ronxsz_di" bpmnElement="EndEvent_0ronxsz">
+        <dc:Bounds x="312" y="186" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="330" y="227" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_05jfuko_di" bpmnElement="SequenceFlow_05jfuko">
+        <di:waypoint xsi:type="dc:Point" x="330" y="122" />
+        <di:waypoint xsi:type="dc:Point" x="330" y="186" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="310" y="127.1200546314796" width="13" height="13" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1w8ao21_di" bpmnElement="SequenceFlow_1w8ao21">
+        <di:waypoint xsi:type="dc:Point" x="876" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="917" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="897" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1mrh7us_di" bpmnElement="ExclusiveGateway_1mrh7us" isMarkerVisible="true">
+        <dc:Bounds x="403" y="72" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="390" y="122" width="75" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0riudmc_di" bpmnElement="SequenceFlow_0riudmc">
+        <di:waypoint xsi:type="dc:Point" x="428" y="72" />
+        <di:waypoint xsi:type="dc:Point" x="428" y="-20" />
+        <di:waypoint xsi:type="dc:Point" x="1252" y="-20" />
+        <di:waypoint xsi:type="dc:Point" x="1252" y="57" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="834" y="-35" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1dwch0k_di" bpmnElement="SequenceFlow_1dwch0k">
+        <di:waypoint xsi:type="dc:Point" x="453" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="492" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="464" y="73" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1s8pf0x_di" bpmnElement="CallActivity_1s8pf0x">
+        <dc:Bounds x="-64" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1jqc16k_di" bpmnElement="SequenceFlow_1jqc16k">
+        <di:waypoint xsi:type="dc:Point" x="-129" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="-64" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-85" y="97" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_02da0lj_di" bpmnElement="ScriptTask_02da0lj">
+        <dc:Bounds x="107" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1grea1r_di" bpmnElement="SequenceFlow_1grea1r">
+        <di:waypoint xsi:type="dc:Point" x="36" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="73" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="73" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="107" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="88" y="97" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1up0j5r_di" bpmnElement="SequenceFlow_1up0j5r">
+        <di:waypoint xsi:type="dc:Point" x="207" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="256" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="256" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="305" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="271" y="97" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1ybdq3e_di" bpmnElement="ScriptTask_1ybdq3e">
+        <dc:Bounds x="1352" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1wyvxwi_di" bpmnElement="SequenceFlow_1wyvxwi">
+        <di:waypoint xsi:type="dc:Point" x="1402" y="137" />
+        <di:waypoint xsi:type="dc:Point" x="1402" y="201" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1417" y="169" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="SubProcess_1jggn82_di" bpmnElement="SubProcess_1jggn82" isExpanded="true">
+        <dc:Bounds x="266" y="409" width="467" height="193" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1antv0y_di" bpmnElement="StartEvent_1antv0y">
+        <dc:Bounds x="334" y="475" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="352" y="516" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_03iywf6_di" bpmnElement="EndEvent_03iywf6">
+        <dc:Bounds x="627" y="475" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="645" y="516" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1va95un_di" bpmnElement="ScriptTask_1va95un">
+        <dc:Bounds x="438" y="453" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0u33vy6_di" bpmnElement="SequenceFlow_0u33vy6">
+        <di:waypoint xsi:type="dc:Point" x="370" y="493" />
+        <di:waypoint xsi:type="dc:Point" x="438" y="493" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="404" y="478" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0hevfee_di" bpmnElement="SequenceFlow_0hevfee">
+        <di:waypoint xsi:type="dc:Point" x="538" y="493" />
+        <di:waypoint xsi:type="dc:Point" x="627" y="493" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="583" y="478" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1c5wru8_di" bpmnElement="CallActivity_1c5wru8">
+        <dc:Bounds x="917" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0lc115e_di" bpmnElement="ScriptTask_0lc115e">
+        <dc:Bounds x="1058" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_14x55db_di" bpmnElement="SequenceFlow_14x55db">
+        <di:waypoint xsi:type="dc:Point" x="1017" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1058" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1038" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0znbzxu_di" bpmnElement="SequenceFlow_0znbzxu">
+        <di:waypoint xsi:type="dc:Point" x="1158" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1202" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1180" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn
index ab08123..b8c6aa3 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoDeleteVfModule" name="DoDeleteVfModule" isExecutable="true">
-    <bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0fp1wqz</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -10,8 +9,7 @@ def dvm = new DoDeleteVfModule()
 dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="UpdateAAIVfModulePrep" targetRef="InvokeUpdateAAIVfModule" />
-    <bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke
-&#10;UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
+    <bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke
&#10;UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="UpdateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest" />
@@ -21,8 +19,7 @@ dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_31" name="" sourceRef="InvokeUpdateAAIVfModule" targetRef="SDNCAdapterPrep2" />
-    <bpmn2:callActivity id="InvokePrepareUpdateAAIVfModule" name="Invoke
-&#10;PrepareUpdateAAIVfModule" calledElement="PrepareUpdateAAIVfModule">
+    <bpmn2:callActivity id="InvokePrepareUpdateAAIVfModule" name="Invoke
&#10;PrepareUpdateAAIVfModule" calledElement="PrepareUpdateAAIVfModule">
       <bpmn2:extensionElements>
         <camunda:in source="PrepareUpdateAAIVfModuleRequest" target="PrepareUpdateAAIVfModuleRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
@@ -34,8 +31,7 @@ dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_1j9dvfx</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapterRestV1" />
-    <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke
-&#10;SDNCAdapterV1" calledElement="sdncAdapter">
+    <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke
&#10;SDNCAdapterV1" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="sdncAdapterWorkflowRequest" target="sdncAdapterWorkflowRequest" />
@@ -49,16 +45,14 @@ dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_33" name="" sourceRef="InvokeSDNCAdapterV1_2" targetRef="validateSDNCResponse" />
-    <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1j9dvfx</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
 dvm.prepVNFAdapterRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -66,8 +60,7 @@ def dvm = new DoDeleteVfModule()
 dvm.prepSDNCAdapterRequest(execution, "delete")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="InvokeSDNCAdapterV1_2" />
-    <bpmn2:callActivity id="InvokeVNFAdapterRestV1" name="Invoke
-&#10;VNFAdapterRestV1" calledElement="vnfAdapterRestV1">
+    <bpmn2:callActivity id="InvokeVNFAdapterRestV1" name="Invoke
&#10;VNFAdapterRestV1" calledElement="vnfAdapterRestV1">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="vnfAdapterRestV1Request" target="vnfAdapterRestV1Request" />
@@ -82,8 +75,7 @@ dvm.prepSDNCAdapterRequest(execution, "delete")]]></bpmn2:script>
     <bpmn2:endEvent id="EndEvent_9">
       <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
     </bpmn2:endEvent>
-    <bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke
-&#10;DeleteAAIVfModule" calledElement="DeleteAAIVfModule">
+    <bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke
&#10;DeleteAAIVfModule" calledElement="DeleteAAIVfModule">
       <bpmn2:extensionElements>
         <camunda:in source="DeleteAAIVfModuleRequest" target="DeleteAAIVfModuleRequest" />
         <camunda:in source="isVidRequest" target="isVidRequest" />
@@ -94,8 +86,7 @@ dvm.prepSDNCAdapterRequest(execution, "delete")]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="InvokeDeleteAAIVfModule" targetRef="EndEvent_9" />
-    <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
index 127030d..078e010 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
@@ -36,22 +36,24 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
     </bpmn2:endEvent>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1amun4k" name="Are there VF modules to delete?" default="SequenceFlow_1936oc0">
       <bpmn2:incoming>SequenceFlow_0t4yszi</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_0lu7b1v</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1tt31qu</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1fccvli</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1qrkdn3</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_1936oc0</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:callActivity id="DeleteVNF" name="Delete VNF" calledElement="DoDeleteVnf">
       <bpmn2:extensionElements>
-        <camunda:in source="IsDebugLogEnabled" target="IsDebugLogEnabled" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="vnfId" target="vnfId" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_05ujwz8</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1x25m7t</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1uqlr6b</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_08nd69s" sourceRef="intialization" targetRef="QueryVnf" />
     <bpmn2:sequenceFlow id="SequenceFlow_1qrkdn3" name="yes" sourceRef="ExclusiveGateway_1amun4k" targetRef="PrepareModuleList">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DDVAM_nextModule") < execution.getVariable("DDVAM_modulesSize")]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DDVAM_nextModule") < execution.getVariable("DDVAM_moduleCount")]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:callActivity id="DeleteVFModule" name="Delete VF Module" calledElement="DoDeleteVfModule">
       <bpmn2:extensionElements>
@@ -63,20 +65,22 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
         <camunda:in source="DDVAM_vfModuleName" target="vfModuleName" />
         <camunda:in source="DDVAM_vfModuleModelInfo" target="vfModuleModelInfo" />
         <camunda:in source="cloudConfiguration" target="cloudConfiguration" />
-        <camunda:in source="&#34;1610&#34;" target="sdncVersion" />
+        <camunda:in source="DDVAM_sdncVersion" target="sdncVersion" />
         <camunda:in source="&#34;true&#34;" target="isVidRequest" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1qoor0l</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1xujrk5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1p4ycii</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0189gqf">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0189gqf" name="Is SDNC Interaction Enabled?" default="SequenceFlow_05ujwz8">
       <bpmn2:incoming>SequenceFlow_1936oc0</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_05ujwz8</bpmn2:outgoing>
+      <bpmn2:outgoing>SDNCInteractionEnabled2</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_1p4ycii" sourceRef="DeleteVFModule" targetRef="PostProcessDeleteVfModule" />
     <bpmn2:sequenceFlow id="SequenceFlow_0t4yszi" sourceRef="PostProcessDeleteVfModule" targetRef="ExclusiveGateway_1amun4k" />
     <bpmn2:sequenceFlow id="SequenceFlow_1936oc0" name="no" sourceRef="ExclusiveGateway_1amun4k" targetRef="ExclusiveGateway_0189gqf" />
-    <bpmn2:sequenceFlow id="SequenceFlow_05ujwz8" sourceRef="ExclusiveGateway_0189gqf" targetRef="DeleteVNF" />
+    <bpmn2:sequenceFlow id="SequenceFlow_05ujwz8" name="no" sourceRef="ExclusiveGateway_0189gqf" targetRef="DeleteVNF" />
     <bpmn2:sequenceFlow id="SequenceFlow_1uqlr6b" sourceRef="DeleteVNF" targetRef="EndEvent_2" />
     <bpmn2:scriptTask id="QueryVnf" name="Query VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_08nd69s</bpmn2:incoming>
@@ -92,15 +96,115 @@ ddvam.queryAAIVfModule(execution)]]></bpmn2:script>
 def ddvam = new DoDeleteVnfAndModules()
 ddvam.prepareNextModuleToDelete(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_0lu7b1v" sourceRef="QueryVnf" targetRef="ExclusiveGateway_1amun4k" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1qoor0l" sourceRef="PrepareModuleList" targetRef="DeleteVFModule" />
-    <bpmn2:scriptTask id="PostProcessDeleteVfModule" name="PostProcess Delete VF Module">
+    <bpmn2:sequenceFlow id="SequenceFlow_0lu7b1v" sourceRef="QueryVnf" targetRef="ExclusiveGateway_027lai5" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1qoor0l" sourceRef="PrepareModuleList" targetRef="ExclusiveGateway_0b36mti" />
+    <bpmn2:scriptTask id="PostProcessDeleteVfModule" name="PostProcess Delete VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1p4ycii</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0xl033m</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0t4yszi</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-int nextModule = execution.getVariable("nextModule")
-			execution.setVariable("nextModule", nextModule + 1)]]></bpmn2:script>
+int nextModule = execution.getVariable("DDVAM_nextModule")
+			execution.setVariable("DDVAM_nextModule", nextModule + 1)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_027lai5" name="Is SDNC Interaction Enabled?" default="SequenceFlow_1tt31qu">
+      <bpmn2:incoming>SequenceFlow_0lu7b1v</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1tt31qu</bpmn2:outgoing>
+      <bpmn2:outgoing>SDNCInteractionEnabled1</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1tt31qu" name="no" sourceRef="ExclusiveGateway_027lai5" targetRef="ExclusiveGateway_1amun4k" />
+    <bpmn2:sequenceFlow id="SDNCInteractionEnabled1" name="yes" sourceRef="ExclusiveGateway_027lai5" targetRef="preProcessSDNCDeactivateRequest">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DDVAM_sdncVersion" ) != '1702'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0fhhsyo" sourceRef="preProcessSDNCDeactivateRequest" targetRef="callSDNCAdapterTopologyDeactivate" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0qdn8k4" sourceRef="callSDNCAdapterTopologyDeactivate" targetRef="postProcessSDNCDeactivateRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1fccvli" sourceRef="postProcessSDNCDeactivateRequest" targetRef="ExclusiveGateway_1amun4k" />
+    <bpmn2:scriptTask id="preProcessSDNCDeactivateRequest" name="PreProcess SDNC Deactivate Request" scriptFormat="groovy">
+      <bpmn2:incoming>SDNCInteractionEnabled1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0fhhsyo</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+ddvam.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="postProcessSDNCDeactivateRequest" name="PostProcess SDNC Deactivate Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0qdn8k4</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1fccvli</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+String response = execution.getVariable("DDVAM_deactivateSDNCAdapterResponse")
+ddvam.validateSDNCResponse(execution, response, "deactivate")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="callSDNCAdapterTopologyDeactivate" name="Call SDNC Adapter Topology Deactivate" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="DDVAM_deactivateSDNCRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="DDVAM_deactivateSDNCAdapterResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0fhhsyo</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0qdn8k4</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SDNCInteractionEnabled2" name="yes" sourceRef="ExclusiveGateway_0189gqf" targetRef="preProcessSDNCUnassignRequest">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DDVAM_sdncVersion" ) != '1702'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_001uxa1" sourceRef="preProcessSDNCUnassignRequest" targetRef="callSDNCAdapterTopologyUnassign" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1x29mht" sourceRef="callSDNCAdapterTopologyUnassign" targetRef="postProcessSDNCUnassignRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1x25m7t" sourceRef="postProcessSDNCUnassignRequest" targetRef="DeleteVNF" />
+    <bpmn2:scriptTask id="preProcessSDNCUnassignRequest" name="PreProcess SDNC Unassign Request" scriptFormat="groovy">
+      <bpmn2:incoming>SDNCInteractionEnabled2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_001uxa1</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+ddvam.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="callSDNCAdapterTopologyUnassign" name="Call SDNC Adapter Topology Unassign" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="DDVAM_unassignSDNCRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="sdncAdapterResponse" target="DDVAM_unassignSDNCAdapterResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_001uxa1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1x29mht</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="postProcessSDNCUnassignRequest" name="PostProcess SDNC Unassign Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1x29mht</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1x25m7t</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+String response = execution.getVariable("DDVAM_unassignSDNCAdapterResponse")
+ddvam.validateSDNCResponse(execution, response, "unassign")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0b36mti" name="Is SDNC Interaction Enabled?" default="SequenceFlow_1xujrk5">
+      <bpmn2:incoming>SequenceFlow_1qoor0l</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1xujrk5</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1laeenc</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:callActivity id="DoDeleteVfModuleFromVnf" name="Deiete VF Module From VNF" calledElement="DoDeleteVfModuleFromVnf">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="vnfId" target="vnfId" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="DDVAM_sdncVersion" target="sdncVersion" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="DDVAM_vfModuleId" target="vfModuleId" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1laeenc</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0xl033m</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_1xujrk5" name="no" sourceRef="ExclusiveGateway_0b36mti" targetRef="DeleteVFModule" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1laeenc" name="yes" sourceRef="ExclusiveGateway_0b36mti" targetRef="DoDeleteVfModuleFromVnf">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DDVAM_sdncVersion" ) != '1702'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0xl033m" sourceRef="DoDeleteVfModuleFromVnf" targetRef="PostProcessDeleteVfModule" />
   </bpmn2:process>
   <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_2" name="Java Lang Exception" errorCode="java.lang.Exception" />
@@ -123,51 +227,51 @@ int nextModule = execution.getVariable("nextModule")
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_237" bpmnElement="EndEvent_2">
-        <dc:Bounds x="1605" y="209" width="36" height="36" />
+        <dc:Bounds x="1983" y="372" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1623" y="250" width="0" height="0" />
+          <dc:Bounds x="2001" y="413" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_35" bpmnElement="javaErrorHandlingSubProcess" isExpanded="true">
-        <dc:Bounds x="226" y="401" width="431" height="157" />
+        <dc:Bounds x="229" y="616" width="431" height="157" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_81" bpmnElement="StartEvent_3">
-        <dc:Bounds x="374" y="462" width="36" height="36" />
+        <dc:Bounds x="377" y="677" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="392" y="503" width="0" height="0" />
+          <dc:Bounds x="395" y="718" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_239" bpmnElement="EndEvent_4">
-        <dc:Bounds x="590" y="462" width="36" height="36" />
+        <dc:Bounds x="593" y="677" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="608" y="503" width="0" height="0" />
+          <dc:Bounds x="611" y="718" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_319" bpmnElement="processJavaException">
-        <dc:Bounds x="444" y="440" width="100" height="80" />
+        <dc:Bounds x="447" y="655" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_StartEvent_81" targetElement="_BPMNShape_ScriptTask_319">
-        <di:waypoint xsi:type="dc:Point" x="410" y="480" />
-        <di:waypoint xsi:type="dc:Point" x="444" y="480" />
+        <di:waypoint xsi:type="dc:Point" x="413" y="695" />
+        <di:waypoint xsi:type="dc:Point" x="447" y="695" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="427" y="465" width="0" height="0" />
+          <dc:Bounds x="430" y="680" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ScriptTask_319" targetElement="_BPMNShape_EndEvent_239">
-        <di:waypoint xsi:type="dc:Point" x="544" y="480" />
-        <di:waypoint xsi:type="dc:Point" x="590" y="480" />
+        <di:waypoint xsi:type="dc:Point" x="547" y="695" />
+        <di:waypoint xsi:type="dc:Point" x="593" y="695" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="567" y="465" width="0" height="0" />
+          <dc:Bounds x="570" y="680" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1amun4k_di" bpmnElement="ExclusiveGateway_1amun4k" isMarkerVisible="true">
-        <dc:Bounds x="691" y="202" width="50" height="50" />
+        <dc:Bounds x="1271" y="200" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="683" y="252" width="65" height="36" />
+          <dc:Bounds x="1263" y="250" width="65" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0laaqvh_di" bpmnElement="DeleteVNF">
-        <dc:Bounds x="1436" y="187" width="100" height="80" />
+        <dc:Bounds x="1812" y="350" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_08nd69s_di" bpmnElement="SequenceFlow_08nd69s">
         <di:waypoint xsi:type="dc:Point" x="444" y="227" />
@@ -177,87 +281,208 @@ int nextModule = execution.getVariable("nextModule")
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1qrkdn3_di" bpmnElement="SequenceFlow_1qrkdn3">
-        <di:waypoint xsi:type="dc:Point" x="716" y="202" />
-        <di:waypoint xsi:type="dc:Point" x="716" y="104" />
-        <di:waypoint xsi:type="dc:Point" x="788" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="200" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="102" />
+        <di:waypoint xsi:type="dc:Point" x="1368" y="102" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="722" y="156.4750449879038" width="18" height="12" />
+          <dc:Bounds x="1302" y="154" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0qmp9y5_di" bpmnElement="DeleteVFModule">
-        <dc:Bounds x="962" y="64" width="100" height="80" />
+        <dc:Bounds x="1648" y="-9" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0189gqf_di" bpmnElement="ExclusiveGateway_0189gqf" isMarkerVisible="true">
-        <dc:Bounds x="1304" y="202" width="50" height="50" />
+        <dc:Bounds x="1271" y="365" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1329" y="252" width="0" height="0" />
+          <dc:Bounds x="1302" y="319" width="54" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1p4ycii_di" bpmnElement="SequenceFlow_1p4ycii">
-        <di:waypoint xsi:type="dc:Point" x="1062" y="104" />
-        <di:waypoint xsi:type="dc:Point" x="1096" y="104" />
-        <di:waypoint xsi:type="dc:Point" x="1096" y="104" />
-        <di:waypoint xsi:type="dc:Point" x="1127" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="1748" y="31" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="31" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="62" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1111" y="104" width="0" height="0" />
+          <dc:Bounds x="1826" y="16" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0t4yszi_di" bpmnElement="SequenceFlow_0t4yszi">
-        <di:waypoint xsi:type="dc:Point" x="1177" y="144" />
-        <di:waypoint xsi:type="dc:Point" x="1177" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="741" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="142" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="225" />
+        <di:waypoint xsi:type="dc:Point" x="1321" y="225" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1192" y="185.5" width="0" height="0" />
+          <dc:Bounds x="1919" y="183.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1936oc0_di" bpmnElement="SequenceFlow_1936oc0">
-        <di:waypoint xsi:type="dc:Point" x="716" y="252" />
-        <di:waypoint xsi:type="dc:Point" x="716" y="301" />
-        <di:waypoint xsi:type="dc:Point" x="1329" y="301" />
-        <di:waypoint xsi:type="dc:Point" x="1329" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="250" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="365" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1017" y="286" width="12" height="12" />
+          <dc:Bounds x="1270" y="305.40625" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_05ujwz8_di" bpmnElement="SequenceFlow_05ujwz8">
-        <di:waypoint xsi:type="dc:Point" x="1354" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1436" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1321" y="390" />
+        <di:waypoint xsi:type="dc:Point" x="1812" y="390" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1395" y="202" width="0" height="0" />
+          <dc:Bounds x="1361" y="362" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1uqlr6b_di" bpmnElement="SequenceFlow_1uqlr6b">
-        <di:waypoint xsi:type="dc:Point" x="1536" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1605" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1912" y="390" />
+        <di:waypoint xsi:type="dc:Point" x="1983" y="390" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1571" y="212" width="0" height="0" />
+          <dc:Bounds x="1948" y="375" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_12xsp2f_di" bpmnElement="QueryVnf">
         <dc:Bounds x="512" y="187" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_01c9qas_di" bpmnElement="PrepareModuleList">
-        <dc:Bounds x="788" y="64" width="100" height="80" />
+        <dc:Bounds x="1368" y="62" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0lu7b1v_di" bpmnElement="SequenceFlow_0lu7b1v">
         <di:waypoint xsi:type="dc:Point" x="612" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="691" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="701" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="652" y="202" width="0" height="0" />
+          <dc:Bounds x="657" y="212" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1qoor0l_di" bpmnElement="SequenceFlow_1qoor0l">
-        <di:waypoint xsi:type="dc:Point" x="888" y="104" />
-        <di:waypoint xsi:type="dc:Point" x="928" y="104" />
-        <di:waypoint xsi:type="dc:Point" x="928" y="104" />
-        <di:waypoint xsi:type="dc:Point" x="962" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="1468" y="102" />
+        <di:waypoint xsi:type="dc:Point" x="1525" y="102" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="943" y="104" width="0" height="0" />
+          <dc:Bounds x="1497" y="87" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_11i0rnd_di" bpmnElement="PostProcessDeleteVfModule">
-        <dc:Bounds x="1127" y="64" width="100" height="80" />
+        <dc:Bounds x="1854" y="62" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_027lai5_di" bpmnElement="ExclusiveGateway_027lai5" isMarkerVisible="true">
+        <dc:Bounds x="701" y="202" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="699" y="145" width="54" height="36" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1tt31qu_di" bpmnElement="SequenceFlow_1tt31qu">
+        <di:waypoint xsi:type="dc:Point" x="751" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1271" y="225" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1005" y="201" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_04lnhgt_di" bpmnElement="SDNCInteractionEnabled1">
+        <di:waypoint xsi:type="dc:Point" x="726" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="726" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="776" y="337" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="694" y="280.5" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0fhhsyo_di" bpmnElement="SequenceFlow_0fhhsyo">
+        <di:waypoint xsi:type="dc:Point" x="876" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="337" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="901" y="322" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0qdn8k4_di" bpmnElement="SequenceFlow_0qdn8k4">
+        <di:waypoint xsi:type="dc:Point" x="1026" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="1070" y="337" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1048" y="322" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1fccvli_di" bpmnElement="SequenceFlow_1fccvli">
+        <di:waypoint xsi:type="dc:Point" x="1170" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="1225" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="1225" y="225" />
+        <di:waypoint xsi:type="dc:Point" x="1271" y="225" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1240" y="281" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1cj4pgd_di" bpmnElement="preProcessSDNCDeactivateRequest">
+        <dc:Bounds x="776" y="297" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1nug5hb_di" bpmnElement="postProcessSDNCDeactivateRequest">
+        <dc:Bounds x="1070" y="297" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0sl24xf_di" bpmnElement="callSDNCAdapterTopologyDeactivate">
+        <dc:Bounds x="926" y="297" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0ftrgor_di" bpmnElement="SDNCInteractionEnabled2">
+        <di:waypoint xsi:type="dc:Point" x="1296" y="415" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1356" y="501" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1266" y="445.36046511627904" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_001uxa1_di" bpmnElement="SequenceFlow_001uxa1">
+        <di:waypoint xsi:type="dc:Point" x="1456" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1517" y="501" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1487" y="486" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1x29mht_di" bpmnElement="SequenceFlow_1x29mht">
+        <di:waypoint xsi:type="dc:Point" x="1617" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1678" y="501" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1648" y="486" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1x25m7t_di" bpmnElement="SequenceFlow_1x25m7t">
+        <di:waypoint xsi:type="dc:Point" x="1778" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1862" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1862" y="430" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1820" y="486" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_167oslm_di" bpmnElement="preProcessSDNCUnassignRequest">
+        <dc:Bounds x="1356" y="461" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0cv258c_di" bpmnElement="callSDNCAdapterTopologyUnassign">
+        <dc:Bounds x="1517" y="461" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1gb4lqf_di" bpmnElement="postProcessSDNCUnassignRequest">
+        <dc:Bounds x="1678" y="461" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0b36mti_di" bpmnElement="ExclusiveGateway_0b36mti" isMarkerVisible="true">
+        <dc:Bounds x="1525" y="77" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1581" y="84" width="54" height="36" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1y4alqc_di" bpmnElement="DoDeleteVfModuleFromVnf">
+        <dc:Bounds x="1648" y="121" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1xujrk5_di" bpmnElement="SequenceFlow_1xujrk5">
+        <di:waypoint xsi:type="dc:Point" x="1550" y="77" />
+        <di:waypoint xsi:type="dc:Point" x="1550" y="31" />
+        <di:waypoint xsi:type="dc:Point" x="1648" y="31" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1524" y="42" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1laeenc_di" bpmnElement="SequenceFlow_1laeenc">
+        <di:waypoint xsi:type="dc:Point" x="1550" y="127" />
+        <di:waypoint xsi:type="dc:Point" x="1550" y="161" />
+        <di:waypoint xsi:type="dc:Point" x="1648" y="161" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1523" y="135" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0xl033m_di" bpmnElement="SequenceFlow_0xl033m">
+        <di:waypoint xsi:type="dc:Point" x="1748" y="161" />
+        <di:waypoint xsi:type="dc:Point" x="1828" y="161" />
+        <di:waypoint xsi:type="dc:Point" x="1828" y="102" />
+        <di:waypoint xsi:type="dc:Point" x="1854" y="102" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1843" y="131.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfraTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfraTest.groovy
deleted file mode 100644
index a90cf12..0000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateNetworkInstanceInfraTest.groovy
+++ /dev/null
@@ -1,3055 +0,0 @@
-/*- 

- * ============LICENSE_START======================================================= 

- * OPENECOMP - MSO 

- * ================================================================================ 

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

- * ================================================================================ 

- * Licensed under the Apache License, Version 2.0 (the "License"); 

- * you may not use this file except in compliance with the License. 

- * You may obtain a copy of the License at 

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0 

- * 

- * Unless required by applicable law or agreed to in writing, software 

- * distributed under the License is distributed on an "AS IS" BASIS, 

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

- * See the License for the specific language governing permissions and 

- * limitations under the License. 

- * ============LICENSE_END========================================================= 

- */ 

-

-package org.openecomp.mso.bpmn.infrastructure.scripts;

-

-import static org.junit.Assert.*

-import static org.mockito.Mockito.*

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetCloudRegion

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetwork

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutNetwork

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetworkPolicy

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetworkRouteTable

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetworkVpnBinding

-

-import org.apache.commons.lang3.*

-import org.camunda.bpm.engine.ProcessEngineServices

-import org.camunda.bpm.engine.RepositoryService

-import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity

-import org.camunda.bpm.engine.repository.ProcessDefinition

-import org.camunda.bpm.engine.runtime.Execution

-import org.junit.Before

-import org.junit.Ignore;

-import org.junit.Rule

-import org.junit.Test

-import org.junit.runner.RunWith

-import org.mockito.ArgumentCaptor

-import org.mockito.MockitoAnnotations

-import org.mockito.runners.MockitoJUnitRunner

-import org.openecomp.mso.bpmn.common.scripts.MsoUtils

-import org.openecomp.mso.bpmn.core.WorkflowException

-

-import com.github.tomakehurst.wiremock.client.WireMock

-import com.github.tomakehurst.wiremock.junit.WireMockRule

-

-

-@RunWith(MockitoJUnitRunner.class)

-class UpdateNetworkInstanceInfraTest  {

-	

-	@Rule

-	public WireMockRule wireMockRule = new WireMockRule(28090);

-	

-		def utils = new MsoUtils()

-

-		String jsonIncomingRequest =

-		"""{ "requestDetails": {

-	      "modelInfo": {

-			"modelType": "networkTyp",

-  			"modelId": "modelId",

-  			"modelNameVersionId": "modelNameVersionId",

-  			"modelName": "CONTRAIL_EXTERNAL",

-  			"modelVersion": "1"

-		  },

-		  "cloudConfiguration": {

-  			"lcpCloudRegionId": "RDM2WAGPLCP",

-  			"tenantId": "7dd5365547234ee8937416c65507d266"

-		  },

-		  "requestInfo": {

-  			"instanceName": "MNS-25180-L-01-dmz_direct_net_1",

-  			"source": "VID",

-  			"callbackUrl": "",

-            "suppressRollback": true,

-	        "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"

-		  },

-		  "relatedInstanceList": [ 

-		  	{  

-    	  		"relatedInstance": {

-       				"instanceId": "f70e927b-6087-4974-9ef8-c5e4d5847ca4",

-       				"modelInfo": {   

-          				"modelType": "serviceT",

-          				"modelId": "modelI",

-          				"modelNameVersionId": "modelNameVersionI",

-          				"modelName": "modleNam",

-          				"modelVersion": "1"

-       	  			}

-        		}

-     		}

-		  ],

-		  "requestParameters": {

-  			"userParams": [	

-               {

-				 "name": "someUserParam1",

-				 "value": "someValue1"

-			   }

-            ]

-		  }

-  }}"""		

-  	

-		  String jsonIncomingRequest_Missingname =

-		"""{ "requestDetails": {

-	      "modelInfo": {

-			"modelType": "networkTyp",

-  			"modelId": "modelId",

-  			"modelNameVersionId": "modelNameVersionId",

-  			"modelName": "CONTRAIL_EXTERNAL",

-  			"modelVersion": "1"

-		  },

-		  "cloudConfiguration": {

-  			"lcpCloudRegionId": "RDM2WAGPLCP",

-  			"tenantId": "7dd5365547234ee8937416c65507d266"

-		  },

-		  "requestInfo": {

-  			"source": "VID",

-  			"callbackUrl": "",

-            "suppressRollback": true,

-	        "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"

-		  },

-		  "relatedInstanceList": [ 

-		  	{  

-    	  		"relatedInstance": {

-       				"instanceId": "f70e927b-6087-4974-9ef8-c5e4d5847ca4",

-       				"modelInfo": {   

-          				"modelType": "serviceT",

-          				"modelId": "modelI",

-          				"modelNameVersionId": "modelNameVersionI",

-          				"modelName": "modleNam",

-          				"modelVersion": "1"

-       	  			}

-        		}

-     		}

-		  ],

-		  "requestParameters": {

-  			"userParams": []

-		  }

-  }}"""		

-		  

-		  String jsonIncomingRequest_MissingCloudRegion =

-		"""{ "requestDetails": {

-	      "modelInfo": {

-			"modelType": "networkTyp",

-  			"modelId": "modelId",

-  			"modelNameVersionId": "modelNameVersionId",

-  			"modelName": "CONTRAIL_EXTERNAL",

-  			"modelVersion": "1"

-		  },

-		  "cloudConfiguration": {

-  			"tenantId": "7dd5365547234ee8937416c65507d266"

-		  },

-		  "requestInfo": {

-  			"instanceName": "MNS-25180-L-01-dmz_direct_net_1",

-  			"source": "VID",

-  			"callbackUrl": "",

-            "suppressRollback": true,

-	        "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"

-		  },

-		  "relatedInstanceList": [ 

-		  	{  

-    	  		"relatedInstance": {

-       				"instanceId": "f70e927b-6087-4974-9ef8-c5e4d5847ca4",

-       				"modelInfo": {   

-          				"modelType": "serviceT",

-          				"modelId": "modelI",

-          				"modelNameVersionId": "modelNameVersionI",

-          				"modelName": "modleNam",

-          				"modelVersion": "1"

-       	  			}

-        		}

-     		}

-		  ],

-		  "requestParameters": {

-  			"userParams": []

-		  }

-  }}"""		

-		

-		

-

-   String expectedNetworkRequestMissingNetworkId =

-   """<network-request xmlns="http://www.w3.org/2001/XMLSchema">  

-   <request-info>             

-      <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id> 

-      <action>UPDATE</action>  

-      <source>VID</source>  

-      <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id> 

-   </request-info>  

-   <network-inputs>  

-      <network-id/>  

-      <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>  

-      <network-type>CONTRAIL_EXTERNAL</network-type> 

-      <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>  

-      <tenant-id>7dd5365547234ee8937416c65507d266</tenant-id> 

-      <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>  

-      <backout-on-failure>true</backout-on-failure> 

-   </network-inputs>  

-   <network-params>

-      <param name="some_user_param1">someValue1</param> 

-   </network-params> 

-</network-request>

-"""

-

-  

-String expectedNetworkRequestMissingCloudRegion =

-"""<network-request xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-   <request-info>

-      <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>

-      <action>UPDATE</action>

-      <source>PORTAL</source>

-   </request-info>

-   <network-inputs>

-      <network-name>HSL_direct_net_2</network-name>

-      <network-type>CONTRAIL_EXTERNAL</network-type>

-      <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-      <aic-cloud-region/>

-      <tenant-id>e81d842d3e8b45c5a59f57cd76af3aaf</tenant-id>

-   </network-inputs>

-   <network-params>

-      <param name="shared">1</param>

-   </network-params>

-</network-request>"""

-

-		// vnfRESTRequest

-		String networkRESTRequest =

-"""<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-					xmlns:vnfreq="http://org.openecomp/mso/infra/vnf-request/v1"

-					statusCode="200">

-	<rest:payload contentType="text/xml">

-	   <vnfreq:network-request>

-		  <vnfreq:request-info>

-			 <vnfreq:request-id>1ef47428-cade-45bd-a103-0751e8b2deb0</vnfreq:request-id>

-			 <vnfreq:action>UPDATE</vnfreq:action>

-			 <vnfreq:source>PORTAL</vnfreq:source>

-		  </vnfreq:request-info>

-		  <vnfreq:network-inputs>

-			 <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-			 <vnfreq:network-type>CONTRAIL_EXTERNAL</vnfreq:network-type>

-			 <vnfreq:service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</vnfreq:service-id>

-			 <vnfreq:aic-cloud-region>RDM2WAGPLCP</vnfreq:aic-cloud-region>

-			 <vnfreq:tenant-id>7dd5365547234ee8937416c65507d266</vnfreq:tenant-id>

-			 <vnfreq:physicalNetworkName>dvs-slcp3-01</vnfreq:physicalNetworkName>

-			 <vnfreq:vlans>3008</vnfreq:vlans>

-		  </vnfreq:network-inputs>

-		  <vnfreq:network-params>

-			 <param name="shared">1</param>

-			 <param name="external">0</param>

-		  </vnfreq:network-params>

-	   </vnfreq:network-request>

-	</rest:payload>

- </rest:RESTResponse>"""

-

-	String networkInputsMissingName =

- """<network-inputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-	<network-name/>

-	<network-type>CONTRAIL_EXTERNAL</network-type>

-	<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-	<aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>

-	<tenant-id>e81d842d3e8b45c5a59f57cd76af3aaf</tenant-id>

- </network-inputs>"""

-

-String networkInputsMissingCloudRegion =

-"""<network-inputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-   <network-name>HSL_direct_net_2</network-name>

-   <network-type>CONTRAIL_EXTERNAL</network-type>

-   <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-   <aic-cloud-region/>

-   <tenant-id>e81d842d3e8b45c5a59f57cd76af3aaf</tenant-id>

-</network-inputs>"""

-   

-	String expectedUpdateNetworkInstanceInfraRequest =

-	"""<rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-              xmlns:vnfreq="http://org.openecomp/mso/infra/vnf-request/v1"

-              contentType="text/xml">

-   <vnfreq:network-request>

-      <vnfreq:request-info>

-         <vnfreq:request-id>1ef47428-cade-45bd-a103-0751e8b2deb0</vnfreq:request-id>

-         <vnfreq:action>UPDATE</vnfreq:action>

-         <vnfreq:source>PORTAL</vnfreq:source>

-      </vnfreq:request-info>

-      <vnfreq:network-inputs>

-         <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-         <vnfreq:network-type>CONTRAIL_EXTERNAL</vnfreq:network-type>

-         <vnfreq:service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</vnfreq:service-id>

-         <vnfreq:aic-cloud-region>RDM2WAGPLCP</vnfreq:aic-cloud-region>

-         <vnfreq:tenant-id>7dd5365547234ee8937416c65507d266</vnfreq:tenant-id>

-         <vnfreq:physicalNetworkName>dvs-slcp3-01</vnfreq:physicalNetworkName>

-         <vnfreq:vlans>3008</vnfreq:vlans>

-      </vnfreq:network-inputs>

-      <vnfreq:network-params>

-         <param name="shared">1</param>

-         <param name="external">0</param>

-      </vnfreq:network-params>

-   </vnfreq:network-request>

-</rest:payload>"""

-  

-	  String expectedUpdateNetworkInstanceInfraRequest_Output =

-  """<rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-              xmlns:vnfreq="http://org.openecomp/mso/infra/vnf-request/v1"

-              contentType="text/xml">

-   <vnfreq:network-request>

-      <vnfreq:request-info>

-         <vnfreq:request-id>1ef47428-cade-45bd-a103-0751e8b2deb0</vnfreq:request-id>

-         <vnfreq:action>UPDATE</vnfreq:action>

-         <vnfreq:source>PORTAL</vnfreq:source>

-      </vnfreq:request-info>

-      <vnfreq:network-inputs>

-         <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-         <vnfreq:network-type>CONTRAIL_EXTERNAL</vnfreq:network-type>

-         <vnfreq:service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</vnfreq:service-id>

-         <vnfreq:aic-cloud-region>RDM2WAGPLCP</vnfreq:aic-cloud-region>

-         <vnfreq:tenant-id>7dd5365547234ee8937416c65507d266</vnfreq:tenant-id>

-      </vnfreq:network-inputs>

-      <vnfreq:network-outputs>

-         <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-         <vnfreq:network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</vnfreq:network-id>

-      </vnfreq:network-outputs>

-      <vnfreq:network-params>

-         <param name="shared">1</param>

-         <param name="external">0</param>

-      </vnfreq:network-params>

-   </vnfreq:network-request>

-</rest:payload>"""

-	

-	  // expectedNetworkRequest

-	  String expectedNetworkRequest =

-  """<network-request xmlns="http://www.w3.org/2001/XMLSchema">  

-   <request-info>  

-      <action>UPDATE</action>  

-      <source>VID</source>  

-      <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id> 

-   </request-info>  

-   <network-inputs>  

-      <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>  

-      <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>  

-      <network-type>CONTRAIL_EXTERNAL</network-type> 

-      <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>  

-      <tenant-id>7dd5365547234ee8937416c65507d266</tenant-id> 

-      <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>  

-      <backout-on-failure>true</backout-on-failure> 

-   </network-inputs>

-   <network-params>

-      <param name="dhcp-enabled">true</param>

-      <param name="serviceId">a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</param>

-      <param name="cidr-mask">true</param>

-  	  <param name="backoutOnFailure">true</param>

-  	  <param name="gateway-address">10.10.125.1</param>

-   </network-params>   

-</network-request>"""

-  

-String expectedNetworkInputs =

-"""<network-inputs xmlns="http://www.w3.org/2001/XMLSchema">

-   <network-id/>

-   <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-   <network-type>CONTRAIL_EXTERNAL</network-type>

-   <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>

-   <tenant-id>7dd5365547234ee8937416c65507d266</tenant-id>

-   <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-   <backout-on-failure>true</backout-on-failure>

-</network-inputs>"""

-

- 

-  String NetworkRequest_noPhysicalName =

-  """<vnfreq:network-request xmlns:vnfreq="http://org.openecomp/mso/infra/vnf-request/v1">

-   <vnfreq:request-info>

-      <vnfreq:request-id>1ef47428-cade-45bd-a103-0751e8b2deb0</vnfreq:request-id>

-      <vnfreq:action>UPDATE</vnfreq:action>

-      <vnfreq:source>PORTAL</vnfreq:source>

-   </vnfreq:request-info>

-   <vnfreq:network-inputs>

-      <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-      <vnfreq:network-type>CONTRAIL_EXTERNAL</vnfreq:network-type>

-      <vnfreq:service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</vnfreq:service-id>

-      <vnfreq:aic-cloud-region>RDM2WAGPLCP</vnfreq:aic-cloud-region>

-      <vnfreq:tenant-id>7dd5365547234ee8937416c65507d266</vnfreq:tenant-id>

-      <vnfreq:vlans>3008</vnfreq:vlans>

-   </vnfreq:network-inputs>

-   <vnfreq:network-params>

-   <network-params>

-      <param name="dhcp-enabled">true</param>

-      <param name="serviceId">a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</param>

-      <param name="cidr-mask">true</param>

-  	  <param name="backoutOnFailure">true</param>

-  	  <param name="gateway-address">10.10.125.1</param>

-   </network-params> 

-   </vnfreq:network-params>

-</vnfreq:network-request>"""

-  

-  String vnfRequestFakeRegion =

-  """<vnfreq:network-request xmlns:vnfreq="http://org.openecomp/mso/infra/vnf-request/v1">

-   <vnfreq:request-info>

-      <vnfreq:request-id>1ef47428-cade-45bd-a103-0751e8b2deb0</vnfreq:request-id>

-      <vnfreq:action>UPDATE</vnfreq:action>

-      <vnfreq:source>PORTAL</vnfreq:source>

-   </vnfreq:request-info>

-   <vnfreq:network-inputs>

-      <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-      <vnfreq:network-type>CONTRAIL_EXTERNAL</vnfreq:network-type>

-      <vnfreq:service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</vnfreq:service-id>

-      <vnfreq:aic-cloud-region>MDTWNJ21</vnfreq:aic-cloud-region>

-      <vnfreq:tenant-id>7dd5365547234ee8937416c65507d266</vnfreq:tenant-id>

-   </vnfreq:network-inputs>

-   <vnfreq:network-params>

-      <param name="shared">1</param>

-      <param name="external">0</param>

-   </vnfreq:network-params>

-</vnfreq:network-request>"""

-  

-  // expectedNetworkRequest

-	  String expectedNetworkRequest_Outputs =

-  """<vnfreq:network-request xmlns:vnfreq="http://org.openecomp/mso/infra/vnf-request/v1">

-   <vnfreq:request-info>

-      <vnfreq:request-id>1ef47428-cade-45bd-a103-0751e8b2deb0</vnfreq:request-id>

-      <vnfreq:action>UPDATE</vnfreq:action>

-      <vnfreq:source>PORTAL</vnfreq:source>

-   </vnfreq:request-info>

-   <vnfreq:network-inputs>

-      <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-      <vnfreq:network-type>CONTRAIL_EXTERNAL</vnfreq:network-type>

-      <vnfreq:service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</vnfreq:service-id>

-      <vnfreq:aic-cloud-region>RDM2WAGPLCP</vnfreq:aic-cloud-region>

-      <vnfreq:tenant-id>7dd5365547234ee8937416c65507d266</vnfreq:tenant-id>

-   </vnfreq:network-inputs>

-   <vnfreq:network-outputs>

-      <vnfreq:network-name>MNS-25180-L-01-dmz_direct_net_1</vnfreq:network-name>

-      <vnfreq:network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</vnfreq:network-id>

-   </vnfreq:network-outputs>

-   <vnfreq:network-params>

-      <param name="shared">1</param>

-      <param name="external">0</param>

-   </vnfreq:network-params>

-</vnfreq:network-request>"""

-  

-		  

-  // expectedNetworkRequest

-		  String networkInputs_404 =

-		  """<network-inputs  xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-		      <network-name>myOwn_Network</network-name>

-		      <network-type>CONTRAIL_EXTERNAL</network-type>

-		      <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-		      <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>

-		      <tenant-id>e81d842d3e8b45c5a59f57cd76af3aaf</tenant-id>

-		   </network-inputs>"""

-  

-  String networkInputs =

-  """<network-inputs xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-   <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>

-   <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-   <network-type>CONTRAIL_EXTERNAL</network-type>

-   <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-   <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>

-   <tenant-id>e81d842d3e8b45c5a59f57cd76af3aaf</tenant-id>

-</network-inputs>"""

-  

-	  String networkOutputs =

-	"""<network-outputs>

-                   <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>			

-                   <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-                 </network-outputs>"""

-

-	  String queryAAIResponse =

-		  """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <l3-network xmlns="http://org.openecomp.aai.inventory/v3">

-         <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>

-         <network-name>HSL_direct_net_2</network-name>

-         <network-type>CONTRAIL_EXTERNAL</network-type>

-         <network-role>dmz_direct</network-role>

-         <network-technology>contrail</network-technology>

-         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-         <network-role-instance>0</network-role-instance>

-         <orchestration-status>pending-delete</orchestration-status>

-         <subnets>

-            <subnet>

-               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-               <gateway-address>107.239.52.1</gateway-address>

-               <network-start-address>107.239.52.0</network-start-address>

-               <cidr-mask>24</cidr-mask>

-               <ip-version>4</ip-version>

-               <orchestration-status>pending-delete</orchestration-status>

-               <dhcp-enabled>true</dhcp-enabled>

-               <relationship-list/>

-            </subnet>

-         </subnets>

-         <relationship-list>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>tenant</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

-               </relationship-data>

-            </relationship>

-         </relationship-list>

-      </l3-network>

-   </rest:payload>

-</rest:RESTResponse>"""

-  

-	  String queryIdAIIResponse =

-	  """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <l3-network xmlns="http://org.openecomp.aai.inventory/v6">

-         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-         <network-type>CONTRAIL_EXTERNAL</network-type>

-         <network-role>dmz_direct</network-role>

-         <network-technology>contrail</network-technology>

-         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-         <network-role-instance>0</network-role-instance>

-		 <resource-version>l3-version</resource-version>

-         <orchestration-status>pending-delete</orchestration-status>

-	     <heat-stack-id>ST_2Bindings_6006/55288ef0-595c-47d3-819e-cf93aaac6326</heat-stack-id>

-	  	 <physical-network-name>networkName</physical-network-name>

-	     <is-provider-network>false</is-provider-network>

-	  	 <is-shared-network>true</is-shared-network>

-	  	 <is-external-network>false</is-external-network>

-         <subnets>

-            <subnet>

-               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-               <gateway-address>107.239.52.1</gateway-address>

-               <network-start-address>107.239.52.0</network-start-address>

-               <cidr-mask>24</cidr-mask>

-               <ip-version>4</ip-version>

-               <orchestration-status>pending-delete</orchestration-status>

-               <dhcp-enabled>true</dhcp-enabled>

-	  		   <subnet-name>subnetName</subnet-name>

-               <relationship-list/>

-            </subnet>

-            <subnet>

-               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-               <gateway-address>107.239.52.1</gateway-address>

-               <network-start-address>107.239.52.0</network-start-address>

-               <cidr-mask>24</cidr-mask>

-               <ip-version>4</ip-version>

-               <orchestration-status>pending-delete</orchestration-status>

-               <dhcp-enabled>true</dhcp-enabled>

-	  		   <subnet-name>subnetName</subnet-name>

-               <relationship-list/>

-            </subnet>

-         </subnets>

-	  	 <segmentation-assignments>

-	  		<segmentation-id>414</segmentation-id>

-	  		<resource-version>4132176</resource-version>

-	  	 </segmentation-assignments>	

-	  	 <segmentation-assignments>

-	  		<segmentation-id>415</segmentation-id>

-	  		<resource-version>4132176</resource-version>

-	  	 </segmentation-assignments>	

-		 <ctag-assignments>	

-			 <ctag-assignment>	

-				 <vlan-id-inner>inner</vlan-id-inner>	

-				 <resource-version>ctag-version</resource-version>	  

-	             <relationship-list>

-					<relationship>

-					   <related-to>tenant</related-to>

-					   <related-link>https://aai-ext1.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>

-					   <relationship-data>

-						  <relationship-key>tenant.tenant-id</relationship-key>

-						  <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>

-					   </relationship-data>

-					   <related-to-property>

-						  <property-key>tenant.tenant-name</property-key>

-						  <property-value>MSOTest1</property-value>

-					   </related-to-property>

-					</relationship>

-					<relationship>

-					   <related-to>vpn-binding</related-to>

-					   <related-link>https://aai-ext1.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/a290b841-f672-44dd-b9cd-6f8c20d7d8c8/</related-link>

-					   <relationship-data>

-						  <relationship-key>vpn-binding.vpn-id</relationship-key>

-						  <relationship-value>a290b841-f672-44dd-b9cd-6f8c20d7d8c8</relationship-value>

-					   </relationship-data>

-					   <related-to-property>

-						  <property-key>vpn-binding.vpn-name</property-key>

-						  <property-value>oam_protected_net_6_MTN5_msotest2</property-value>

-					   </related-to-property>

-					</relationship>

-					<relationship>

-					   <related-to>vpn-binding</related-to>

-					   <related-link>https://aai-ext1.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/24a4b507-853a-4a38-99aa-05fcc54be24d/</related-link>

-					   <relationship-data>

-						  <relationship-key>vpn-binding.vpn-id</relationship-key>

-						  <relationship-value>24a4b507-853a-4a38-99aa-05fcc54be24d</relationship-value>

-					   </relationship-data>

-					   <related-to-property>

-						  <property-key>vpn-binding.vpn-name</property-key>

-						  <property-value>oam_protected_net_6_MTN5_msotest1</property-value>

-					   </related-to-property>

-					</relationship>

-				 </relationship-list>  

-				</ctag-assignment>	

-		 </ctag-assignments>

-         <relationship-list>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>tenant</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

-               </relationship-data>

-            </relationship>

-			<relationship>

-			  <related-to>network-policy</related-to>

-			  <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>

-			  <relationship-data>

-				  <relationship-key>network-policy.network-policy-id</relationship-key>

-				  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>

-			  </relationship-data>

-			</relationship>

-			<relationship>

-			   <related-to>route-table-reference</related-to>

-	  	       <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN1</related-link>

-			   <relationship-data>

-				  <relationship-key>route-table-reference.route-table-reference-id</relationship-key>

-				  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>

-			   </relationship-data>

-			</relationship>

-			<relationship>

-			   <related-to>route-table-reference</related-to>

-	  	       <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN2</related-link>

-			   <relationship-data>

-				  <relationship-key>route-table-reference.route-table-reference-id</relationship-key>

-				  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>

-			   </relationship-data>

-			</relationship>

-         </relationship-list>

-      </l3-network>

-   </rest:payload>

-</rest:RESTResponse>"""

-  

-	  String queryIdAIIResponseTestScenario01 =

-  """<?xml version="1.0" encoding="UTF-8"?>

-<l3-network xmlns="http://org.openecomp.aai.inventory/v7">

-	<network-id>4da55fe4-7a9e-478c-a434-8a98d62265ab</network-id>

-	<network-name>GN_EVPN_direct_net_0_ST1</network-name>

-	<network-type>CONTRAIL30_BASIC</network-type>

-	<network-role>GN_EVPN_direct</network-role>

-	<network-technology>contrail</network-technology>

-	<is-bound-to-vpn>false</is-bound-to-vpn>

-	<service-id>9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-	<network-role-instance>0</network-role-instance>

-	<resource-version>1465398611</resource-version>

-	<orchestration-status>pending-delete</orchestration-status>

-  	<physical-network-name>networkName</physical-network-name>

-	<is-provider-network>false</is-provider-network>

-	<is-shared-network>true</is-shared-network>

-	<is-external-network>false</is-external-network>

-	<subnets>

-		<subnet>

-			<subnet-id>cb1a7b47-5428-44c9-89c2-8b17541c3228</subnet-id>

-			<gateway-address>108.239.40.1</gateway-address>

-			<network-start-address>108.239.40.0</network-start-address>

-			<cidr-mask>28</cidr-mask>

-			<ip-version>4</ip-version>

-			<orchestration-status>pending-delete</orchestration-status>

-			<dhcp-enabled>true</dhcp-enabled>

-			<dhcp-start>108.239.40.0</dhcp-start>

-			<dhcp-end>108.239.40.0</dhcp-end>

-			<resource-version>1465398611</resource-version>

-  		    <subnet-name>subnetName</subnet-name>

-			<relationship-list />

-		</subnet>

-		<subnet>

-			<subnet-id>e2cc7c14-90f0-4205-840d-b4e07f04e621</subnet-id>

-			<gateway-address>2606:ae00:2e01:604::1</gateway-address>

-			<network-start-address>2606:ae00:2e01:604::</network-start-address>

-			<cidr-mask>64</cidr-mask>

-			<ip-version>6</ip-version>

-			<orchestration-status>pending-delete</orchestration-status>

-			<dhcp-enabled>true</dhcp-enabled>

-			<dhcp-start>2606:ae00:2e01:604::</dhcp-start>

-			<dhcp-end>2606:ae00:2e01:604::</dhcp-end>

-			<resource-version>1465398611</resource-version>

-  			<subnet-name>subnetName</subnet-name>

-			<relationship-list />

-		</subnet>

-	</subnets>

-	<ctag-assignments />

-	<segmentation-assignments>

-	   	<segmentation-id>416</segmentation-id>

-	  	<resource-version>4132176</resource-version>

-	</segmentation-assignments>

-	<relationship-list>

-		<relationship>

-			<related-to>cloud-region</related-to>

-			<related-link>https://mtanjv9aaas03.aic.cip.com:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/

-			</related-link>

-			<relationship-data>

-				<relationship-key>cloud-region.cloud-region-id</relationship-key>

-				<relationship-value>AAIAIC25</relationship-value>

-			</relationship-data>

-			<relationship-data>

-				<relationship-key>cloud-region.cloud-owner</relationship-key>

-				<relationship-value>att-aic</relationship-value>

-			</relationship-data>

-			<related-to-property>

-				<property-key>cloud-region.owner-defined-type</property-key>

-				<property-value></property-value>

-			</related-to-property>

-		</relationship>

-		<relationship>

-			<related-to>tenant</related-to>

-			<related-link>https://mtanjv9aaas03.aic.cip.com:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/4ae1d3446a4c48b2bec44b6cfba06d68/</related-link>

-			<relationship-data>

-				<relationship-key>tenant.tenant-id</relationship-key>

-				<relationship-value>4ae1d3446a4c48b2bec44b6cfba06d68

-				</relationship-value>

-			</relationship-data>

-			<relationship-data>

-				<relationship-key>cloud-region.cloud-owner</relationship-key>

-				<relationship-value>att-aic</relationship-value>

-			</relationship-data>

-			<relationship-data>

-				<relationship-key>cloud-region.cloud-region-id</relationship-key>

-				<relationship-value>AAIAIC25</relationship-value>

-			</relationship-data>

-			<related-to-property>

-				<property-key>tenant.tenant-name</property-key>

-				<property-value>Ruchira Contrail 3.0 test</property-value>

-			</related-to-property>

-		</relationship>

-		<relationship>

-			<related-to>vpn-binding</related-to>

-			<related-link>https://mtanjv9aaas03.aic.cip.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

-			<relationship-data>

-				<relationship-key>vpn-binding.vpn-id</relationship-key>

-				<relationship-value>9a7b327d9-287aa00-82c4b0-100001</relationship-value>

-			</relationship-data>

-			<related-to-property>

-				<property-key>vpn-binding.vpn-name</property-key>

-				<property-value>GN_EVPN_direct_net_0_ST1</property-value>

-			</related-to-property>

-		</relationship>

-		<relationship>

-		   <related-to>route-table-reference</related-to>

-		   <relationship-data>

-			  <relationship-key>route-table-reference.route-table-reference-id</relationship-key>

-			  <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>

-		   </relationship-data>

-		</relationship>

-	</relationship-list>

-</l3-network>"""	

-  

-  String queryIdAIIResponseVpnNotPresent =

-  """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <l3-network xmlns="http://org.openecomp.aai.inventory/v6">

-         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-         <network-type>CONTRAIL_EXTERNAL</network-type>

-         <network-role>dmz_direct</network-role>

-         <network-technology>contrail</network-technology>

-         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-         <network-role-instance>0</network-role-instance>

-         <orchestration-status>pending-delete</orchestration-status>

-	  	 <physical-network-name>networkName</physical-network-name>

-	     <is-provider-network>false</is-provider-network>

-	  	 <is-shared-network>true</is-shared-network>

-	  	 <is-external-network>false</is-external-network>

-         <subnets>

-            <subnet>

-               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-               <gateway-address>107.239.52.1</gateway-address>

-               <network-start-address>107.239.52.0</network-start-address>

-               <cidr-mask>24</cidr-mask>

-               <ip-version>4</ip-version>

-               <orchestration-status>pending-delete</orchestration-status>

-               <dhcp-enabled>true</dhcp-enabled>

-  			   <subnet-name>subnetName</subnet-name>

-               <relationship-list/>

-            </subnet>

-         </subnets>

-         <relationship-list/>

-      </l3-network>

-   </rest:payload>

-</rest:RESTResponse>"""

-  

-	  String queryNameAIIResponse =

-		  """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-		                   statusCode="200">

-		   <rest:headers>

-		      <rest:header name="Transfer-Encoding" value="chunked"/>

-		      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>

-		      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-		      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>

-		      <rest:header name="Content-Type" value="application/xml"/>

-		      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-		      <rest:header name="Cache-Control" value="private"/>

-		   </rest:headers>

-		   <rest:payload contentType="text/xml">

-		      <l3-network xmlns="http://org.openecomp.aai.inventory/v6">

-		         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-		         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-		         <network-type>CONTRAIL_EXTERNAL</network-type>

-		         <network-role>dmz_direct</network-role>

-		         <network-technology>contrail</network-technology>

-		         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-		         <network-role-instance>0</network-role-instance>

-		         <orchestration-status>pending-delete</orchestration-status>

-		         <subnets>

-		            <subnet>

-		               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-		               <gateway-address>107.239.52.1</gateway-address>

-		               <network-start-address>107.239.52.0</network-start-address>

-		               <cidr-mask>24</cidr-mask>

-		               <ip-version>4</ip-version>

-		               <orchestration-status>pending-delete</orchestration-status>

-		               <dhcp-enabled>true</dhcp-enabled>

-		               <relationship-list/>

-		            </subnet>

-		         </subnets>

-		         <relationship-list>

-		            <relationship>

-		               <related-to>vpn-binding</related-to>

-		               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

-		               <relationship-data>

-		                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-		                  <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>

-		               </relationship-data>

-		            </relationship>

-		            <relationship>

-		               <related-to>vpn-binding</related-to>

-		               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>

-		               <relationship-data>

-		                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-		                  <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>

-		               </relationship-data>

-		            </relationship>

-		            <relationship>

-		               <related-to>tenant</related-to>

-		               <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

-		               <relationship-data>

-		                  <relationship-key>tenant.tenant-id</relationship-key>

-		                  <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

-		               </relationship-data>

-		            </relationship>

-		         </relationship-list>

-		      </l3-network>

-		   </rest:payload>

-		</rest:RESTResponse>"""

-  

-		  String queryNameAIIResponseVpnNotPresent =

-		  """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-		                   statusCode="200">

-		   <rest:headers>

-		      <rest:header name="Transfer-Encoding" value="chunked"/>

-		      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>

-		      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-		      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:502-132671"/>

-		      <rest:header name="Content-Type" value="application/xml"/>

-		      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-		      <rest:header name="Cache-Control" value="private"/>

-		   </rest:headers>

-		   <rest:payload contentType="text/xml">

-		      <l3-network xmlns="http://org.openecomp.aai.inventory/v6>

-		         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-		         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-		         <network-type>CONTRAIL_EXTERNAL</network-type>

-		         <network-role>dmz_direct</network-role>

-		         <network-technology>contrail</network-technology>

-		         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-		         <network-role-instance>0</network-role-instance>

-		         <orchestration-status>pending-delete</orchestration-status>

-		         <subnets>

-		            <subnet>

-		               <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-		               <gateway-address>107.239.52.1</gateway-address>

-		               <network-start-address>107.239.52.0</network-start-address>

-		               <cidr-mask>24</cidr-mask>

-		               <ip-version>4</ip-version>

-		               <orchestration-status>pending-delete</orchestration-status>

-		               <dhcp-enabled>true</dhcp-enabled>

-		               <relationship-list/>

-		            </subnet>

-		         </subnets>

-		      </l3-network>

-		   </rest:payload>

-		</rest:RESTResponse>"""

-		  

-	  String aaiVpnResponseStub =

-  """<rest:payload xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-              xmlns="http://org.openecomp.aai.inventory/v8"

-              contentType="text/xml">

-   <vpn-binding>

-      <global-route-target/>

-   </vpn-binding>

-</rest:payload>"""	

-		  

-	  String queryVpnBindingAAIResponse =

-	   """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Transfer-Encoding" value="chunked"/>

-      <rest:header name="Date" value="Mon,14 Mar 2016 20:53:33 GMT"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID"

-                   value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160314-20:53:33:487-134392"/>

-      <rest:header name="Content-Type" value="application/xml"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-   <rest:payload contentType="text/xml">

-      <vpn-binding xmlns="http://org.openecomp.aai.inventory/v6">

-         <vpn-id>9a7b327d9-287aa00-82c4b0-105757</vpn-id>

-         <vpn-name>GN_EVPN_Test</vpn-name>

-         <global-route-target>13979:105757</global-route-target>

-         <relationship-list>

-            <relationship>

-               <related-to>l3-network</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/689ec39e-c5fc-4462-8db2-4f760763ad28/</related-link>

-               <relationship-data>

-                  <relationship-key>l3-network.network-id</relationship-key>

-                  <relationship-value>689ec39e-c5fc-4462-8db2-4f760763ad28</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>l3-network</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/1a49396b-19b3-40a4-8792-aa2fbd0f0704/</related-link>

-               <relationship-data>

-                  <relationship-key>l3-network.network-id</relationship-key>

-                  <relationship-value>1a49396b-19b3-40a4-8792-aa2fbd0f0704</relationship-value>

-               </relationship-data>

-            </relationship>

-            <relationship>

-               <related-to>l3-network</related-to>

-               <related-link>https://aai-app-e2e.test.com:8443/aai/v3/network/l3-networks/l3-network/774f3329-3c83-4771-86c7-9e6207cd50fd/</related-link>

-               <relationship-data>

-                  <relationship-key>l3-network.network-id</relationship-key>

-                  <relationship-value>774f3329-3c83-4771-86c7-9e6207cd50fd</relationship-value>

-               </relationship-data>

-            </relationship>

-         </relationship-list>

-      </vpn-binding>

-   </rest:payload>

-</rest:RESTResponse>"""

-  

-	   String updateDBRequest_Active =

-	   """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"

-                  xmlns:ns="http://org.openecomp.mso/requestsdb">

-   <soapenv:Header/>

-   <soapenv:Body>

-      <ns:updateInfraRequest>

-         <requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>

-         <lastModifiedBy>BPMN</lastModifiedBy>

-         <statusMessage>Network MNS-25180-L-01-dmz_direct_net_1 already exists. Silent success.</statusMessage>

-         <responseBody/>

-         <requestStatus>COMPLETED</requestStatus>

-         <progress>100</progress>

-         <vnfOutputs>&lt;network-id&gt;49c86598-f766-46f8-84f8-8d1c1b10f9b4&lt;/network-id&gt;&lt;network-name&gt;MNS-25180-L-01-dmz_direct_net_1&lt;/network-names&gt;</vnfOutputs>

-         <networkId>49c86598-f766-46f8-84f8-8d1c1b10f9b4</networkId>

-      </ns:updateInfraRequest>

-   </soapenv:Body>

-</soapenv:Envelope>"""

-  

-	  String updateDBRequest =

-	   """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"

-                  xmlns:ns="http://org.openecomp.mso/requestsdb">

-   <soapenv:Header/>

-   <soapenv:Body>

-      <ns:updateInfraRequest>

-         <requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>

-         <lastModifiedBy>BPMN</lastModifiedBy>

-         <statusMessage>Network successfully updated.</statusMessage>

-         <responseBody/>

-         <requestStatus>COMPLETED</requestStatus>

-         <progress>100</progress>

-         <vnfOutputs>&lt;network-id&gt;&lt;/network-id&gt;&lt;network-name&gt;&lt;/network-names&gt;</vnfOutputs>

-         <networkId/>

-      </ns:updateInfraRequest>

-   </soapenv:Body>

-</soapenv:Envelope>"""	

-  

-	  String updateDBRequestError =

-	  """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

-						<soapenv:Header/>

-						<soapenv:Body>

-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-								<requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>

-								<lastModifiedBy>BPMN</lastModifiedBy>

-								<statusMessage>Received error from SDN-C: No availability zone available</statusMessage>

-								<responseBody></responseBody>

-								<requestStatus>FAILED</requestStatus>

-								<vnfOutputs>&lt;network-id&gt;&lt;/network-id&gt;&lt;network-name&gt;&lt;/network-names&gt;</vnfOutputs>

-							</ns:updateInfraRequest>

-					   	</soapenv:Body>

-					   </soapenv:Envelope>"""

-  

-		 String updateDBRequestError01 =

-	  """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">

-						<soapenv:Header/>

-						<soapenv:Body>

-							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">

-								<requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>

-								<lastModifiedBy>BPMN</lastModifiedBy>

-								<statusMessage>Received error unexpectedly from SDN-C.</statusMessage>

-								<responseBody></responseBody>

-								<requestStatus>FAILED</requestStatus>

-								<vnfOutputs>&lt;network-id&gt;&lt;/network-id&gt;&lt;network-name&gt;&lt;/network-names&gt;</vnfOutputs>

-							</ns:updateInfraRequest>

-					   	</soapenv:Body>

-					   </soapenv:Envelope>"""

-						 

-	  String updateDBRequest_Outputs =

-  """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"

-                  xmlns:ns="http://org.openecomp.mso/requestsdb">

-   <soapenv:Header/>

-   <soapenv:Body>

-      <ns:updateInfraRequest>

-         <requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>

-         <lastModifiedBy>BPMN</lastModifiedBy>

-         <statusMessage>Network successfully updated.</statusMessage>

-         <responseBody/>

-         <requestStatus>COMPLETED</requestStatus>

-         <progress>100</progress>

-         <vnfOutputs>&lt;network-id&gt;49c86598-f766-46f8-84f8-8d1c1b10f9b4&lt;/network-id&gt;&lt;network-name&gt;MNS-25180-L-01-dmz_direct_net_1&lt;/network-names&gt;</vnfOutputs>

-         <networkId>49c86598-f766-46f8-84f8-8d1c1b10f9b4</networkId>

-      </ns:updateInfraRequest>

-   </soapenv:Body>

-</soapenv:Envelope>"""	

-  

-	  String updateNetworkRequest =

-	  """<updateNetworkRequest>

-   <cloudSiteId>RDM2WAGPLCP</cloudSiteId>

-   <tenantId>7dd5365547234ee8937416c65507d266</tenantId>

-   <networkId>49c86598-f766-46f8-84f8-8d1c1b10f9b4</networkId>

-   <networkStackId>ST_2Bindings_6006/55288ef0-595c-47d3-819e-cf93aaac6326</networkStackId>

-   <networkName>MNS-25180-L-01-dmz_direct_net_1</networkName>

-   <networkType>CONTRAIL_EXTERNAL</networkType>

-   <modelCustomizationUuid/>

-   <networkTypeVersion/>

-   <networkTechnology>CONTRAIL</networkTechnology>

-   <providerVlanNetwork>

-      <physicalNetworkName>networkName</physicalNetworkName>

-      <vlans>414,415</vlans>

-   </providerVlanNetwork>

-   <contrailNetwork>

-      <shared>true</shared>

-      <external>false</external>

-      <routeTargets>13979:105757</routeTargets>

-      <routeTargets>13979:105757</routeTargets>

-      <policyFqdns>GN_EVPN_Test</policyFqdns>

-      <routeTableFqdns>refFQDN1</routeTableFqdns>

-      <routeTableFqdns>refFQDN2</routeTableFqdns>

-   </contrailNetwork>

-   <skipAAI>true</skipAAI>

-   <backout>true</backout>

-   <failIfExists>false</failIfExists>

-   <networkParams>

-      <dhcp-enabled>true</dhcp-enabled>

-      <serviceId>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</serviceId>

-      <cidr-mask>true</cidr-mask>

-      <backoutOnFailure>true</backoutOnFailure>

-      <gateway-address>10.10.125.1</gateway-address>

-   </networkParams>

-   <msoRequest>

-      <requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>

-      <serviceInstanceId>f70e927b-6087-4974-9ef8-c5e4d5847ca4</serviceInstanceId>

-   </msoRequest>

-   <messageId>messageId_generated</messageId>

-   <notificationUrl/>

-</updateNetworkRequest>"""

-	  

-   

-  String updateNetworkRequest_noPhysicalName =

-  """<updateNetworkRequest>

-   <cloudSiteId>RDM2WAGPLCP</cloudSiteId>

-   <tenantId>7dd5365547234ee8937416c65507d266</tenantId>

-   <networkId>49c86598-f766-46f8-84f8-8d1c1b10f9b4</networkId>

-   <networkStackId>ST_2Bindings_6006/55288ef0-595c-47d3-819e-cf93aaac6326</networkStackId>

-   <networkName>MNS-25180-L-01-dmz_direct_net_1</networkName>

-   <networkType>CONTRAIL_EXTERNAL</networkType>

-   <modelCustomizationUuid/>

-   <networkTypeVersion/>

-   <networkTechnology>CONTRAIL</networkTechnology>

-   <providerVlanNetwork>

-      <physicalNetworkName>networkName</physicalNetworkName>

-      <vlans>414,415</vlans>

-   </providerVlanNetwork>

-   <contrailNetwork>

-      <shared>true</shared>

-      <external>false</external>

-      <routeTargets>13979:105757</routeTargets>

-      <routeTargets>13979:105757</routeTargets>

-      <policyFqdns>GN_EVPN_Test</policyFqdns>

-   </contrailNetwork>

-   <skipAAI>true</skipAAI>

-   <backout>true</backout>

-   <failIfExists>false</failIfExists>

-   <networkParams>

-      <dhcp-enabled>true</dhcp-enabled>

-      <serviceId>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</serviceId>

-      <cidr-mask>true</cidr-mask>

-      <backoutOnFailure>true</backoutOnFailure>

-      <gateway-address>10.10.125.1</gateway-address>

-   </networkParams>

-   <msoRequest>

-      <requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>

-      <serviceInstanceId>null</serviceInstanceId>

-   </msoRequest>

-   <messageId>messageId_generated</messageId>

-   <notificationUrl/>

-</updateNetworkRequest>"""

-  

-	  String updateNetworkResponseREST =

-  """<ns2:updateNetworkContrailResponse xmlns:ns2="http://org.openecomp.mso/network">

-	<networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>

-	<neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>

-    <networkFqdn>default-domain:MSOTest:GN_EVPN_direct_net_0_ST1</networkFqdn>

-	<networkStackId></networkStackId>

-	<subnetMap>

-		<entry>

-			<key>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</key>

-			<value>bd8e87c6-f4e2-41b8-b0bc-9596aa00cd73</value>

-		</entry>

-		<entry>

-			<key>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</key>

-			<value>bd8e87c6-f4e2-41b8-b0bc-9596aa00cd73</value>

-		</entry>

-	</subnetMap>

-	<rollback>

-		<networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>

-		<neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>

-		<networkStackId></networkStackId>

-		<networkType>CONTRAIL_EXTERNAL</networkType>

-		<networkUpdated>true</networkUpdated>

-		<tenantId>7dd5365547234ee8937416c65507d266</tenantId>

-		<cloudSiteId>RDM2WAGPLCP</cloudSiteId>

-		<msoRequest>

-			<requestId>1ef47428-cade-45bd-a103-0751e8b2deb0</requestId>

-			<serviceInstanceId></serviceInstanceId>

-		</msoRequest>

-	</rollback>

-	<messageId>messageId_generated</messageId>

-</ns2:updateNetworkContrailResponse>"""

-  

-	  String updateRollbackNetworkRequest =

-	  """<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.openecomp.mso/network">

-   <rollback>

-      <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>

-      <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>

-      <networkStackId/>

-      <networkType>CONTRAIL_EXTERNAL</networkType>

-      <networkUpdated>true</networkUpdated>

-      <tenantId>7dd5365547234ee8937416c65507d266</tenantId>

-      <cloudSiteId>RDM2WAGPLCP</cloudSiteId>

-      <msoRequest>

-         <requestId>1ef47428-cade-45bd-a103-0751e8b2deb0</requestId>

-         <serviceInstanceId/>

-      </msoRequest>

-   </rollback>

-</NetworkAdapter:rollbackNetwork>"""	

-	  

-	  String updateNetworkResponse =

-	  """<ns2:updateNetworkContrailResponse xmlns:ns2="http://org.openecomp.mso/network"

-                                    xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">

-   <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>

-   <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>

-   <networkStackId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkStackId>

-	<networkFqdn>default-domain:MSOTest:GN_EVPN_direct_net_0_ST1</networkFqdn>

-   <subnetIdMap>

-      <entry>

-         <key>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</key>

-         <value>bd8e87c6-f4e2-41b8-b0bc-9596aa00cd73</value>

-      </entry>

-   </subnetIdMap>

-   <rollback>

-      <cloudId>RDM2WAGPLCP</cloudId>

-      <msoRequest>

-         <requestId>1ef47428-cade-45bd-a103-0751e8b2deb0</requestId>

-         <serviceInstanceId/>

-      </msoRequest>

-      <networkUpdated>true</networkUpdated>

-      <networkId>MNS-25180-L-01-dmz_direct_net_1/2c88a3a9-69b9-43a7-ada6-1aca577c3641</networkId>

-      <networkType>CONTRAIL_EXTERNAL</networkType>

-      <networkUpdated>false</networkUpdated>

-      <neutronNetworkId>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutronNetworkId>

-      <tenantId>7dd5365547234ee8937416c65507d266</tenantId>

-   </rollback>

-</ns2:updateNetworkContrailResponse>"""

-  

-	  String updateContrailAAIPayloadRequest =

-  """<l3-network xmlns="http://org.openecomp.aai.inventory/v8">

-   <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-   <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-   <network-type>CONTRAIL_EXTERNAL</network-type>

-   <network-role>dmz_direct</network-role>

-   <network-technology>contrail</network-technology>

-   <neutron-network-id>c4f4e878-cde0-4b15-ae9a-bda857759cea</neutron-network-id>

-   <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-   <network-role-instance>0</network-role-instance>

-   <resource-version>l3-version</resource-version>

-   <orchestration-status>active</orchestration-status>

-   <heat-stack-id>ST_2Bindings_6006/55288ef0-595c-47d3-819e-cf93aaac6326</heat-stack-id>

-   <contrail-network-fqdn>default-domain:MSOTest:GN_EVPN_direct_net_0_ST1</contrail-network-fqdn>

-   <physical-network-name>networkName</physical-network-name>

-   <is-provider-network>false</is-provider-network>

-   <is-shared-network>true</is-shared-network>

-   <is-external-network>false</is-external-network>

-   <subnets>

-      <subnet>

-         <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-         <neutron-subnet-id>bd8e87c6-f4e2-41b8-b0bc-9596aa00cd73</neutron-subnet-id>

-         <gateway-address>107.239.52.1</gateway-address>

-         <network-start-address>107.239.52.0</network-start-address>

-         <cidr-mask>24</cidr-mask>

-         <ip-version>4</ip-version>

-         <orchestration-status>active</orchestration-status>

-         <dhcp-enabled>true</dhcp-enabled>

-         <subnet-name>subnetName</subnet-name>

-      </subnet>

-      <subnet>

-         <subnet-id>57e9a1ff-d14f-4071-a828-b19ae98eb2fc</subnet-id>

-         <neutron-subnet-id>bd8e87c6-f4e2-41b8-b0bc-9596aa00cd73</neutron-subnet-id>

-         <gateway-address>107.239.52.1</gateway-address>

-         <network-start-address>107.239.52.0</network-start-address>

-         <cidr-mask>24</cidr-mask>

-         <ip-version>4</ip-version>

-         <orchestration-status>active</orchestration-status>

-         <dhcp-enabled>true</dhcp-enabled>

-         <subnet-name>subnetName</subnet-name>

-      </subnet>

-   </subnets>

-   <segmentation-assignments>

-      <segmentation-id>414</segmentation-id>

-   </segmentation-assignments>

-   <segmentation-assignments>

-      <segmentation-id>415</segmentation-id>

-   </segmentation-assignments>

-   <ctag-assignments>

-      <ctag-assignment>

-         <vlan-id-inner>inner</vlan-id-inner>

-         <resource-version>ctag-version</resource-version>

-         <relationship-list>

-            <relationship>

-               <related-to>tenant</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/897deadc2b954a6bac6d3c197fb3525e/</related-link>

-               <relationship-data>

-                  <relationship-key>tenant.tenant-id</relationship-key>

-                  <relationship-value>897deadc2b954a6bac6d3c197fb3525e</relationship-value>

-               </relationship-data>

-               <related-to-property>

-                  <property-key>tenant.tenant-name</property-key>

-                  <property-value>MSOTest1</property-value>

-               </related-to-property>

-            </relationship>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/a290b841-f672-44dd-b9cd-6f8c20d7d8c8/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>a290b841-f672-44dd-b9cd-6f8c20d7d8c8</relationship-value>

-               </relationship-data>

-               <related-to-property>

-                  <property-key>vpn-binding.vpn-name</property-key>

-                  <property-value>oam_protected_net_6_MTN5_msotest2</property-value>

-               </related-to-property>

-            </relationship>

-            <relationship>

-               <related-to>vpn-binding</related-to>

-               <related-link>https://aai-ext1.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/24a4b507-853a-4a38-99aa-05fcc54be24d/</related-link>

-               <relationship-data>

-                  <relationship-key>vpn-binding.vpn-id</relationship-key>

-                  <relationship-value>24a4b507-853a-4a38-99aa-05fcc54be24d</relationship-value>

-               </relationship-data>

-               <related-to-property>

-                  <property-key>vpn-binding.vpn-name</property-key>

-                  <property-value>oam_protected_net_6_MTN5_msotest1</property-value>

-               </related-to-property>

-            </relationship>

-         </relationship-list>

-      </ctag-assignment>

-   </ctag-assignments>

-   <relationship-list>

-      <relationship>

-         <related-to>vpn-binding</related-to>

-         <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/</related-link>

-         <relationship-data>

-            <relationship-key>vpn-binding.vpn-id</relationship-key>

-            <relationship-value>85f015d0-2e32-4c30-96d2-87a1a27f8017</relationship-value>

-         </relationship-data>

-      </relationship>

-      <relationship>

-         <related-to>vpn-binding</related-to>

-         <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/</related-link>

-         <relationship-data>

-            <relationship-key>vpn-binding.vpn-id</relationship-key>

-            <relationship-value>c980a6ef-3b88-49f0-9751-dbad8608d0a6</relationship-value>

-         </relationship-data>

-      </relationship>

-      <relationship>

-         <related-to>tenant</related-to>

-         <related-link>https://aai-app-e2e.test.com:8443/aai/v8/cloud-infrastructure/tenants/tenant/7dd5365547234ee8937416c65507d266/</related-link>

-         <relationship-data>

-            <relationship-key>tenant.tenant-id</relationship-key>

-            <relationship-value>7dd5365547234ee8937416c65507d266</relationship-value>

-         </relationship-data>

-      </relationship>

-      <relationship>

-         <related-to>network-policy</related-to>

-         <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg</related-link>

-         <relationship-data>

-            <relationship-key>network-policy.network-policy-id</relationship-key>

-            <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0cg</relationship-value>

-         </relationship-data>

-      </relationship>

-      <relationship>

-         <related-to>route-table-reference</related-to>

-         <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN1</related-link>

-         <relationship-data>

-            <relationship-key>route-table-reference.route-table-reference-id</relationship-key>

-            <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>

-         </relationship-data>

-      </relationship>

-      <relationship>

-         <related-to>route-table-reference</related-to>

-         <related-link>https://aai-app-e2e.test.com:8443/aai/v8/network/route-table-references/route-table-reference/refFQDN2</related-link>

-         <relationship-data>

-            <relationship-key>route-table-reference.route-table-reference-id</relationship-key>

-            <relationship-value>cee6d136-e378-4678-a024-2cd15f0ee0hi</relationship-value>

-         </relationship-data>

-      </relationship>

-   </relationship-list>

-</l3-network>"""

-  

-	  String updateContrailAAIResponse =

-  """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-                   statusCode="200">

-   <rest:headers>

-      <rest:header name="Date" value="Thu,10 Mar 2016 00:01:18 GMT"/>

-      <rest:header name="Content-Length" value="0"/>

-      <rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-      <rest:header name="X-AAI-TXID" value="mtcnjv9aaas03-20160310-00:01:18:551-132672"/>

-      <rest:header name="Server" value="Apache-Coyote/1.1"/>

-      <rest:header name="Cache-Control" value="private"/>

-   </rest:headers>

-</rest:RESTResponse>"""

-	  

-	  String updateNetworkErrorResponse =

-	  """<updateNetworkError>

-		 <messageId>680bd458-5ec1-4a16-b77c-509022e53450</messageId><category>INTERNAL</category>

-		 <message>400 Bad Request: The server could not comply with the request since it is either malformed or otherwise incorrect., error.type=StackValidationFailed, error.message=Property error: : resources.network.properties: : Unknown Property network_ipam_refs_data</message>

-		 <rolledBack>true</rolledBack>

-	   </updateNetworkError>"""

-  

-			

-  String networkException500 =

-  """<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><soap:Fault><faultcode>soap:VersionMismatch</faultcode><faultstring>"http://org.openecomp.mso/network", the namespace on the "updateNetworkContrail" element, is not a valid SOAP version.</faultstring></soap:Fault></soap:Body></soap:Envelope>"""

-				  

-	String aaiResponse = 

-   """<rest:RESTResponse xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd"

-					 statusCode="200">

-	 <rest:headers>

-		<rest:header name="Transfer-Encoding" value="chunked"/>

-		<rest:header name="Date" value="Sat,30 Jan 2016 20:09:24 GMT"/>

-		<rest:header name="Expires" value="Thu,01 Jan 1970 00:00:00 UTC"/>

-		<rest:header name="X-AAI-TXID"

-					 value="mtcnjv9aaas01.mtcnj.aic.cip.com-20160130-20:09:24:814-165843"/>

-		<rest:header name="Content-Type" value="application/xml"/>

-		<rest:header name="Server" value="Apache-Coyote/1.1"/>

-		<rest:header name="Cache-Control" value="private"/>

-	 </rest:headers>

-	 <rest:payload contentType="text/xml">

-		<l3-network xmlns="http://org.openecomp.aai.inventory/v3">

-		   <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>

-		   <network-name>HSL_direct_net_2</network-name>

-		   <network-type>CONTRAIL_BASIC</network-type>

-		   <network-role>HSL_direct</network-role>

-		   <network-technology>contrail</network-technology>

-		   <neutron-network-id>8bbd3edf-b835-4610-96a2-a5cafa029042</neutron-network-id>

-		   <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-		   <orchestration-status>active</orchestration-status>

-		   <heat-stack-id>HSL_direct_net_2/57594a56-1c92-4a38-9caa-641c1fa3d4b6</heat-stack-id>

-		   <subnets>

-			  <subnet>

-				 <subnet-id>ea5f2a2c-604f-47ff-a9c5-253ee4f0ef0a</subnet-id>

-				 <neutron-subnet-id>5a77fdc2-7789-4649-a1b9-6eaf1db1813a</neutron-subnet-id>

-				 <gateway-address>172.16.34.1</gateway-address>

-				 <network-start-address>172.16.34.0</network-start-address>

-				 <cidr-mask>28</cidr-mask>

-				 <ip-version>4</ip-version>

-				 <orchestration-status>active</orchestration-status>

-				 <dhcp-enabled>true</dhcp-enabled>

-				 <relationship-list/>

-			  </subnet>

-		   </subnets>

-		   <relationship-list>

-			  <relationship>

-				 <related-to>tenant</related-to>

-				 <related-link>https://aai-app-e2e.test.com:8443/aai/v3/cloud-infrastructure/tenants/tenant/e81d842d3e8b45c5a59f57cd76af3aaf/</related-link>

-				 <relationship-data>

-					<relationship-key>tenant.tenant-id</relationship-key>

-					<relationship-value>e81d842d3e8b45c5a59f57cd76af3aaf</relationship-value>

-				 </relationship-data>

-			  </relationship>

-		   </relationship-list>

-		</l3-network>

-	 </rest:payload>

-  </rest:RESTResponse>"""

-

-	String changeAssignSDNCRequest = 

-    """<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://openecomp.com/mso/workflow/schema/v1"

-                                  xmlns:ns5="http://openecomp.com/mso/request/types/v1"

-                                  xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">

-   <sdncadapter:RequestHeader>

-      <sdncadapter:RequestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</sdncadapter:RequestId>

-      <sdncadapter:SvcInstanceId>f70e927b-6087-4974-9ef8-c5e4d5847ca4</sdncadapter:SvcInstanceId>

-      <sdncadapter:SvcAction>changeassign</sdncadapter:SvcAction>

-      <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>

-      <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>

-   </sdncadapter:RequestHeader>

-   <aetgt:SDNCRequestData>

-      <request-information>

-         <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>

-         <request-action>NetworkActivateRequest</request-action>

-         <source>VID</source>

-         <notification-url/>

-         <order-number/>

-         <order-version/>

-      </request-information>

-      <service-information>

-         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-         <service-type>MSO-dev-service-type</service-type>

-         <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

-         <subscriber-name>MSO_1610_dev</subscriber-name>

-      </service-information>

-      <network-request-information>

-         <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-         <network-type>CONTRAIL_EXTERNAL</network-type>

-         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-         <tenant>7dd5365547234ee8937416c65507d266</tenant>

-         <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>

-      </network-request-information>

-   </aetgt:SDNCRequestData>

-</aetgt:SDNCAdapterWorkflowRequest>"""

-

-String assignResponse =

-"""<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1" xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <sdncadapterworkflow:response-data> <tag0:CallbackHeader> <tag0:RequestId>006927ca-f5a3-47fd-880c-dfcbcd81a093</tag0:RequestId> <tag0:ResponseCode>200</tag0:ResponseCode> <tag0:ResponseMessage>OK</tag0:ResponseMessage> </tag0:CallbackHeader> <tag0:RequestData xsi:type="xs:string"><output xmlns="org:openecomp:sdnctltl:vnf"><response-code>200</response-code><svc-request-id>006927ca-f5a3-47fd-880c-dfcbcd81a093</svc-request-id><ack-final-indicator>Y</ack-final-indicator><service-information><subscriber-name>notsurewecare</subscriber-name><service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id><service-instance-id>GN_EVPN_direct_net_0_ST_noGW</service-instance-id></service-information><network-information><network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id></network-information></output></tag0:RequestData> </sdncadapterworkflow:response-data> </sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-			  

-  String sdncRollbackRequest =

-			  """<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://openecomp.com/mso/workflow/schema/v1"

-                                  xmlns:ns5="http://openecomp.com/mso/request/types/v1"

-                                  xmlns:sdncadapter="http://domain2.openecomp.com/workflow/sdnc/adapter/schema/v1">

-   <sdncadapter:RequestHeader>

-      <sdncadapter:RequestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</sdncadapter:RequestId>

-      <sdncadapter:SvcInstanceId>f70e927b-6087-4974-9ef8-c5e4d5847ca4</sdncadapter:SvcInstanceId>

-      <sdncadapter:SvcAction>rollback</sdncadapter:SvcAction>

-      <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>

-      <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>

-   </sdncadapter:RequestHeader>

-   <aetgt:SDNCRequestData>

-      <request-information>

-         <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>

-         <request-action>NetworkActivateRequest</request-action>

-         <source>VID</source>

-         <notification-url/>

-         <order-number/>

-         <order-version/>

-      </request-information>

-      <service-information>

-         <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

-         <service-type>MSO-dev-service-type</service-type>

-         <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

-         <subscriber-name>MSO_1610_dev</subscriber-name>

-      </service-information>

-      <network-request-information>

-         <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

-         <network-type>CONTRAIL_EXTERNAL</network-type>

-         <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

-         <tenant>7dd5365547234ee8937416c65507d266</tenant>

-         <aic-cloud-region>RDM2WAGPLCP</aic-cloud-region>

-      </network-request-information>

-   </aetgt:SDNCRequestData>

-</aetgt:SDNCAdapterWorkflowRequest>"""

-						 

-	   String sdncAdapterWorkflowResponse =

-	  """<aetgt:SDNCAdapterWorkflowResponse xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-                                   xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">

-   <sdncadapterworkflow:response-data>

-<tag0:CallbackHeader xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1">

-   <tag0:RequestId>745b1b50-e39e-4685-9cc8-c71f0bde8bf0</tag0:RequestId>

-   <tag0:ResponseCode>200</tag0:ResponseCode>

-   <tag0:ResponseMessage>OK</tag0:ResponseMessage>

-</tag0:CallbackHeader>

-   <tag0:RequestData xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-                  xsi:type="xs:string">&lt;output xmlns="org:openecomp:sdnctl:vnf"&gt;&lt;svc-request-id&gt;00703dc8-71ff-442d-a4a8-3adc5beef6a9&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;network-information&gt;&lt;network-id&gt;49c86598-f766-46f8-84f8-8d1c1b10f9b4&lt;/network-id&gt;&lt;/network-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;MNS-25180-L-01-dmz_direct_net_1&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;</tag0:RequestData>

-   </sdncadapterworkflow:response-data>

-</aetgt:SDNCAdapterWorkflowResponse>"""

-					  

-  

-	  String sdncAdapterWorkflowResponse_Error =

-	  """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-                                                 xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

-                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-                                                 xmlns="org:openecomp:sdnctl:vnf">

-   <sdncadapterworkflow:response-data>

-      <tag0:RequestData xsi:type="xs:string">

-         <output>

-            <response-code>400</response-code>

-            <response-message>Error writing to l3-netework</response-message>

-            <ack-final-indicator>Y</ack-final-indicator>

-            <svc-request-id>c79240d8-34b5-4853-af69-2021928dba00</svc-request-id>

-         </output>

-      </tag0:RequestData>

-   </sdncadapterworkflow:response-data>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-  

-	  String expected_sdncAdapterWorkflowResponse_Error =

-  """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns="org:openecomp:sdnctl:vnf"

-                                                 xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"

-                                                 xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"

-                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-   <sdncadapterworkflow:response-data>

-      <tag0:RequestData xsi:type="xs:string">

-         <output>

-            <response-code>400</response-code>

-            <response-message>Error writing to l3-netework</response-message>

-            <ack-final-indicator>Y</ack-final-indicator>

-            <svc-request-id>c79240d8-34b5-4853-af69-2021928dba00</svc-request-id>

-         </output>

-      </tag0:RequestData>

-   </sdncadapterworkflow:response-data>

-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>"""

-  

-	  String sdncAdapterWorkflowFormattedResponse =

-	  """<aetgt:SDNCAdapterWorkflowResponse xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-                                   xmlns="org:openecomp:sdnctl:vnf">

-   <aetgt:response-data>

-      <output>

-         <svc-request-id>00703dc8-71ff-442d-a4a8-3adc5beef6a9</svc-request-id>

-         <response-code>200</response-code>

-         <ack-final-indicator>Y</ack-final-indicator>

-         <network-information>

-            <network-id>49c86598-f766-46f8-84f8-8d1c1b10f9b4</network-id>

-         </network-information>

-         <service-information>

-            <service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>

-            <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

-            <subscriber-name>notsurewecare</subscriber-name>

-         </service-information>

-      </output>

-   </aetgt:response-data>

-</aetgt:SDNCAdapterWorkflowResponse>"""   

-  

-	  String falloutHandlerRequest =

-	  """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>b69c9054-da09-4a2c-adf5-51042b62bfac</request-id>

-					      <action>UPDATE</action>

-					      <source>PORTAL</source>

-					   </request-info>

-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>Received error from SDN-C: No availability zone available.</aetgt:ErrorMessage>

-							<aetgt:ErrorCode>5300</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-					</aetgt:FalloutHandlerRequest>"""

-  

-	  String falloutHandlerRequestObject =

-	  """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>b69c9054-da09-4a2c-adf5-51042b62bfac</request-id>

-					      <action>UPDATE</action>

-					      <source>VID</source>

-					   </request-info>

-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>Received error from SDN-C: No availability zone available</aetgt:ErrorMessage>

-							<aetgt:ErrorCode>7000</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-					</aetgt:FalloutHandlerRequest>"""

-					  

-					  

-	  String falloutHandlerRequest_Scenario01 =

-  """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"

-					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">

-					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-					      <request-id>b69c9054-da09-4a2c-adf5-51042b62bfac</request-id>

-					      <action>UPDATE</action>

-					      <source>VID</source>

-					   </request-info>

-						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">

-							<aetgt:ErrorMessage>Unexpected Response from AAI - 400</aetgt:ErrorMessage>

-							<aetgt:ErrorCode>7020</aetgt:ErrorCode>

-						</aetgt:WorkflowException>

-					</aetgt:FalloutHandlerRequest>"""

-  

-	  String completeMsoProcessRequest =

-	  """<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"

-                            xmlns:ns="http://org.openecomp/mso/request/types/v1"

-                            xmlns="http://org.openecomp/mso/infra/vnf-request/v1">

-   <request-info>

-      <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>

-      <action>UPDATE</action>

-      <source>PORTAL</source>

-   </request-info>

-   <aetgt:mso-bpel-name>BPMN Network action: UPDATE</aetgt:mso-bpel-name>

-</aetgt:MsoCompletionRequest>"""

-

-// - - - - - - - -

-

-

-	    @Before

-		public void init()

-		{

-			MockitoAnnotations.initMocks(this)

-			

-		}

-		

-		public void initializeVariables (Execution mockExecution) {

-			

-			verify(mockExecution).setVariable("UPDNETI_messageId", "")

-			verify(mockExecution).setVariable("BasicAuthHeaderValuePO", "")

-			verify(mockExecution).setVariable("BasicAuthHeaderValueSDNC", "")

-			verify(mockExecution).setVariable("UPDNETI_UpdateNetworkInstanceInfraJsonRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_networkRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_networkInputs", "")

-			verify(mockExecution).setVariable("UPDNETI_networkOutputs", "")

-			verify(mockExecution).setVariable("UPDNETI_requestId", "")

-			verify(mockExecution).setVariable("UPDNETI_source", "")

-			verify(mockExecution).setVariable("UPDNETI_networkId", "")

-			

-			verify(mockExecution).setVariable("UPDNETI_CompleteMsoProcessRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_FalloutHandlerRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_isSilentSuccess", false)

-			verify(mockExecution).setVariable("UPDNETI_isPONR", false)

-			

-			// AAI query Cloud Region

-			verify(mockExecution).setVariable("UPDNETI_queryCloudRegionRequest","")

-			verify(mockExecution).setVariable("UPDNETI_queryCloudRegionReturnCode","")

-			verify(mockExecution).setVariable("UPDNETI_queryCloudRegionResponse","")

-			verify(mockExecution).setVariable("UPDNETI_cloudRegionPo","")

-			verify(mockExecution).setVariable("UPDNETI_cloudRegionSdnc","")

-			verify(mockExecution).setVariable("UPDNETI_isCloudRegionGood", false)

-			

-			// AAI query Id

-			verify(mockExecution).setVariable("UPDNETI_queryIdAAIRequest","")

-			verify(mockExecution).setVariable("UPDNETI_queryIdAAIResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_aaiIdReturnCode", "")

-

-			// AAI query vpn binding

-			verify(mockExecution).setVariable("UPDNETI_queryVpnBindingAAIRequest","")

-			verify(mockExecution).setVariable("UPDNETI_queryVpnBindingAAIResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", "")

-			verify(mockExecution).setVariable("UPDNETI_vpnBindings", null)

-			verify(mockExecution).setVariable("UPDNETI_vpnCount", 0)

-			verify(mockExecution).setVariable("UPDNETI_routeCollection", "")

-			

-			// AAI query network policy

-			verify(mockExecution).setVariable("UPDNETI_queryNetworkPolicyAAIRequest","")

-			verify(mockExecution).setVariable("UPDNETI_queryNetworkPolicyAAIResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_aaiQqueryNetworkPolicyReturnCode", "")

-			verify(mockExecution).setVariable("UPDNETI_networkPolicyUriList", null)

-			verify(mockExecution).setVariable("UPDNETI_networkPolicyCount", 0)

-			verify(mockExecution).setVariable("UPDNETI_networkCollection", "")

-			

-			// AAI query route table reference

-			verify(mockExecution).setVariable("UPDNETI_queryNetworkTableRefAAIRequest","")

-			verify(mockExecution).setVariable("UPDNETI_queryNetworkTableRefAAIResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_aaiQqueryNetworkTableRefReturnCode", "")

-			verify(mockExecution).setVariable("UPDNETI_networkTableRefUriList", null)

-			verify(mockExecution).setVariable("UPDNETI_networkTableRefCount", 0)

-			verify(mockExecution).setVariable("UPDNETI_tableRefCollection", "")

-			

-			

-			// AAI requery Id

-			verify(mockExecution).setVariable("UPDNETI_requeryIdAAIRequest","")

-			verify(mockExecution).setVariable("UPDNETI_requeryIdAAIResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_aaiRequeryIdReturnCode", "")

-

-			// AAI update contrail

-			verify(mockExecution).setVariable("UPDNETI_updateContrailAAIUrlRequest","")

-			verify(mockExecution).setVariable("UPDNETI_updateContrailAAIPayloadRequest","")

-			verify(mockExecution).setVariable("UPDNETI_updateContrailAAIResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_aaiUpdateContrailReturnCode", "")

-				

-			verify(mockExecution).setVariable("UPDNETI_updateNetworkRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_updateNetworkResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_rollbackNetworkRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_rollbackNetworkResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_networkReturnCode", "")

-			verify(mockExecution).setVariable("UPDNETI_rollbackNetworkReturnCode", "")

-			verify(mockExecution).setVariable("UPDNETI_isNetworkRollbackNeeded", false)

-			

-			verify(mockExecution).setVariable("UPDNETI_changeAssignSDNCRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_changeAssignSDNCResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_rollbackSDNCRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_rollbackSDNCResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_sdncReturnCode", "")

-			verify(mockExecution).setVariable("UPDNETI_rollbackSDNCReturnCode", "")

-			verify(mockExecution).setVariable("UPDNETI_isSdncRollbackNeeded", false)

-			verify(mockExecution).setVariable("UPDNETI_sdncResponseSuccess", false)

-

-			verify(mockExecution).setVariable("UPDNETI_updateDBRequest", "")

-			verify(mockExecution).setVariable("UPDNETI_updateDBResponse", "")

-			verify(mockExecution).setVariable("UPDNETI_dbReturnCode", "")

-			

-			verify(mockExecution).setVariable("UPDNETI_isVnfBindingPresent", false)

-			verify(mockExecution).setVariable("UPDNETI_Success", false)

-			verify(mockExecution).setVariable("UPDNETI_serviceInstanceId", "")

-			verify(mockExecution).setVariable("GENGS_type", "service-instance") // Setting for Generic Sub Flow use

-			

-			

-		}

-		

-		@Test

-		//@Ignore  

-		public void preProcessRequest_NetworkRequest() {

-			

-			println "************ preProcessRequest_Payload ************* " 

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("isBaseVfModule")).thenReturn(true)

-			when(mockExecution.getVariable("recipeTimeout")).thenReturn(0)

-			when(mockExecution.getVariable("requestAction")).thenReturn("UPDATE")

-			when(mockExecution.getVariable("serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-			when(mockExecution.getVariable("vnfId")).thenReturn("")

-			when(mockExecution.getVariable("volumeGroupId")).thenReturn("")

-			when(mockExecution.getVariable("networkId")).thenReturn("49c86598-f766-46f8-84f8-8d1c1b10f9b4")

-			when(mockExecution.getVariable("serviceType")).thenReturn("MOG")

-			when(mockExecution.getVariable("networkType")).thenReturn("modelName")

-			when(mockExecution.getVariable("bpmnRequest")).thenReturn(jsonIncomingRequest)

-			

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("URN_mso_adapters_po_auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")

-			when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_mso_rollback")).thenReturn("true")

-									

-			// preProcessRequest(Execution execution)						

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.preProcessRequest(mockExecution)

-			

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).getVariable("isDebugLogEnabled")

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			

-			//verify variable initialization

-			initializeVariables(mockExecution)

-

-			// Authentications

-            verify(mockExecution).setVariable("BasicAuthHeaderValuePO", "Basic cGFzc3dvcmQ=")

-			verify(mockExecution).setVariable("BasicAuthHeaderValueSDNC", "Basic cGFzc3dvcmQ=")

-

-			verify(mockExecution).setVariable("UPDNETI_UpdateNetworkInstanceInfraJsonRequest", jsonIncomingRequest)

-			//verify(mockExecution).setVariable("UPDNETI_networkRequest", expectedNetworkRequest)

-			//verify(mockExecution).setVariable("UPDNETI_networkInputs", expectedNetworkInputs)

-			//verify(mockExecution, atLeast(3)).setVariable("UPDNETI_networkOutputs", "")

-			

-			//verify(mockExecution).setVariable("UPDNETI_requestId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			//verify(mockExecution).setVariable("UPDNETI_source", "VID")

-			//verify(mockExecution).setVariable("UPDNETI_messageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			//verify(mockExecution, atLeast(1)).setVariable("GENGS_type", "service-instance")

-							

-		}

-

-		

-		@Test

-		//@Ignore

-		public void preProcessRequest_MissingNetworkId() {

-

-			println "************ preProcessRequest_MissingName() ************* "

-			

-			WorkflowException missingNameWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 2500, "Variable 'network-id' value/element is missing.")

-			

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("isBaseVfModule")).thenReturn(true)

-			when(mockExecution.getVariable("recipeTimeout")).thenReturn(0)

-			when(mockExecution.getVariable("requestAction")).thenReturn("UPDATE")

-			when(mockExecution.getVariable("serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-			when(mockExecution.getVariable("vnfId")).thenReturn("")

-			when(mockExecution.getVariable("volumeGroupId")).thenReturn("")

-			//when(mockExecution.getVariable("networkId")).thenReturn("49c86598-f766-46f8-84f8-8d1c1b10f9b4")

-			when(mockExecution.getVariable("serviceType")).thenReturn("MOG")

-			when(mockExecution.getVariable("networkType")).thenReturn("modelName")

-			when(mockExecution.getVariable("bpmnRequest")).thenReturn(jsonIncomingRequest)

-			

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("URN_mso_adapters_po_auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")

-			when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_mso_rollback")).thenReturn("true")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			try {

-				UpdateNetworkInstanceInfra.preProcessRequest(mockExecution)

-			} catch (Exception ex) {

-				println " Test End - Handle catch-throw BpmnError()! "

-			}

-			

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			

-			//verify variable initialization

-			initializeVariables(mockExecution)

-

-			// Authentications

-			verify(mockExecution).setVariable("BasicAuthHeaderValuePO", "Basic cGFzc3dvcmQ=")

-			verify(mockExecution).setVariable("BasicAuthHeaderValueSDNC", "Basic cGFzc3dvcmQ=")

-

-			verify(mockExecution).setVariable("UPDNETI_UpdateNetworkInstanceInfraJsonRequest", jsonIncomingRequest)

-			//verify(mockExecution, atLeast(1)).setVariable("UPDNETI_networkOutputs", networkOutputs)

-			//verify(mockExecution).setVariable("UPDNETI_networkRequest", expectedNetworkRequestMissingNetworkId)

-			//verify(mockExecution).setVariable("UPDNETI_networkInputs", expectedNetworkInputs)

-			

-			//verify(mockExecution).setVariable("UPDNETI_requestId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			//verify(mockExecution).setVariable("UPDNETI_source", "VID")

-			//verify(mockExecution).setVariable("UPDNETI_messageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			

-			verify(mockExecution).setVariable(eq("WorkflowException"), refEq(missingNameWorkflowException))

-						

-		}

-		

-		@Test

-		//@Ignore

-		public void preProcessRequest_MissingCloudRegion() {

-			

-			println "************ preProcessRequest_MissingCloudRegion() ************* "

-			

-			WorkflowException missingCloudRegionWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 2500, "requestDetails has missing 'aic-cloud-region' value/element.")

-			

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("isBaseVfModule")).thenReturn(true)

-			when(mockExecution.getVariable("recipeTimeout")).thenReturn(0)

-			when(mockExecution.getVariable("requestAction")).thenReturn("UPDATE")

-			when(mockExecution.getVariable("serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-			when(mockExecution.getVariable("vnfId")).thenReturn("")

-			when(mockExecution.getVariable("volumeGroupId")).thenReturn("")

-			when(mockExecution.getVariable("networkId")).thenReturn("networkId")

-			when(mockExecution.getVariable("serviceType")).thenReturn("MOG")

-			when(mockExecution.getVariable("networkType")).thenReturn("modelName")

-			

-			when(mockExecution.getVariable("bpmnRequest")).thenReturn(jsonIncomingRequest_MissingCloudRegion)

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("URN_mso_adapters_po_auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")

-			when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_mso_rollback")).thenReturn("true")

-

-									

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			try {

-				UpdateNetworkInstanceInfra.preProcessRequest(mockExecution)

-			} catch (Exception ex) {

-				println " Test End - Handle catch-throw BpmnError()! "

-			}

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution, atLeast(1)).getVariable("isDebugLogEnabled")

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			

-			//verify variable initialization

-			initializeVariables(mockExecution)

-

-			verify(mockExecution).setVariable("UPDNETI_messageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			// Authentications

-			verify(mockExecution).setVariable("BasicAuthHeaderValuePO", "Basic cGFzc3dvcmQ=")

-			verify(mockExecution).setVariable("BasicAuthHeaderValueSDNC", "Basic cGFzc3dvcmQ=")

-

-			verify(mockExecution).setVariable("UPDNETI_UpdateNetworkInstanceInfraJsonRequest", jsonIncomingRequest_MissingCloudRegion)

-			//verify(mockExecution).setVariable("UPDNETI_networkRequest", "")

-			//verify(mockExecution).setVariable("UPDNETI_networkInputs", "")

-			//verify(mockExecution, atLeast(1)).setVariable("UPDNETI_networkOutputs", "")

-			

-			//verify(mockExecution).setVariable("UPDNETI_requestId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			//verify(mockExecution).setVariable("UPDNETI_source", "VID")

-			

-			verify(mockExecution).setVariable(eq("WorkflowException"), refEq(missingCloudRegionWorkflowException))

-							

-		}

-				

-		@Test

-		//@Ignore

-		public void sendSyncResponse() {

-			

-			println "************ sendSyncResponse ************* "

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("isAsyncProcess")).thenReturn(true)

-			when(mockExecution.getVariable("mso-request-id")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			//when(mockExecution.getVariable("serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.sendSyncResponse(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UpdateNetworkInstanceInfraResponseCode", "202")

-

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void sendSyncError() {

-			

-			println "************ sendSyncError ************* "

-			

-			ExecutionEntity mockExecution = setupMock()									

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("isAsyncProcess")).thenReturn(true)

-			when(mockExecution.getVariable("mso-request-id")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			//when(mockExecution.getVariable("serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.sendSyncError(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UpdateNetworkInstanceInfraResponseCode", "500")

-			

-		}

-		

-		

-		@Test

-		//@Ignore

-		public void prepareDBRequest() {

-			

-			println "************ prepareDBRequest ************* "

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("UPDNETI_networkOutputs")).thenReturn("")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("UPDNETI_orchestrationStatus")).thenReturn("")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.prepareDBRequest(mockExecution)

-			

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_updateDBRequest", updateDBRequest)

-		

-		}

-		

-		@Test

-		//@Ignore

-		public void prepareDBRequestErro_ExceptionObject() {

-			

-			println "************ prepareDBRequest ************* "

-			

-			WorkflowException sndcWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 500, "Received error from SDN-C: No availability zone available")

-			

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("UPDNETI_networkOutputs")).thenReturn("")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("UPDNETI_networkOutputs")).thenReturn("")

-			when(mockExecution.getVariable("UPDNETI_orchestrationStatus")).thenReturn("")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(sndcWorkflowException)

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.prepareDBRequestError(mockExecution)

-			

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_updateDBRequest", updateDBRequestError)

-		

-		}

-		

-		@Test

-		//@Ignore

-		public void prepareDBRequest_Outputs() {

-			

-			println "************ prepareDBRequest ************* "

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("UPDNETI_networkOutputs")).thenReturn(networkOutputs)

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("UPDNETI_orchestrationStatus")).thenReturn("")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_mso_adapters_db_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.prepareDBRequest(mockExecution)

-			

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_updateDBRequest", updateDBRequest_Outputs)

-		

-		}

-			

-		@Test

-		//@Ignore

-		public void prepareUpdateNetworkRequest() {

-			

-			println "************ prepareNetworkRequest ************* "

-						ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("UPDNETI_networkRequest")).thenReturn(expectedNetworkRequest)

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponse)

-			when(mockExecution.getVariable("UPDNETI_cloudRegionPo")).thenReturn("RDM2WAGPLCP")

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("messageId_generated")

-			when(mockExecution.getVariable("UPDNETI_source")).thenReturn("VID")

-			//when(mockExecution.getVariable("UPDNETI_queryVpnBindingAAIResponse")).thenReturn(queryVpnBindingAAIResponse)

-			when(mockExecution.getVariable("UPDNETI_routeCollection")).thenReturn("<routeTargets>13979:105757</routeTargets><routeTargets>13979:105757</routeTargets>")

-			when(mockExecution.getVariable("UPDNETI_networkCollection")).thenReturn("<policyFqdns>GN_EVPN_Test</policyFqdns>")

-			when(mockExecution.getVariable("UPDNETI_tableRefCollection")).thenReturn("<routeTableFqdns>refFQDN1</routeTableFqdns><routeTableFqdns>refFQDN2</routeTableFqdns>")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			//when(mockExecution.getVariable("URN_?????")).thenReturn("")   // notificationUrl, //TODO - is this coming from URN? What variable/value to use?

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_rollbackEnabled")).thenReturn("true")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.prepareUpdateNetworkRequest(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			

-			verify(mockExecution).setVariable("UPDNETI_updateNetworkRequest", updateNetworkRequest)

-			

-		}

-		

-

-		@Test

-		//@Ignore

-		public void prepareUpdateNetworkRequest_NoPhysicalname() {

-			

-			println "************ prepareNetworkRequest ************* "

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("UPDNETI_networkRequest")).thenReturn(NetworkRequest_noPhysicalName)

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponse)

-			when(mockExecution.getVariable("UPDNETI_cloudRegionPo")).thenReturn("RDM2WAGPLCP")

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("messageId_generated")

-			when(mockExecution.getVariable("UPDNETI_source")).thenReturn("VID")

-			//when(mockExecution.getVariable("UPDNETI_queryVpnBindingAAIResponse")).thenReturn(queryVpnBindingAAIResponse)

-			when(mockExecution.getVariable("UPDNETI_routeCollection")).thenReturn("<routeTargets>13979:105757</routeTargets><routeTargets>13979:105757</routeTargets>")

-			when(mockExecution.getVariable("UPDNETI_networkCollection")).thenReturn("<policyFqdns>GN_EVPN_Test</policyFqdns>")

-			when(mockExecution.getVariable("UPDNETI_tableRefCollection")).thenReturn("")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			//when(mockExecution.getVariable("URN_?????")).thenReturn("")   // notificationUrl, //TODO - is this coming from URN? What variable/value to use?

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_rollbackEnabled")).thenReturn("true")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.prepareUpdateNetworkRequest(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			

-			verify(mockExecution).setVariable("UPDNETI_updateNetworkRequest", updateNetworkRequest_noPhysicalName)

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void prepareSDNCRequest() {

-			

-			println "************ prepareSDNCRequest ************* "

-			

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("UPDNETI_networkRequest")).thenReturn(expectedNetworkRequest)

-			when(mockExecution.getVariable("UPDNETI_cloudRegionSdnc")).thenReturn("RDM2WAGPLCP")

-			when(mockExecution.getVariable("UPDNETI_serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-			when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("http://localhost:28090/SDNCAdapterCallback")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")

-			

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.prepareSDNCRequest(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_changeAssignSDNCRequest", changeAssignSDNCRequest)

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void prepareSDNCRollbackRequest() {

-			

-			println "************ prepareSDNCRollbackRequest ************* "

-			

-

-			

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("UPDNETI_networkRequest")).thenReturn(expectedNetworkRequest)

-			when(mockExecution.getVariable("UPDNETI_cloudRegionSdnc")).thenReturn("RDM2WAGPLCP")

-			when(mockExecution.getVariable("UPDNETI_serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")

-			when(mockExecution.getVariable("UPDNETI_changeAssignSDNCResponse")).thenReturn(assignResponse)

-			when(mockExecution.getVariable("mso-request-id")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("http://localhost:28090/SDNCAdapterCallback")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("GENGSI_siResourceLink")).thenReturn("https://aai-int1.test.com:8443/aai/v8/business/customers/customer/MSO_1610_dev/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/6d4eb22a-82f1-4257-9f80-4176262cfe69/")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.prepareSDNCRollbackRequest(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_rollbackSDNCRequest", sdncRollbackRequest)

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAINetworkId_200() {

-

-			println "************ callRESTQueryAAINetworkId ************* "

-			

-			WireMock.reset();

-			

-			MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_networkRequest")).thenReturn(expectedNetworkRequest)

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn("/aai/v8/network/l3-networks/l3-network")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAINetworkId(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_queryIdAAIRequest", "http://localhost:28090/aai/v8/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4")

-			verify(mockExecution).setVariable("UPDNETI_aaiIdReturnCode", "200")

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAICloudRegion30_200() {

-

-			println "************ callRESTQueryAAICloudRegion30_200 ************* "

-			

-			WireMock.reset();

-			MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion30_AAIResponse_Success.xml")

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-			when(mockExecution.getVariable("UPDNETI_networkInputs")).thenReturn(expectedNetworkRequest)

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn("/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAICloudRegion(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_queryCloudRegionRequest", "http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/RDM2WAGPLCP")

-			verify(mockExecution, atLeast(2)).setVariable("UPDNETI_queryCloudRegionReturnCode", "200")

-			verify(mockExecution).setVariable("UPDNETI_isCloudRegionGood", true)

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAICloudRegion25_200() {

-

-			println "************ callRESTQueryAAICloudRegion25_200 ************* "

-			

-			WireMock.reset();

-			MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml")

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-			when(mockExecution.getVariable("UPDNETI_networkInputs")).thenReturn(expectedNetworkRequest)

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn("/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAICloudRegion(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_queryCloudRegionRequest", "http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/RDM2WAGPLCP")

-			verify(mockExecution, atLeast(2)).setVariable("UPDNETI_queryCloudRegionReturnCode", "200")

-			verify(mockExecution).setVariable("UPDNETI_isCloudRegionGood", true)

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAICloudRegion_NotFound() {

-

-			println "************ callRESTQueryAAICloudRegionFake ************* "

-			

-			WireMock.reset();

-			MockGetCloudRegion("MDTWNJ21", 404, "")

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-			when(mockExecution.getVariable("UPDNETI_networkInputs")).thenReturn(vnfRequestFakeRegion)

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_cloud_region_uri")).thenReturn("/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAICloudRegion(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_queryCloudRegionRequest", "http://localhost:28090/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/MDTWNJ21")

-			verify(mockExecution, atLeast(1)).setVariable("UPDNETI_queryCloudRegionReturnCode", "404")

-			verify(mockExecution).setVariable("UPDNETI_cloudRegionPo", "MDTWNJ21")

-			verify(mockExecution).setVariable("UPDNETI_cloudRegionSdnc", "AAIAIC25")

-			verify(mockExecution).setVariable("UPDNETI_isCloudRegionGood", true)

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAINetworkVpnBinding_200() {

-

-			println "************ callRESTQueryAAINetworkVpnBinding_200 ************* "

-			

-			WireMock.reset();

-			MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200)

-			MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponse) // v6

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn("/aai/v8/network/vpn-bindings/vpn-binding")

-//			when(mockExecution.getVariable("URN_mso_workflow_UpdateNetworkInstanceInfra_aai_network_vpn-binding_uri")).thenReturn("")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true") 

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAINetworkVpnBinding(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_vpnCount", 2)

-			verify(mockExecution).setVariable("UPDNETI_vpnBindings", ['/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/', '/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/'])

-			// the last vpnBinding value is saved.

-			verify(mockExecution).setVariable("UPDNETI_queryVpnBindingAAIRequest", "http://localhost:28090/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017")

-			verify(mockExecution, atLeast(2)).setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", "200")

-			

-		}

-

-		@Test

-		//@Ignore

-		public void callRESTQueryAAINetworkVpnBinding_TestScenario01_200() {

-

-			println "************ callRESTQueryAAINetworkVpnBinding_200 ************* "

-			

-			WireMock.reset();

-			MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200)

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponseTestScenario01) 

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn("/aai/v8/network/vpn-bindings/vpn-binding")

-//			when(mockExecution.getVariable("URN_mso_workflow_UpdateNetworkInstanceInfra_aai_network_vpn-binding_uri")).thenReturn("")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAINetworkVpnBinding(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_vpnCount", 1)

-			verify(mockExecution).setVariable("UPDNETI_vpnBindings", ['/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/'])

-			// the last vpnBinding value is saved.

-			verify(mockExecution).setVariable("UPDNETI_queryVpnBindingAAIRequest", "http://localhost:28090/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017")

-			verify(mockExecution).setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", "200")

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAINetworkVpnBinding_200_URN_Uri() {

-

-			println "************ callRESTQueryAAINetworkVpnBinding_200 ************* "

-			

-			WireMock.reset();

-			MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200)

-			MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponse) 

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_vpn_binding_uri")).thenReturn("/aai/v8/network/vpn-bindings/vpn-binding")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAINetworkVpnBinding(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_vpnCount", 2)

-			verify(mockExecution).setVariable("UPDNETI_vpnBindings", ['/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017/', '/aai/v8/network/vpn-bindings/vpn-binding/c980a6ef-3b88-49f0-9751-dbad8608d0a6/'])

-			// the last vpnBinding value is saved.

-			verify(mockExecution).setVariable("UPDNETI_queryVpnBindingAAIRequest", "http://localhost:28090/aai/v8/network/vpn-bindings/vpn-binding/85f015d0-2e32-4c30-96d2-87a1a27f8017")

-			verify(mockExecution, atLeast(2)).setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", "200")

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAINetworkVpnBinding_NotPresent() {

-

-			println "************ callRESTQueryAAINetworkVpnBinding_NotPresent ************* "

-			

-			WireMock.reset();

-			MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200)

-			

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponseVpnNotPresent)  

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn("/aai/v8/network/l3-networks/l3-network")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAINetworkVpnBinding(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_aaiQqueryVpnBindingReturnCode", "200")

-			verify(mockExecution).setVariable("UPDNETI_vpnCount", 0)

-			verify(mockExecution).setVariable("UPDNETI_queryVpnBindingAAIResponse", aaiVpnResponseStub)

-						

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAINetworkTableRef_200() {

-

-			println "************ callRESTQueryAAINetworkTableRef_200 ************* "

-			

-			WireMock.reset();

-			MockGetNetworkRouteTable("refFQDN1", "CreateNetworkV2/createNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200)

-			MockGetNetworkRouteTable("refFQDN2", "CreateNetworkV2/createNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200)

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponse)

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_route_table_reference_uri")).thenReturn("/aai/v8/network/route-table-references/route-table-reference")

-//			when(mockExecution.getVariable("URN_mso_workflow_CreateNetworkInstanceInfra_aai_network_table_reference_uri")).thenReturn("")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAINetworkTableRef(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_networkTableRefCount", 2)

-			verify(mockExecution).setVariable("UPDNETI_networkTableRefUriList", ['/aai/v8/network/route-table-references/route-table-reference/refFQDN1','/aai/v8/network/route-table-references/route-table-reference/refFQDN2'])

-			// the last vpnBinding value is saved.

-			verify(mockExecution).setVariable("UPDNETI_queryNetworkTableRefAAIRequest", "http://localhost:28090/aai/v8/network/route-table-references/route-table-reference/refFQDN1")

-			verify(mockExecution, atLeast(2)).setVariable("UPDNETI_aaiQqueryNetworkTableRefReturnCode", "200")

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void callRESTQueryAAINetworkPolicy_200() {

-

-			println "************ callRESTQueryAAINetworkPolicy_200 ************* "

-			

-			WireMock.reset();

-			MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200)

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponse) 

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_network_policy_uri")).thenReturn("/aai/v8/network/network-policies/network-policy")

-//			when(mockExecution.getVariable("URN_mso_workflow_UpdateNetworkInstanceInfra_aai_network_policy_uri")).thenReturn("")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTQueryAAINetworkPolicy(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_networkPolicyCount", 1)

-			verify(mockExecution).setVariable("UPDNETI_networkPolicyUriList", ['/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg'])

-			// the last vpnBinding value is saved.

-			verify(mockExecution).setVariable("UPDNETI_queryNetworkPolicyAAIRequest", "http://localhost:28090/aai/v8/network/network-policies/network-policy/cee6d136-e378-4678-a024-2cd15f0ee0cg")

-			verify(mockExecution).setVariable("UPDNETI_aaiQqueryNetworkPolicyReturnCode", "200")

-			

-		}

-		

-		

-		@Test

-		//@Ignore

-		public void callRESTReQueryAAINetworkId_200() {

-

-			println "************ callRESTReQueryAAINetworkId ************* "

-			

-			WireMock.reset();

-			MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200)

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_changeAssignSDNCResponse")).thenReturn(sdncAdapterWorkflowFormattedResponse)

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn("/aai/v8/network/l3-networks/l3-network")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTReQueryAAINetworkId(mockExecution)

-			

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_requeryIdAAIRequest", "http://localhost:28090/aai/v8/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4")

-			verify(mockExecution).setVariable("UPDNETI_aaiRequeryIdReturnCode", "200")

-			

-		}

-		

-

-		@Test

-		@Ignore

-		public void callRESTUpdateContrailAAINetworkREST_200() {

-

-			println "************ callRESTUpdateContrailAAINetwork ************* "

-			

-			WireMock.reset();

-			MockPutNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", 200, "UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml")

-			

-			ExecutionEntity mockExecution = setupMock()

-			when(mockExecution.getVariable("UPDNETI_changeAssignSDNCResponse")).thenReturn(sdncAdapterWorkflowFormattedResponse)

-			when(mockExecution.getVariable("UPDNETI_requeryIdAAIResponse")).thenReturn(queryIdAIIResponse)

-			when(mockExecution.getVariable("UPDNETI_updateNetworkResponse")).thenReturn(updateNetworkResponseREST)

-			when(mockExecution.getVariable("UPDNETI_messageId")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")

-			when(mockExecution.getVariable("URN_aai_endpoint")).thenReturn("http://localhost:28090")

-			when(mockExecution.getVariable("URN_mso_workflow_global_default_aai_version")).thenReturn("8")

-			when(mockExecution.getVariable("URN_mso_workflow_default_aai_v8_l3_network_uri")).thenReturn("/aai/v8/network/l3-networks/l3-network")

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("URN_aai_auth")).thenReturn("757A94191D685FD2092AC1490730A4FC")

-			when(mockExecution.getVariable("URN_mso_msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")

-			

-			// preProcessRequest(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.callRESTUpdateContrailAAINetwork(mockExecution)

-

-			// Capture the arguments to setVariable

-			ArgumentCaptor<String> captor1 = ArgumentCaptor.forClass(String.class);

-			ArgumentCaptor<String> captor2 = ArgumentCaptor.forClass(String.class);

-			

-			verify(mockExecution, times(6)).setVariable(captor1.capture(), captor2.capture())

-			List<String> arg2List = captor2.getAllValues()

-			String payloadResponseActual = arg2List.get(4)

-			

-			assertEquals(updateContrailAAIResponse.replaceAll("\\s+", ""), payloadResponseActual.replaceAll("\\s+", ""))

-			

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_updateContrailAAIUrlRequest", "http://localhost:28090/aai/v8/network/l3-networks/l3-network/49c86598-f766-46f8-84f8-8d1c1b10f9b4")

-			verify(mockExecution).setVariable("UPDNETI_updateContrailAAIPayloadRequest", updateContrailAAIPayloadRequest)

-			verify(mockExecution).setVariable("UPDNETI_aaiUpdateContrailReturnCode", "200")

-			verify(mockExecution).setVariable("UPDNETI_isPONR", true)

-				

-		}

-		

-

-	

-		@Test

-		//@Ignore

-		public void validateUpdateNetworkResponseREST() {

-			

-			println "************ validateNetworkResponse ************* "

-			

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_updateNetworkResponse")).thenReturn(updateNetworkResponseREST)

-			when(mockExecution.getVariable("UPDNETI_networkReturnCode")).thenReturn('200')

-			

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.validateUpdateNetworkResponse(mockExecution)

-

-			//MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-			//debugger.printInvocations(mockExecution)

-						

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_updateNetworkResponse", updateNetworkResponseREST)

-			verify(mockExecution).setVariable("UPDNETI_isNetworkRollbackNeeded", true)

-			verify(mockExecution).setVariable("UPDNETI_rollbackNetworkRequest", updateRollbackNetworkRequest)

-

-		}

-		

-		@Test

-		//@Ignore

-		public void validateUpdateNetworkResponseREST_Error() {

-			

-			println "************ validateNetworkResponse ************* "

-			

-			WorkflowException workflowException = new WorkflowException("UpdateNetworkInstanceInfra", 2500, "Received error from Network Adapter: JBWEB000065: HTTP Status 500.")

-			

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_updateNetworkResponse")).thenReturn(networkException500)

-			when(mockExecution.getVariable("UPDNETI_networkReturnCode")).thenReturn('500')

-			

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			try {

-				UpdateNetworkInstanceInfra.validateUpdateNetworkResponse(mockExecution)

-			} catch (Exception ex) {

-				println " Test End - Handle catch-throw BpmnError()! "

-			}

-						

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution, atLeast(1)).setVariable("WorkflowException", refEq(workflowException, any(WorkflowException.class)))

-			

-		}

-		

-		@Test

-		//@Ignore 

-		public void validateSDNCResponse() {

-			

-			println "************ validateSDNCResponse ************* "

-			

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_changeAssignSDNCResponse")).thenReturn(sdncAdapterWorkflowResponse)

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-			when(mockExecution.getVariable("SDNCA_SuccessIndicator")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_sdncReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_isResponseGood")).thenReturn(true)

-			

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			try {

-			  UpdateNetworkInstanceInfra.validateSDNCResponse(mockExecution)

-			  verify(mockExecution).setVariable("UPDNETI_isSdncRollbackNeeded", true)

-			  verify(mockExecution).setVariable("UPDNETI_rollbackSDNCRequest", "")

-			  

-			} catch (Exception ex) {

-				println " Graceful Exit - " + ex.getMessage()

-			}

-			//MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-			//debugger.printInvocations(mockExecution)

-			

-			//verify(mockExecution).setVariable("UPDNETI_isSdncRollbackNeeded", true)

-				

-		}

-

-		@Test

-		//@Ignore

-		public void validateSDNCResponse_Error() {

-			

-			println "************ validateSDNCResponse ************* "

-			//ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_changeAssignSDNCResponse")).thenReturn(sdncAdapterWorkflowResponse_Error)

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-			when(mockExecution.getVariable("SDNCA_SuccessIndicator")).thenReturn(false)

-			when(mockExecution.getVariable("UPDNETI_sdncReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_isResponseGood")).thenReturn(true)

-			

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			try {

-				UpdateNetworkInstanceInfra.validateSDNCResponse(mockExecution)

-			} catch (Exception ex) {

-				println " Graceful Exit! - " + ex.getMessage() 

-			}

-			//MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-			//debugger.printInvocations(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			//verify(mockExecution).setVariable("UPDNETI_sdncResponseSuccess", false)

-				

-		}

-

-		

-		

-		@Test

-		//@Ignore

-		public void postProcessResponse() {

-			

-			println "************ postProcessResponse ************* "

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_source")).thenReturn("PORTAL")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("88f65519-9a38-4c4b-8445-9eb4a5a5af56")

-			when(mockExecution.getVariable("UPDNETI_dbReturnCode")).thenReturn("200")

-			

-			// postProcessResponse(Execution execution)						

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.postProcessResponse(mockExecution)

-

-			// check the sequence of variable invocation

-			//MockitoDebuggerImpl preDebugger = new MockitoDebuggerImpl()

-			//preDebugger.printInvocations(mockExecution)

-

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_Success", true)

-			verify(mockExecution).setVariable("UPDNETI_CompleteMsoProcessRequest", completeMsoProcessRequest)

-		

-		}

-

-		@Test

-		//@Ignore

-		public void validateRollbackResponses_Good() {

-			

-			WorkflowException workflowException = new WorkflowException("UpdateNetworkInstanceInfra", 2500, "AAI Update Contrail Failed.  Error 404.")

-			WorkflowException expectedWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 2500, "AAI Update Contrail Failed.  Error 404. + PO Network rollback is not supported for Update. Submit another Update to restore/rollback. + SNDC rollback completed.")

-				  

-			println "************ validateRollbackResponses_Good() ************* "

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-

-			when(mockExecution.getVariable("UPDNETI_isNetworkRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkResponse")).thenReturn("GoodResponse")

-			when(mockExecution.getVariable("UPDNETI_isSdncRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCResponse")).thenReturn("GoodResponse")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)

-									

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.validateRollbackResponses(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("WorkflowException", refEq(expectedWorkflowException, any(WorkflowException.class)))

-			

-		}

-		

-		@Test

-		//@Ignore

-		public void validateRollbackResponses_Failed() {

-			

-			WorkflowException workflowException = new WorkflowException("UpdateNetworkInstanceInfra", 7020, "AAI Update Contrail Failed.  Error 404.")

-			WorkflowException expectedWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 7020, "AAI Update Contrail Failed.  Error 404. + PO Network rollback is not supported for Update. Submit another Update to restore/rollback. + SDNC rollback failed. ")

-				  

-			println "************ validateRollbackResponses_Failed() ************* "

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-

-			when(mockExecution.getVariable("UPDNETI_isNetworkRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkReturnCode")).thenReturn("404")

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkResponse")).thenReturn("BadResponse")

-			when(mockExecution.getVariable("UPDNETI_isSdncRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCReturnCode")).thenReturn("500")

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCResponse")).thenReturn("BadResponse")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)

-									

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.validateRollbackResponses(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution, atLeast(1)).setVariable("WorkflowException", refEq(expectedWorkflowException, any(WorkflowException.class)))

-

-		}

-		

-		@Test

-		//@Ignore

-		public void validateRollbackResponses_NetworkFailed() {

-			

-			WorkflowException workflowException = new WorkflowException("UpdateNetworkInstanceInfra", 7020, "AAI Update Contrail Failed.  Error 404.")

-			WorkflowException expectedWorkflowExceptionFailed = new WorkflowException("UpdateNetworkInstanceInfra", 7020, "AAI Update Contrail Failed.  Error 404. + PO Network rollback is not supported for Update. Submit another Update to restore/rollback. + SNDC rollback completed.")

-				  

-			println "************ validateRollbackResponses_NetworkFailed() ************* "

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-

-			when(mockExecution.getVariable("UPDNETI_isNetworkRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkReturnCode")).thenReturn("404")

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkResponse")).thenReturn("BadResponse")

-			when(mockExecution.getVariable("UPDNETI_isSdncRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCResponse")).thenReturn("GoodResponse")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)

-									

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.validateRollbackResponses(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution, atLeast(1)).setVariable("WorkflowException", refEq(expectedWorkflowExceptionFailed , any(WorkflowException.class)))

-

-		}

-		

-		@Test

-		//@Ignore

-		public void validateRollbackResponses_SdncFailed() {

-			

-			WorkflowException workflowException = new WorkflowException("UpdateNetworkInstanceInfra", 7020, "AAI Update Contrail Failed.  Error 404.")

-			WorkflowException expectedWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 7020, "AAI Update Contrail Failed.  Error 404. + PO Network rollback is not supported for Update. Submit another Update to restore/rollback. + SDNC rollback failed. ")

-				  

-			println "************ validateRollbackResponses_SdncFailed() ************* "

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-

-			when(mockExecution.getVariable("UPDNETI_isNetworkRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkResponse")).thenReturn("GoodResponse")

-			when(mockExecution.getVariable("UPDNETI_isSdncRollbackNeeded")).thenReturn(true)

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCResponse")).thenReturn("<response-code>400</response-code>")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)

-									

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.validateRollbackResponses(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("WorkflowException", refEq(expectedWorkflowException , any(WorkflowException.class)))

-

-		}

-		

-		@Test

-		//@Ignore

-		public void validateRollbackResponses_NoRollbacks() {

-			

-			WorkflowException workflowException = new WorkflowException("UpdateNetworkInstanceInfra", 2500, " AAI Update Contrail Failed.  Error 404")

-			WorkflowException expectedWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 2500, " AAI Update Contrail Failed.  Error 404")

-				  

-			println "************ validateRollbackResponses_NoRollbacks() ************* "

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("prefix")).thenReturn("UPDNETI_")

-

-			when(mockExecution.getVariable("UPDNETI_isNetworkRollbackNeeded")).thenReturn(false)

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_rollbackNetworkResponse")).thenReturn("GoodResponse")

-			when(mockExecution.getVariable("UPDNETI_isSdncRollbackNeeded")).thenReturn(false)

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_rollbackSDNCResponse")).thenReturn("GoodResponse")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)

-									

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.validateRollbackResponses(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			//verify(mockExecution, atLeast(1)).setVariable("WorkflowException", any(expectedWorkflowException))

-			verify(mockExecution, atLeast(1)).setVariable("WorkflowException", refEq(expectedWorkflowException, any(WorkflowException.class)))

-

-		}

-		

-	

-		@Test

-		//@Ignore 

-		public void buildErrorResponse() {

-			

-			println "************ buildErrorResponse ************* "

-			

-			

-			WorkflowException sndcWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 5300, "Received error from SDN-C: No availability zone available.")

-			

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("b69c9054-da09-4a2c-adf5-51042b62bfac")

-			when(mockExecution.getVariable("UPDNETI_source")).thenReturn("PORTAL")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(sndcWorkflowException)

-			

-			// buildErrorResponse(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.buildErrorResponse(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_Success", false)

-			verify(mockExecution).setVariable("UPDNETI_FalloutHandlerRequest", falloutHandlerRequest)

-			

-			//MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-			//debugger.printInvocations(mockExecution)

-

-		}

-		

-		@Test

-		//@Ignore

-		public void buildErrorResponse_WorkflowExceptionObject() {

-			

-			println "************ buildErrorResponse ************* "

-			

-			WorkflowException sndcWorkflowException = new WorkflowException("UpdateNetworkInstanceInfra", 7000, "Received error from SDN-C: No availability zone available") 

-			

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("b69c9054-da09-4a2c-adf5-51042b62bfac")

-			when(mockExecution.getVariable("UPDNETI_source")).thenReturn("VID")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(sndcWorkflowException)

-			

-			// buildErrorResponse(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.buildErrorResponse(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_Success", false)

-			verify(mockExecution).setVariable("UPDNETI_FalloutHandlerRequest", falloutHandlerRequestObject)

-			

-			//MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-			//debugger.printInvocations(mockExecution)

-

-		}

-		

-		@Test

-		//@Ignore

-		public void buildErrorResponse_Scenario01() {

-			

-			WorkflowException aaiWorkflowException_Secnario01 = new WorkflowException("UpdateNetworkInstanceInfra", 7020, "Unexpected Response from AAI - 400")

-			

-			println "************ buildErrorResponse ************* "

-			ExecutionEntity mockExecution = setupMock()

-			// Initialize prerequisite variables

-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")

-			when(mockExecution.getVariable("UPDNETI_requestId")).thenReturn("b69c9054-da09-4a2c-adf5-51042b62bfac")

-			when(mockExecution.getVariable("UPDNETI_source")).thenReturn("VID")

-			when(mockExecution.getVariable("WorkflowException")).thenReturn(aaiWorkflowException_Secnario01)

-			when(mockExecution.getVariable("UPDNETI_dbReturnCode")).thenReturn("200")

-			when(mockExecution.getVariable("UPDNETI_updateDBResponse")).thenReturn("<GoodResponse>")

-			

-			when(mockExecution.getVariable("UPDNETI_aaiRequeryIdReturnCode")).thenReturn("400")

-			

-			// buildErrorResponse(Execution execution)

-			UpdateNetworkInstanceInfra UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra()

-			UpdateNetworkInstanceInfra.buildErrorResponse(mockExecution)

-			

-			// verify set prefix = "UPDNETI_"

-			verify(mockExecution, atLeast(1)).setVariable("prefix", "UPDNETI_")

-			verify(mockExecution).setVariable("UPDNETI_Success", false)

-			verify(mockExecution).setVariable("UPDNETI_FalloutHandlerRequest", falloutHandlerRequest_Scenario01)

-			

-			//MockitoDebuggerImpl debugger = new MockitoDebuggerImpl()

-			//debugger.printInvocations(mockExecution)

-

-		}

-	

-

-		private ExecutionEntity setupMock() {

-			

-			ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)

-			when(mockProcessDefinition.getKey()).thenReturn("UpdateNetworkInstanceInfra")

-			RepositoryService mockRepositoryService = mock(RepositoryService.class)

-			when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)

-			when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("UpdateNetworkInstanceInfra")

-			when(mockRepositoryService.getProcessDefinition().getId()).thenReturn("100")

-			ProcessEngineServices mockProcessEngineServices = mock(ProcessEngineServices.class)

-			when(mockProcessEngineServices.getRepositoryService()).thenReturn(mockRepositoryService)

-			

-			ExecutionEntity mockExecution = mock(ExecutionEntity.class)

-			// Initialize prerequisite variables

-			

-			when(mockExecution.getId()).thenReturn("100")

-			when(mockExecution.getProcessDefinitionId()).thenReturn("UpdateNetworkInstanceInfra")

-			when(mockExecution.getProcessInstanceId()).thenReturn("UpdateNetworkInstanceInfra")

-			when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)

-			when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)

-			

-			return mockExecution

-		}

-		

-		

-}

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java
index 4f987f0..dd7497c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java
@@ -20,26 +20,18 @@
 

 package org.openecomp.mso.bpmn.infrastructure;

 

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetCloudRegion;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetworkPolicyfqdn;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVolumeGroupById;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;

 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutGenericVnf;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutNetwork;

-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutVfModuleIdNoResponse;

-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;

-import static org.openecomp.mso.bpmn.mock.StubResponseSDNCAdapter.mockSDNCAdapter;

-import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFPost;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModule;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockSDNCAdapterVfModule;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockVNFAdapterRestVfModule;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDBUpdateVfModule;

 

 import java.io.IOException;

 import java.util.HashMap;

 import java.util.Map;

 import java.util.UUID;

-

+import org.junit.Ignore;

 import org.camunda.bpm.engine.test.Deployment;

 import org.junit.Test;

 import org.openecomp.mso.bpmn.common.WorkflowTest;

@@ -66,7 +58,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
 	

 	

 	/**

-	 * Sunny day VID scenario.

+	 * Sunny day VID scenario with preloads.

 	 * 

 	 * @throws Exception

 	 */

@@ -74,7 +66,9 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
 	@Deployment(resources = {

 			"process/CreateVfModuleInfra.bpmn",

 			"subprocess/DoCreateVfModule.bpmn",

+			"subprocess/GenericGetVnf.bpmn",

 			"subprocess/SDNCAdapterV1.bpmn",

+			"subprocess/GenericNotificationService.bpmn",

 			"subprocess/VnfAdapterRestV1.bpmn",

 			"subprocess/ConfirmVolumeGroupTenant.bpmn",

 			"subprocess/ConfirmVolumeGroupName.bpmn",

@@ -84,28 +78,80 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
 			"subprocess/CompleteMsoProcess.bpmn",

 			"subprocess/FalloutHandler.bpmn"

 		})

-	public void sunnyDayVID() throws Exception {

+	public void sunnyDayVIDWithPreloads() throws Exception {

 				

 		logStart();

 		

-		MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-		MockGetGenericVnfByIdWithPriority("skask", ".*", 200, "VfModularity/VfModule-new.xml", 5);

-		MockGetGenericVnfById("skask", "VfModularity/GenericVnf.xml", 200);

-		MockPutVfModuleIdNoResponse("skask", "PCRF", ".*");

-		MockPutNetwork(".*", "VfModularity/AddNetworkPolicy_AAIResponse_Success.xml", 200);

-		MockPutGenericVnf("skask");

-		mockVNFPost("", 202, "skask");

-		mockSDNCAdapter("/SDNCAdapter", "vnf-type>STMTN", 200, "VfModularity/StandardSDNCSynchResponse.xml");

-		mockSDNCAdapter("/SDNCAdapter", "SvcAction>query", 200, "VfModularity/StandardSDNCSynchResponse.xml");

-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");

+		MockAAIVfModule();

 		MockPatchGenericVnf("skask");

 		MockPatchVfModuleId("skask", ".*");

+		MockSDNCAdapterVfModule();		

+		MockVNFAdapterRestVfModule();

+		MockDBUpdateVfModule();

 		

 		String businessKey = UUID.randomUUID().toString();

 		String createVfModuleRequest =

 			FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json");

 		

-		Map<String, Object> variables = setupVariablesSunnyDayVID();

+		Map<String, Object> variables = setupVariablesSunnyDayVID();		

+		

+		TestAsyncResponse asyncResponse = invokeAsyncProcess("CreateVfModuleInfra",

+			"v1", businessKey, createVfModuleRequest, variables);

+				

+		WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);

+		

+		String responseBody = response.getResponse();

+		System.out.println("Workflow (Synch) Response:\n" + responseBody);

+		

+		injectSDNCCallbacks(callbacks, "assign, query");

+		injectVNFRestCallbacks(callbacks, "vnfCreate");

+		injectSDNCCallbacks(callbacks, "activate");

+		

+		// TODO add appropriate assertions

+

+		waitForProcessEnd(businessKey, 10000);

+		checkVariable(businessKey, "CreateVfModuleSuccessIndicator", true);

+		

+		logEnd();

+	}

+	

+	/**

+	 * Sunny day VID scenario with no preloads.

+	 * 

+	 * @throws Exception

+	 */

+	@Test	

+	@Deployment(resources = {

+			"process/CreateVfModuleInfra.bpmn",

+			"subprocess/DoCreateVfModule.bpmn",

+			"subprocess/GenericGetVnf.bpmn",

+			"subprocess/SDNCAdapterV1.bpmn",

+			"subprocess/VnfAdapterRestV1.bpmn",

+			"subprocess/ConfirmVolumeGroupTenant.bpmn",

+			"subprocess/GenericNotificationService.bpmn",

+			"subprocess/ConfirmVolumeGroupName.bpmn",

+			"subprocess/CreateAAIVfModule.bpmn",

+			"subprocess/UpdateAAIVfModule.bpmn",

+			"subprocess/UpdateAAIGenericVnf.bpmn",

+			"subprocess/CompleteMsoProcess.bpmn",

+			"subprocess/FalloutHandler.bpmn"

+		})

+	public void sunnyDayVIDNoPreloads() throws Exception {

+				

+		logStart();

+		

+		MockAAIVfModule();

+		MockPatchGenericVnf("skask");

+		MockPatchVfModuleId("skask", ".*");

+		MockSDNCAdapterVfModule();		

+		MockVNFAdapterRestVfModule();

+		MockDBUpdateVfModule();

+		

+		String businessKey = UUID.randomUUID().toString();

+		String createVfModuleRequest =

+			FileUtil.readResourceFile("__files/CreateVfModule_VID_request_noPreloads.json");

+		

+		Map<String, Object> variables = setupVariablesSunnyDayVID();		

 		

 		TestAsyncResponse asyncResponse = invokeAsyncProcess("CreateVfModuleInfra",

 			"v1", businessKey, createVfModuleRequest, variables);

@@ -131,7 +177,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
 		private Map<String, Object> setupVariablesSunnyDayVID() {

 			Map<String, Object> variables = new HashMap<String, Object>();

 			//try {

-			//	variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));

+				//variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));

 			//}

 			//catch (Exception e) {

 				

@@ -159,39 +205,35 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
 		 * @throws Exception

 		 */

 		@Test

+		@Ignore

 		@Deployment(resources = {

 				"process/CreateVfModuleInfra.bpmn",

 				"subprocess/DoCreateVfModule.bpmn",

+				"subprocess/GenericGetVnf.bpmn",

 				"subprocess/SDNCAdapterV1.bpmn",

 				"subprocess/VnfAdapterRestV1.bpmn",

 				"subprocess/ConfirmVolumeGroupTenant.bpmn",

 				"subprocess/ConfirmVolumeGroupName.bpmn",

 				"subprocess/CreateAAIVfModule.bpmn",

 				"subprocess/CreateAAIVfModuleVolumeGroup.bpmn",

+				"subprocess/GenericNotificationService.bpmn",

 				"subprocess/UpdateAAIVfModule.bpmn",

 				"subprocess/UpdateAAIGenericVnf.bpmn",

 				"subprocess/CompleteMsoProcess.bpmn",

 				"subprocess/FalloutHandler.bpmn"

 			})

+		

 		public void sunnyDayVIDWithVolumeGroupAttach() throws Exception {

 					

 			logStart();

 			

-			MockGetVolumeGroupById("AAIAIC25", "78987", "VfModularity/VolumeGroup.xml");

-			MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");

-			MockGetCloudRegion("MDTWNJ21", 200, "CreateNetworkV2/cloudRegion30_AAIResponse_Success.xml");

-			MockGetVolumeGroupById("RDM2WAGPLCP", "78987", "DeleteVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml");

-			MockPutVfModuleIdNoResponse("skask", "PCRF", ".*");

-			mockVNFPost("", 202, "skask");

-			MockGetNetworkPolicyfqdn(".*", "VfModularity/QueryNetworkPolicy_AAIResponse_Success.xml", 200);

-			MockPutGenericVnf("skask");

-			MockGetGenericVnfByIdWithPriority("skask", ".*", 200, "VfModularity/VfModule-new.xml", 5);

-			mockSDNCAdapter("/SDNCAdapter", "vnf-type>STMTN", 200, "VfModularity/StandardSDNCSynchResponse.xml");

-			mockSDNCAdapter("/SDNCAdapter", "SvcAction>query", 200, "VfModularity/StandardSDNCSynchResponse.xml");

-			mockVNFPost("", 202, "skask");

-			mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");

+

+			MockAAIVfModule();

 			MockPatchGenericVnf("skask");

 			MockPatchVfModuleId("skask", ".*");

+			MockSDNCAdapterVfModule();		

+			MockVNFAdapterRestVfModule();

+			MockDBUpdateVfModule();

 			

 			String businessKey = UUID.randomUUID().toString();

 			String createVfModuleRequest =

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateNetworkInstanceInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateNetworkInstanceInfraTest.java
deleted file mode 100644
index 9ef4c94..0000000
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateNetworkInstanceInfraTest.java
+++ /dev/null
@@ -1,840 +0,0 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * OPENECOMP - MSO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
-
-package org.openecomp.mso.bpmn.infrastructure;
-
-import static org.junit.Assert.assertEquals;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.executeAsyncWorkflow;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.getVariable;
-import static org.openecomp.mso.bpmn.common.BPMNUtil.waitForWorkflowToFinish;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetCloudRegion;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetwork;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetworkPolicy;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetworkRouteTable;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetNetworkVpnBinding;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPutNetwork;
-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;
-import static org.openecomp.mso.bpmn.mock.StubResponseNetworkAdapter.MockPutNetworkAdapter;
-import static org.openecomp.mso.bpmn.mock.StubResponseSDNCAdapter.mockSDNCAdapter;
-import static org.openecomp.mso.bpmn.mock.StubResponseSDNCAdapter.mockSDNCAdapterTopology;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.BPMNUtil;
-import org.openecomp.mso.bpmn.common.SDNCAdapterCallbackRule;
-import org.openecomp.mso.bpmn.common.WorkflowTest;
-import org.openecomp.mso.bpmn.common.WorkflowTestTransformer;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-import org.openecomp.mso.bpmn.mock.SDNCAdapterNetworkTopologyMockTransformer;
-
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
-
-/**
- * Unit test cases for UpdateNetworkInstanceInfra.bpmn
- *
- */
-public class UpdateNetworkInstanceInfraTest extends WorkflowTest {
-	@WorkflowTestTransformer
-	public static final ResponseTransformer sdncAdapterMockTransformer =
-		new SDNCAdapterNetworkTopologyMockTransformer();
-
-	@Rule
-	public final SDNCAdapterCallbackRule sdncAdapterCallbackRule =
-		new SDNCAdapterCallbackRule(processEngineRule);
-
-	/**
-	 * End-to-End flow - Unit test for UpdateNetworkInstanceInfra.bpmn
-	 *  - String input & String response
-	 */
-
-	@Test
-	//@Ignore 
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/GenericGetService.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_Success1() throws Exception {
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("            Success1 - UpdateNetworkInstanceInfra flow Started!       ");
-		System.out.println("----------------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");  //
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 200, "UpdateNetworkV2/updateNetworkResponse_Success.xml");
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN1", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		MockPutNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", 200, "UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables1();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		System.out.println("----------------------------------------------------------");
-		System.out.println("- got workflow response -");
-		System.out.println("----------------------------------------------------------");
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("true", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_CompleteMsoProcessRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_CompleteMsoProcessRequest"));
-
-		String workflowResp = BPMNUtil.getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "WorkflowResponse");
-		Assert.assertNotNull(workflowResp);
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("     Success1 - UpdateNetworkInstanceInfra flow Completed      ");
-		System.out.println("----------------------------------------------------------");
-
-	}
-
-	@Test
-	//@Ignore 
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 				 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_Success2() throws Exception {
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("            Success2 - UpdateNetworkInstanceInfra flow Started!      ");
-		System.out.println("----------------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 200, "UpdateNetworkV2/updateNetworkResponse_Success.xml");
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN1", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		MockPutNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", 200, "UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables2();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("true", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_CompleteMsoProcessRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_CompleteMsoProcessRequest"));
-
-	    String completeMsoProcessRequest =
-	    		"<aetgt:MsoCompletionRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\""  + '\n'
-	    	  + "                            xmlns:ns=\"http://org.openecomp/mso/request/types/v1\""  + '\n'
-	    	  + "                            xmlns=\"http://org.openecomp/mso/infra/vnf-request/v1\">"  + '\n'
-	    	  + "   <request-info>"  + '\n'
-	    	  + "      <request-id>testRequestId</request-id>"  + '\n'
-	    	  + "      <action>UPDATE</action>"  + '\n'
-	    	  + "      <source>VID</source>"  + '\n'
-	    	  + "   </request-info>"  + '\n'
-	    	  + "   <aetgt:mso-bpel-name>BPMN Network action: UPDATE</aetgt:mso-bpel-name>" + '\n'
-	    	  + "</aetgt:MsoCompletionRequest>";
-
-	    Assert.assertEquals(completeMsoProcessRequest, getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_CompleteMsoProcessRequest"));
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("     Success2 - UpdateNetworkInstanceInfra flow Completed     ");
-		System.out.println("----------------------------------------------------------");
-
-	}
-
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 				 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_MissingNetworkId() throws Exception {
-
-		System.out.println("--------------------------------------------------------------------");
-		System.out.println("     Missing networkId - UpdateNetworkInstanceInfra flow Started!   ");
-		System.out.println("--------------------------------------------------------------------");
-
-		// setup simulators
-
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariablesMissingNetworkId();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-	    
-	    String falloutHandlerActual = getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest");	
-	    String falloutHandlerExpected = 
-"<aetgt:FalloutHandlerRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\"" + "\n" +
-"					                             xmlns:ns=\"http://org.openecomp/mso/request/types/v1\"" + "\n" +
-"					                             xmlns:wfsch=\"http://org.openecomp/mso/workflow/schema/v1\">" + "\n" +
-"					   <request-info xmlns=\"http://org.openecomp/mso/infra/vnf-request/v1\">" + "\n" +
-"					      <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>" + "\n" +
-"					      <action>UPDATE</action>" + "\n" +
-"					      <source>VID</source>" + "\n" +
-"					   </request-info>" + "\n" +
-"						<aetgt:WorkflowException xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\">" + "\n" +
-"							<aetgt:ErrorMessage>Variable 'network-id' value/element is missing.</aetgt:ErrorMessage>" + "\n" +
-"							<aetgt:ErrorCode>2500</aetgt:ErrorCode>" + "\n" +
-"						</aetgt:WorkflowException>" + "\n" +
-"					</aetgt:FalloutHandlerRequest>"; 
-	    		
-		assertEquals("Response", falloutHandlerExpected, falloutHandlerActual);
-
-		System.out.println("------------------------------------------------------------------");
-		System.out.println("    Missing networkId - UpdateNetworkInstanceInfra flow Completed ");
-		System.out.println("------------------------------------------------------------------");
-
-	}
-
-	/* NOT NEEDED
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 				 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_SDNCRollback1() throws Exception {
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("       SDNCRollback1 - UpdateNetworkInstanceInfra flow Started!       ");
-		System.out.println("----------------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>rollback");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 200, "UpdateNetworkV2/updateNetworkResponse_Success.xml");
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockAAIResponse_queryId_UpdateNetwork_404V2();            // failure in queryId in AAI
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariablesSDNCRollback();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("   SDNCRollback1 - UpdateNetworkInstanceInfra flow Completed   ");
-		System.out.println("----------------------------------------------------------");
-
-	} */
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 				 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_SDNCRollback_Scenario01() throws Exception {
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("       SDNCRollback - UpdateNetworkInstanceInfra flow Started!       ");
-		System.out.println("----------------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");          //
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>rollback");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 200, "UpdateNetworkV2/updateNetworkResponse_Success.xml");
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_NoPayload_Success.xml", 200);    // no 'payload' response from NetworkAdapter, version 2
-		//MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);     // let it fail (404) to see SDNC compensation
-		//MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);	 // let it fail (404) to see SDNC compensation
-		//MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariablesSDNCRollback();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("   SDNCRollback - UpdateNetworkInstanceInfra flow Completed   ");
-		System.out.println("----------------------------------------------------------");
-
-	}
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 			     "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_Network_SDNC_Rollback() throws Exception {
-
-		System.out.println("---------------------------------------------------------------");
-		System.out.println("    Network and SDNC Rollback - UpdateNetworkInstanceInfra flow Started!       ");
-		System.out.println("---------------------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");          //
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>rollback");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 200, "UpdateNetworkV2/updateNetworkResponse_Success.xml");
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN1", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		//MockAAIResponse_updateContrail_CreateNetwork_SuccessV2();  // designed to fail in AAI Update
-		//mockUpdateRequestDB(500, "Database/DBUpdateResponse.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables1();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-		System.out.println("---------------------------------------------------------------------");
-		System.out.println(" Network and SCNC Rollback - UpdateNetworkInstanceInfra flow Completed   ");
-		System.out.println("---------------------------------------------------------------------");
-
-	}
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 				 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_Network_SDNC_Rollback_Failed() throws Exception {
-
-		System.out.println("---------------------------------------------------------------");
-		System.out.println("    Network and SDNC Rollback - UpdateNetworkInstanceInfra flow Started!       ");
-		System.out.println("---------------------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");          //
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySim500Response.xml", "SvcAction>rollback");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 200, "UpdateNetworkV2/updateNetworkResponse_Success.xml");
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN1", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		//MockAAIResponse_updateContrail_CreateNetwork_SuccessV2();  // designed to fail in AAI Update
-		//mockUpdateRequestDB(500, "Database/DBUpdateResponse.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables1();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-		System.out.println("---------------------------------------------------------------------");
-		System.out.println(" Network and SCNC Rollback - UpdateNetworkInstanceInfra flow Completed   ");
-		System.out.println("---------------------------------------------------------------------");
-
-	}
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			                 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_SDNCRollback2() throws Exception {
-
-		System.out.println("----------------------------------------------------");
-		System.out.println("    SDNCRollback2 - UpdateNetworkInstanceInfra flow Started!    ");
-		System.out.println("----------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>rollback");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 500, "UpdateNetworkV2/updateNetworkResponse_500.xml");            // failure 500 in NetworkAdapter
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN1", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		//MockPutNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", 200, "UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables1();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-		System.out.println("------------------------------------------------------------");
-		System.out.println(" SDNCRollback2 - UpdateNetworkInstanceInfra flow Completed      ");
-		System.out.println("------------------------------------------------------------");
-
-	}
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 				 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_SDNCRollback3() throws Exception {
-
-		System.out.println("----------------------------------------------------");
-		System.out.println("    SDNCRollback3 - UpdateNetworkInstanceInfra flow Started!    ");
-		System.out.println("----------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>rollback");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 400, "UpdateNetworkV2/updateNetworkResponse_400.xml");            // failure 400 in NetworkAdapter
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN1", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		//MockPutNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", 200, "UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables1();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-		System.out.println("------------------------------------------------------------");
-		System.out.println(" SDNCRollback3 - UpdateNetworkInstanceInfra flow Completed      ");
-		System.out.println("------------------------------------------------------------");
-
-	}
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			 				 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_PONR() throws Exception {
-
-		System.out.println("--------------------------------------------------------------------");
-		System.out.println("    PONR (Point-of-no-Return) - UpdateNetworkInstanceInfra flow Started!       ");
-		System.out.println("--------------------------------------------------------------------");
-
-		// setup simulators
-
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");          //
-		mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>rollback");
-		MockPutNetworkAdapter("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "updateNetworkRequest", 200, "UpdateNetworkV2/updateNetworkResponse_Success.xml");
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		MockGetNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("85f015d0-2e32-4c30-96d2-87a1a27f8017", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkVpnBinding("c980a6ef-3b88-49f0-9751-dbad8608d0a6", "UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", 200);
-		MockGetNetworkPolicy("cee6d136-e378-4678-a024-2cd15f0ee0cg", "UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN1", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef1_AAIResponse_Success.xml", 200);
-		MockGetNetworkRouteTable("refFQDN2", "UpdateNetworkV2/updateNetwork_queryNetworkTableRef2_AAIResponse_Success.xml", 200);
-		MockPutNetwork("49c86598-f766-46f8-84f8-8d1c1b10f9b4", 200, "UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml");
-		mockUpdateRequestDB(500, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables1();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-	    String falloutHandlerRequest =
-	    		  "<aetgt:FalloutHandlerRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\"" + '\n'
-				+ "					                             xmlns:ns=\"http://org.openecomp/mso/request/types/v1\"" + '\n'
-				+ "					                             xmlns:wfsch=\"http://org.openecomp/mso/workflow/schema/v1\">" + '\n'
-				+ "					   <request-info xmlns=\"http://org.openecomp/mso/infra/vnf-request/v1\">" + '\n'
-				+ "					      <request-id>testRequestId</request-id>" + '\n'
-				+ "					      <action>CREATE</action>" + '\n'
-				+ "					      <source>VID</source>" + '\n'
-				+ "					   </request-info>" + '\n'
-				+ "						<aetgt:WorkflowException xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\">" + '\n'
-				+ "							<aetgt:ErrorMessage> DB Update failed, code: 500</aetgt:ErrorMessage>" + '\n'
-				+ "							<aetgt:ErrorCode>2500</aetgt:ErrorCode>" + '\n'
-				+ "						</aetgt:WorkflowException>" + '\n'
-				+ "					</aetgt:FalloutHandlerRequest>";
-
-	    System.out.println("Display UPDNETI_FalloutHandlerRequest - " + getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-	    //Assert.assertEquals(falloutHandlerRequest, getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_FalloutHandlerRequest"));
-
-		System.out.println("--------------------------------------------------------------------");
-		System.out.println("    PONR (Point-of-no-Return) - UpdateNetworkInstanceInfra flow Completed!     ");
-		System.out.println("--------------------------------------------------------------------");
-
-
-	}
-
-	@Test
-	@Deployment(resources = {"process/UpdateNetworkInstanceInfra.bpmn",
-			                 "subprocess/GenericGetService.bpmn",
-			                 "subprocess/FalloutHandler.bpmn",
-	                         "subprocess/CompleteMsoProcess.bpmn",
-	                         "subprocess/SDNCAdapterV1.bpmn"})
-
-	public void shouldInvokeServiceUpdateNetworkInstanceInfra_sdncFailure() throws Exception {
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("        SNDC Failure - UpdateNetworkInstanceInfra flow Started!      ");
-		System.out.println("----------------------------------------------------------");
-
-		// setup simulators
-
-		//MockSDNCAdapterBadAsynchronousResponse();                // 404
-		mockSDNCAdapter("/SDNCAdapter", "SvcAction>query", 500, "");             // 500
-		MockGetCloudRegion("RDM2WAGPLCP", 200, "CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml");
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		MockNodeQueryServiceInstanceById("f70e927b-6087-4974-9ef8-c5e4d5847ca4", "UpdateNetworkV2/updateNetwork_queryInstance_Success.xml");
-
-		Map<String, String> variables = setupVariables2();
-		WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstanceInfra", variables);
-		waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
-
-	    assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_Success"));
-	    Assert.assertNotNull("UPDNETI_CompleteMsoProcessRequest - ", getVariable(processEngineRule, "UpdateNetworkInstanceInfra", "UPDNETI_CompleteMsoProcessRequest"));
-
-		System.out.println("----------------------------------------------------------");
-		System.out.println("     SNDC Failure - UpdateNetworkInstanceInfra flow Completed ");
-		System.out.println("----------------------------------------------------------");
-
-	}
-
-	// *****************
-	// Utility Section
-	// *****************
-
-	// Success Scenario
-	private Map<String, String> setupVariables1() {
-		Map<String, String> variables = new HashMap<String, String>();
-		variables.put("bpmnRequest", getCreateNetworkRequest1());
-		variables.put("mso-request-id", "testRequestId");
-		variables.put("requestId", "testRequestId");
-		variables.put("isBaseVfModule", "true");
-		variables.put("recipeTimeout", "0");
-		variables.put("requestAction", "CREATE");
-		variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
-		variables.put("vnfId", "");
-		variables.put("vfModuleId", "");
-		variables.put("volumeGroupId", "");
-		variables.put("networkId", "49c86598-f766-46f8-84f8-8d1c1b10f9b4");
-		variables.put("serviceType", "vMOG");
-		variables.put("vfModuleType", "");
-		variables.put("networkType", "modelName");
-		return variables;
-
-	}
-
-	public String getCreateNetworkRequest1() {
-
-		String request =
-				"{ \"requestDetails\": { " + '\n' +
-				"      \"modelInfo\": { " + '\n' +
-				"         \"modelType\": \"modelType\", " + '\n' +
-				"         \"modelId\": \"modelId\", " + '\n' +
-				"         \"modelNameVersionId\": \"modelNameVersionId\", " + '\n' +
-				"         \"modelName\": \"CONTRAIL_EXTERNAL\", " + '\n' +
-				"         \"modelVersion\": \"1\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"cloudConfiguration\": { " + '\n' +
-				"          \"lcpCloudRegionId\": \"RDM2WAGPLCP\", " + '\n' +
-				"          \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestInfo\": { " + '\n' +
-				"          \"instanceName\": \"MNS-25180-L-01-dmz_direct_net_1\", " + '\n' +
-				"          \"source\": \"VID\", " + '\n' +
-				"          \"callbackUrl\": \"\", " + '\n' +
-				"          \"suppressRollback\": \"true\" ," + '\n' +
-				"          \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestParameters\": { " + '\n' +
-				"          \"backoutOnFailure\": true, " + '\n' +
-				"          \"serviceId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\", " + '\n' +
-				"          \"userParams\": [] " + '\n' +
-				"      }	" + '\n' +
-			    " } " + '\n' +
-			    "}";
-
-		return request;
-	}
-
-	// Success Scenario 2
-	private Map<String, String> setupVariables2() {
-		Map<String, String> variables = new HashMap<String, String>();
-		variables.put("bpmnRequest", getCreateNetworkRequest2());
-		variables.put("mso-request-id", "testRequestId");
-		variables.put("requestId", "testRequestId");
-		variables.put("isBaseVfModule", "true");
-		variables.put("recipeTimeout", "0");
-		variables.put("requestAction", "UPDATE");
-		variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
-		variables.put("vnfId", "");
-		variables.put("vfModuleId", "");
-		variables.put("volumeGroupId", "");
-		variables.put("networkId", "49c86598-f766-46f8-84f8-8d1c1b10f9b4");
-		variables.put("serviceType", "vMOG");
-		variables.put("vfModuleType", "");
-		variables.put("networkType", "modelName");
-		return variables;
-
-	}
-
-	public String getCreateNetworkRequest2() {
-
-		String request =
-				"{ \"requestDetails\": { " + '\n' +
-				"      \"modelInfo\": { " + '\n' +
-				"         \"modelType\": \"modelType\", " + '\n' +
-				"         \"modelId\": \"modelId\", " + '\n' +
-				"         \"modelNameVersionId\": \"modelNameVersionId\", " + '\n' +
-				"         \"modelName\": \"CONTRAIL_EXTERNAL\", " + '\n' +
-				"         \"modelVersion\": \"1\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"cloudConfiguration\": { " + '\n' +
-				"          \"lcpCloudRegionId\": \"RDM2WAGPLCP\", " + '\n' +
-				"          \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestInfo\": { " + '\n' +
-				"          \"instanceName\": \"myOwn_Network\", " + '\n' +
-				"          \"source\": \"VID\", " + '\n' +
-				"          \"callbackUrl\": \"\", " + '\n' +
-				"          \"suppressRollback\": \"true\" ," + '\n' +
-				"          \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestParameters\": { " + '\n' +
-				"          \"backoutOnFailure\": true, " + '\n' +
-				"          \"serviceId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\", " + '\n' +
-				"          \"userParams\": [] " + '\n' +
-				"      }	" + '\n' +
-			    " } " + '\n' +
-			    "}";
-
-		return request;
-
-	}
-
-	/* Active Scenario
-	private Map<String, String> setupVariablesActive() {
-		Map<String, String> variables = new HashMap<String, String>();
-		variables.put("mso-request-id", "testRequestId");
-		variables.put("bpmnRequest", getCreateNetworkRequestActive());
-		variables.put("requestId", "testRequestId");
-		variables.put("isBaseVfModule", "true");
-		variables.put("recipeTimeout", "0");
-		variables.put("requestAction", "UPDATE");
-		variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
-		variables.put("vnfId", "");
-		variables.put("vfModuleId", "");
-		variables.put("volumeGroupId", "");
-		variables.put("networkId", "49c86598-f766-46f8-84f8-8d1c1b10f9b4");
-		variables.put("serviceType", "vMOG");
-		variables.put("vfModuleType", "");
-		variables.put("networkType", "modelName");
-		return variables;
-
-	}
-
-	public String getCreateNetworkRequestActive() {
-
-		String request =
-				"{ \"requestDetails\": { " + '\n' +
-				"      \"modelInfo\": { " + '\n' +
-				"         \"modelType\": \"modelType\", " + '\n' +
-				"         \"modelId\": \"modelId\", " + '\n' +
-				"         \"modelNameVersionId\": \"modelNameVersionId\", " + '\n' +
-				"         \"modelName\": \"CONTRAIL_EXTERNAL\", " + '\n' +
-				"         \"modelVersion\": \"1\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"cloudConfiguration\": { " + '\n' +
-				"          \"lcpCloudRegionId\": \"RDM2WAGPLCP\", " + '\n' +
-				"          \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestInfo\": { " + '\n' +
-				"          \"instanceName\": \"MNS-25180-L-01-dmz_direct_net_2\", " + '\n' +
-				"          \"source\": \"VID\", " + '\n' +
-				"          \"callbackUrl\": \"\", " + '\n' +
-				"          \"suppressRollback\": \"true\" ," + '\n' +
-				"          \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestParameters\": { " + '\n' +
-				"          \"userParams\": [] " + '\n' +
-				"      }	" + '\n' +
-			    " } " + '\n' +
-			    "}";
-
-		return request;
-
-	} */
-
-	// Missing Name Scenario
-	private Map<String, String> setupVariablesMissingNetworkId() {
-		Map<String, String> variables = new HashMap<String, String>();
-		variables.put("mso-request-id", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
-		variables.put("bpmnRequest", getCreateNetworkRequestNetworkId());
-		variables.put("requestId", "testRequestId");
-		variables.put("isBaseVfModule", "true");
-		variables.put("recipeTimeout", "0");
-		variables.put("requestAction", "UPDATE");
-		variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
-		variables.put("vnfId", "");
-		variables.put("vfModuleId", "");
-		variables.put("volumeGroupId", "");
-		//variables.put("networkId", "49c86598-f766-46f8-84f8-8d1c1b10f9b4"); // missing, ok
-		variables.put("serviceType", "vMOG");
-		variables.put("vfModuleType", "");
-		variables.put("networkType", "modelName");
-
-		return variables;
-
-	}
-
-	public String getCreateNetworkRequestNetworkId() {
-
-		String request =
-				"{ \"requestDetails\": { " + '\n' +
-				"      \"modelInfo\": { " + '\n' +
-				"         \"modelType\": \"modelType\", " + '\n' +
-				"         \"modelId\": \"modelId\", " + '\n' +
-				"         \"modelNameVersionId\": \"modelNameVersionId\", " + '\n' +
-				"         \"modelName\": \"CONTRAIL_EXTERNAL\", " + '\n' +
-				"         \"modelVersion\": \"1\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"cloudConfiguration\": { " + '\n' +
-				"          \"lcpCloudRegionId\": \"RDM2WAGPLCP\", " + '\n' +
-				"          \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestInfo\": { " + '\n' +
-				"          \"source\": \"VID\", " + '\n' +
-				"          \"callbackUrl\": \"\", " + '\n' +
-				"          \"suppressRollback\": \"true\" ," + '\n' +
-				"          \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestParameters\": { " + '\n' +
-				"          \"userParams\": [] " + '\n' +
-				"      }	" + '\n' +
-			    " } " + '\n' +
-			    "}";
-
-			return request;
-
-	}
-
-	// SDNC Rollback Scenario
-	private Map<String, String> setupVariablesSDNCRollback() {
-		Map<String, String> variables = new HashMap<String, String>();
-		variables.put("mso-request-id", "testRequestId");
-		variables.put("bpmnRequest", getCreateNetworkRequestSDNCRollback());
-		variables.put("requestId", "testRequestId");
-		variables.put("isBaseVfModule", "true");
-		variables.put("recipeTimeout", "0");
-		variables.put("requestAction", "UPDATE");
-		variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
-		variables.put("vnfId", "");
-		variables.put("vfModuleId", "");
-		variables.put("volumeGroupId", "");
-		variables.put("networkId", "49c86598-f766-46f8-84f8-8d1c1b10f9b4");
-		variables.put("serviceType", "vMOG");
-		variables.put("vfModuleType", "");
-		variables.put("networkType", "modelName");
-		return variables;
-
-	}
-
-	public String getCreateNetworkRequestSDNCRollback() {
-
-		String request =
-				"{ \"requestDetails\": { " + '\n' +
-				"      \"modelInfo\": { " + '\n' +
-				"         \"modelType\": \"modelType\", " + '\n' +
-				"         \"modelId\": \"modelId\", " + '\n' +
-				"         \"modelNameVersionId\": \"modelNameVersionId\", " + '\n' +
-				"         \"modelName\": \"CONTRAIL_EXTERNAL\", " + '\n' +
-				"         \"modelVersion\": \"1\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"cloudConfiguration\": { " + '\n' +
-				"          \"lcpCloudRegionId\": \"RDM2WAGPLCP\", " + '\n' +
-				"          \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestInfo\": { " + '\n' +
-				"          \"instanceName\": \"MNS-25180-L-01-dmz_direct_net_3\", " + '\n' +
-				"          \"source\": \"VID\", " + '\n' +
-				"          \"callbackUrl\": \"\", " + '\n' +
-				"          \"suppressRollback\": \"true\" ," + '\n' +
-				"          \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + '\n' +
-				"      }, " + '\n' +
-				"      \"requestParameters\": { " + '\n' +
-				"          \"userParams\": [] " + '\n' +
-				"      }	" + '\n' +
-			    " } " + '\n' +
-			    "}";
-
-
-		return request;
-	}
-
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVfModuleVolumeInfraV1Test.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVfModuleVolumeInfraV1Test.java
index 34c0af4..6a5e241 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVfModuleVolumeInfraV1Test.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVfModuleVolumeInfraV1Test.java
@@ -1,141 +1,143 @@
-/*- 
- * ============LICENSE_START======================================================= 
- * OPENECOMP - MSO 
- * ================================================================================ 
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
- * ================================================================================ 
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
- * ============LICENSE_END========================================================= 
- */ 
-
-package org.openecomp.mso.bpmn.infrastructure;
-
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVfModuleId;
-import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVolumeGroupById;
-import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;
-import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockPutVNFVolumeGroup;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.camunda.bpm.engine.test.Deployment;
-import org.junit.Test;
-import org.openecomp.mso.bpmn.common.WorkflowTest;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
-import org.openecomp.mso.bpmn.mock.FileUtil;
-
-/**
- * Unit test cases for UpdateVfModuleVolume.bpmn
- */
-public class UpdateVfModuleVolumeInfraV1Test extends WorkflowTest {
-	
-	private final CallbackSet callbacks = new CallbackSet();
-
-	public UpdateVfModuleVolumeInfraV1Test() throws IOException {
-		callbacks.put("volumeGroupUpdate", FileUtil.readResourceFile(
-			"__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml"));
-	}
-
-	/**
-	 * Happy path scenario.
-	 * 
-	 * @throws Exception
-	 */
-	@Test
-	@Deployment(resources = {
-		"process/UpdateVfModuleVolumeInfraV1.bpmn",
-		"subprocess/VnfAdapterRestV1.bpmn",
-		"subprocess/CompleteMsoProcess.bpmn",
-		"subprocess/FalloutHandler.bpmn"
-		})
-	public void happyPath() throws Exception {
-
-		logStart();
-		
-		MockGetGenericVnfById("/TEST-VNF-ID-0123", "CreateVfModuleVolumeInfraV1/GenericVnf.xml", 200);
-		MockGetVolumeGroupById("mdt1", "78987", "UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml");
-		MockGetVfModuleId("9e48f6ea-f786-46de-800a-d480e5ccc846", "6a1dc898-b590-47b9-bbf0-34424a7a2ec3/", "UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml", 200);
-		mockPutVNFVolumeGroup("78987", 202);
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		
-		String businessKey = UUID.randomUUID().toString();
-		String updaetVfModuleVolRequest =
-			FileUtil.readResourceFile("__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request.json");
-		
-		Map<String, Object> testVariables = new HashMap<String, Object>();
-		testVariables.put("requestId", "TEST-REQUEST-ID-0123");
-		testVariables.put("serviceInstanceId", "test-service-instance-id");
-		testVariables.put("volumeGroupId", "78987");
-		testVariables.put("vnfId", "TEST-VNF-ID-0123");
-		TestAsyncResponse asyncResponse = invokeAsyncProcess("UpdateVfModuleVolumeInfraV1",	"v1", businessKey, updaetVfModuleVolRequest, testVariables);
-		WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);
-
-		String responseBody = response.getResponse();
-		System.out.println("Workflow (Synch) Response:\n" + responseBody);
-		
-		injectVNFRestCallbacks(callbacks, "volumeGroupUpdate");
-		
-		waitForProcessEnd(businessKey, 10000);
-		checkVariable(businessKey, "UpdateVfModuleVolumeSuccessIndicator", true);
-		
-		logEnd();
-	}
-	
-	/**
-	 * VF Module Personal model id does not match request model invariant id
-	 * @throws Exception
-	 */
-	@Test
-	//@Ignore
-	@Deployment(resources = {
-		"process/UpdateVfModuleVolumeInfraV1.bpmn",
-		"subprocess/VnfAdapterRestV1.bpmn",
-		"subprocess/CompleteMsoProcess.bpmn",
-		"subprocess/FalloutHandler.bpmn"
-		})
-	public void testPersonaModelIdNotMatch() throws Exception {
-
-		logStart();
-		
-		MockGetVolumeGroupById("mdt1", "78987", "UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml");
-		MockGetGenericVnfById("/TEST-VNF-ID-0123", "CreateVfModuleVolumeInfraV1/GenericVnf.xml", 200);
-		MockGetVfModuleId("9e48f6ea-f786-46de-800a-d480e5ccc846", "6a1dc898-b590-47b9-bbf0-34424a7a2ec3/", "UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml", 200);
-		mockPutVNFVolumeGroup("78987", 202);
-		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
-		
-		String businessKey = UUID.randomUUID().toString();
-		String updaetVfModuleVolRequest =
-			FileUtil.readResourceFile("__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request_2.json");
-		
-		Map<String, Object> testVariables = new HashMap<String, Object>();
-		testVariables.put("requestId", "TEST-REQUEST-ID-0123");
-		testVariables.put("serviceInstanceId", "test-service-instance-id");
-		testVariables.put("volumeGroupId", "78987");
-		testVariables.put("vnfId", "TEST-VNF-ID-0123");
-		TestAsyncResponse asyncResponse = invokeAsyncProcess("UpdateVfModuleVolumeInfraV1",	"v1", businessKey, updaetVfModuleVolRequest, testVariables);
-		WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);
-
-		String responseBody = response.getResponse();
-		System.out.println("Workflow (Synch) Response:\n" + responseBody);
-		
-		injectVNFRestCallbacks(callbacks, "volumeGroupUpdate");
-		
-		waitForProcessEnd(businessKey, 10000);
-		checkVariable(businessKey, "UpdateVfModuleVolumeSuccessIndicator", true);
-		
-		logEnd();
-	}	
-}
+/*- 

+ * ============LICENSE_START======================================================= 

+ * OPENECOMP - MSO 

+ * ================================================================================ 

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 

+ * ================================================================================ 

+ * Licensed under the Apache License, Version 2.0 (the "License"); 

+ * you may not use this file except in compliance with the License. 

+ * You may obtain a copy of the License at 

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0 

+ * 

+ * Unless required by applicable law or agreed to in writing, software 

+ * distributed under the License is distributed on an "AS IS" BASIS, 

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

+ * See the License for the specific language governing permissions and 

+ * limitations under the License. 

+ * ============LICENSE_END========================================================= 

+ */ 

+

+package org.openecomp.mso.bpmn.infrastructure;

+

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVfModuleId;

+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetVolumeGroupById;

+import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;

+import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockPutVNFVolumeGroup;

+

+import java.io.IOException;

+import java.util.HashMap;

+import java.util.Map;

+import java.util.UUID;

+

+import org.camunda.bpm.engine.test.Deployment;

+import org.junit.Test;

+import org.openecomp.mso.bpmn.common.WorkflowTest;

+import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;

+import org.openecomp.mso.bpmn.mock.FileUtil;

+

+/**

+ * Unit test cases for UpdateVfModuleVolume.bpmn

+ */

+public class UpdateVfModuleVolumeInfraV1Test extends WorkflowTest {

+	

+	private final CallbackSet callbacks = new CallbackSet();

+

+	public UpdateVfModuleVolumeInfraV1Test() throws IOException {

+		callbacks.put("volumeGroupUpdate", FileUtil.readResourceFile(

+			"__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml"));

+	}

+

+	/**

+	 * Happy path scenario.

+	 * 

+	 * @throws Exception

+	 */

+	@Test

+	@Deployment(resources = {

+		"process/UpdateVfModuleVolumeInfraV1.bpmn",

+		"subprocess/VnfAdapterRestV1.bpmn",

+		"subprocess/CompleteMsoProcess.bpmn",

+		"subprocess/GenericNotificationService.bpmn",

+		"subprocess/FalloutHandler.bpmn"

+		})

+	public void happyPath() throws Exception {

+

+		logStart();

+		

+		MockGetGenericVnfById("/TEST-VNF-ID-0123", "CreateVfModuleVolumeInfraV1/GenericVnf.xml", 200);

+		MockGetVolumeGroupById("mdt1", "78987", "UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml");

+		MockGetVfModuleId("9e48f6ea-f786-46de-800a-d480e5ccc846", "6a1dc898-b590-47b9-bbf0-34424a7a2ec3/", "UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml", 200);

+		mockPutVNFVolumeGroup("78987", 202);

+		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");

+		

+		String businessKey = UUID.randomUUID().toString();

+		String updaetVfModuleVolRequest =

+			FileUtil.readResourceFile("__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request.json");

+		

+		Map<String, Object> testVariables = new HashMap<String, Object>();

+		testVariables.put("requestId", "TEST-REQUEST-ID-0123");

+		testVariables.put("serviceInstanceId", "test-service-instance-id");

+		testVariables.put("volumeGroupId", "78987");

+		testVariables.put("vnfId", "TEST-VNF-ID-0123");

+		TestAsyncResponse asyncResponse = invokeAsyncProcess("UpdateVfModuleVolumeInfraV1",	"v1", businessKey, updaetVfModuleVolRequest, testVariables);

+		WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);

+

+		String responseBody = response.getResponse();

+		System.out.println("Workflow (Synch) Response:\n" + responseBody);

+		

+		injectVNFRestCallbacks(callbacks, "volumeGroupUpdate");

+		

+		waitForProcessEnd(businessKey, 10000);

+		checkVariable(businessKey, "UpdateVfModuleVolumeSuccessIndicator", true);

+		

+		logEnd();

+	}

+	

+	/**

+	 * VF Module Personal model id does not match request model invariant id

+	 * @throws Exception

+	 */

+	@Test

+	//@Ignore

+	@Deployment(resources = {

+		"process/UpdateVfModuleVolumeInfraV1.bpmn",

+		"subprocess/VnfAdapterRestV1.bpmn",

+		"subprocess/CompleteMsoProcess.bpmn",

+		"subprocess/GenericNotificationService.bpmn",

+		"subprocess/FalloutHandler.bpmn"

+		})

+	public void testPersonaModelIdNotMatch() throws Exception {

+

+		logStart();

+		

+		MockGetVolumeGroupById("mdt1", "78987", "UpdateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_Success.xml");

+		MockGetGenericVnfById("/TEST-VNF-ID-0123", "CreateVfModuleVolumeInfraV1/GenericVnf.xml", 200);

+		MockGetVfModuleId("9e48f6ea-f786-46de-800a-d480e5ccc846", "6a1dc898-b590-47b9-bbf0-34424a7a2ec3/", "UpdateVfModuleVolumeInfraV1/vf_module_aai_response.xml", 200);

+		mockPutVNFVolumeGroup("78987", 202);

+		mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");

+		

+		String businessKey = UUID.randomUUID().toString();

+		String updaetVfModuleVolRequest =

+			FileUtil.readResourceFile("__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request_2.json");

+		

+		Map<String, Object> testVariables = new HashMap<String, Object>();

+		testVariables.put("requestId", "TEST-REQUEST-ID-0123");

+		testVariables.put("serviceInstanceId", "test-service-instance-id");

+		testVariables.put("volumeGroupId", "78987");

+		testVariables.put("vnfId", "TEST-VNF-ID-0123");

+		TestAsyncResponse asyncResponse = invokeAsyncProcess("UpdateVfModuleVolumeInfraV1",	"v1", businessKey, updaetVfModuleVolRequest, testVariables);

+		WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);

+

+		String responseBody = response.getResponse();

+		System.out.println("Workflow (Synch) Response:\n" + responseBody);

+		

+		injectVNFRestCallbacks(callbacks, "volumeGroupUpdate");

+		

+		waitForProcessEnd(businessKey, 10000);

+		checkVariable(businessKey, "UpdateVfModuleVolumeSuccessIndicator", true);

+		

+		logEnd();

+	}	

+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request.json
new file mode 100644
index 0000000..1b56dbd
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request.json
@@ -0,0 +1,69 @@
+{

+"requestDetails": {

+"modelInfo": {

+"modelType": "vfModule",

+"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+"modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+"modelName": "STMTN5MMSC21-MMSC::model-1-0",

+"modelVersion": "1",

+"modelCustomizationUuid": "ee6478e5-ea33-3346-ac12-ab121484a3fe"

+},

+"subscriberInfo" : {

+"globalSubscriberId" : "MSO_1610_dev_id",

+"subscriberName" : "MSO_1610_dev_name"

+},

+"cloudConfiguration": {

+"lcpCloudRegionId": "MDTWNJ21",

+"tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"

+},

+"requestInfo": {

+"instanceName": "PCRF::module-0-2",

+"source": "VID",

+"suppressRollback": true

+},

+"relatedInstanceList": [

+{

+"relatedInstance": {

+"instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",

+"instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",

+"modelInfo": {

+"modelType": "volumeGroup",

+"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+"modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+"modelName": "vSAMP12..base..module-0",

+"modelVersion": "1"

+}

+}

+},

+{

+"relatedInstance": {

+"instanceId": "123456",

+"modelInfo": {

+"modelType": "service",

+"modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+"modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+"modelName": "SERVICE_MODEL_NAME",

+"modelVersion": "1.0"

+}

+}

+},

+{

+"relatedInstance": {

+"instanceId": "skask",

+"instanceName": "skask-test",

+"modelInfo": {

+"modelType": "vnf",

+"modelInvariantId": "skask",

+"modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+"modelName": "vSAMP12",

+"modelVersion": "1.0",

+"modelCustomizationName": "vSAMP12 1"

+}

+}

+}

+],

+"requestParameters": {

+"usePreload": true,

+"userParams": {}

+}

+}
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_noPreloads.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_noPreloads.json
new file mode 100644
index 0000000..f8cac48
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModule_VID_request_noPreloads.json
@@ -0,0 +1,79 @@
+{

+"requestDetails": {

+"modelInfo": {

+"modelType": "vfModule",

+"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+"modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+"modelName": "STMTN5MMSC21-MMSC::model-1-0",

+"modelVersion": "1",

+"modelCustomizationUuid": "ee6478e5-ea33-3346-ac12-ab121484a3fe"

+},

+"subscriberInfo" : {

+"globalSubscriberId" : "MSO_1610_dev_id",

+"subscriberName" : "MSO_1610_dev_name"

+},

+"cloudConfiguration": {

+"lcpCloudRegionId": "MDTWNJ21",

+"tenantId": "fba1bd1e195a404cacb9ce17a9b2b421"

+},

+"requestInfo": {

+"instanceName": "PCRF::module-0-2",

+"source": "VID",

+"suppressRollback": true

+},

+"relatedInstanceList": [

+{

+"relatedInstance": {

+"instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",

+"instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",

+"modelInfo": {

+"modelType": "volumeGroup",

+"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+"modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+"modelName": "vSAMP12..base..module-0",

+"modelVersion": "1"

+}

+}

+},

+{

+"relatedInstance": {

+"instanceId": "123456",

+"modelInfo": {

+"modelType": "service",

+"modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+"modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+"modelName": "SERVICE_MODEL_NAME",

+"modelVersion": "1.0"

+}

+}

+},

+{

+"relatedInstance": {

+"instanceId": "skask",

+"instanceName": "skask-test",

+"modelInfo": {

+"modelType": "vnf",

+"modelInvariantId": "skask",

+"modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+"modelName": "vSAMP12",

+"modelVersion": "1.0",

+"modelCustomizationName": "vSAMP12 1"

+}

+}

+}

+],

+"requestParameters": {

+"usePreload": false,

+"userParams" : [

+	{

+		"name" : "someUserParam",

+		"value" : "someValue"

+	},

+	{ 

+		"name": "sgi_protected_subnet_id", 

+		"value": "thisissomefakevalue" 

+	}

+]

+

+}

+}
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DBUpdateResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DBUpdateResponse.xml
new file mode 100644
index 0000000..110e432
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/DBUpdateResponse.xml
@@ -0,0 +1,4 @@
+
+
+<ns2:updateRequestResponse xmlns:ns2="http://com.att.mso/requestsdb"
+                           xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenerateVfModuleName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenerateVfModuleName_AAIResponse_Success.xml
new file mode 100644
index 0000000..1814735
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenerateVfModuleName_AAIResponse_Success.xml
@@ -0,0 +1,51 @@
+<generic-vnf xmlns="http://com.att.aai.inventory/v7">

+	<vnf-id>12345678-f41f-4822-9323-b75962763d74</vnf-id>

+	<vnf-name>STMTN5MMSC20</vnf-name>

+	<vnf-type>pcrf-capacity</vnf-type>

+	<service-id>SDN-MOBILITY</service-id>

+	<equipment-role>vPCRF</equipment-role>

+	<orchestration-status>pending-create</orchestration-status>

+	<in-maint>false</in-maint>

+	<is-closed-loop-disabled>false</is-closed-loop-disabled>

+	<model-invariant-id>introvert</model-invariant-id>

+	<model-version-id>2.0</model-version-id>

+	<resource-version>0000020</resource-version>

+	<vf-modules>

+		<vf-module>

+			<vf-module-id>lukewarm</vf-module-id>

+			<vf-module-name>PCRF::module-0-0</vf-module-name>

+			<model-invariant-id>extrovert</model-invariant-id>

+			<model-version-id>2.0</model-version-id>

+			<is-base-vf-module>true</is-base-vf-module>

+			<heat-stack-id>fastburn</heat-stack-id>

+			<module-index>2</module-index>

+			<orchestration-status>pending-create</orchestration-status>

+			<resource-version>0000074</resource-version>

+		</vf-module>

+		<vf-module>

+			<vf-module-id>supercool</vf-module-id>

+			<vf-module-name>PCRF::module-1-0</vf-module-name>

+			<model-invariant-id>extrovert</model-invariant-id>

+			<model-version-id>2.0</model-version-id>

+			<is-base-vf-module>false</is-base-vf-module>			

+			<heat-stack-id>slowburn</heat-stack-id>

+			<module-index>0</module-index>

+			<orchestration-status>pending-create</orchestration-status>

+			<resource-version>0000075</resource-version>

+		</vf-module>

+		<vf-module>

+			<vf-module-id>supercool</vf-module-id>

+			<vf-module-name>PCRF::module-1-0</vf-module-name>

+			<model-invariant-id>introvert</model-invariant-id>

+			<model-version-id>2.0</model-version-id>

+			<is-base-vf-module>false</is-base-vf-module>			

+			<heat-stack-id>slowburn</heat-stack-id>

+			<module-index>1</module-index>

+			<orchestration-status>pending-create</orchestration-status>

+			<resource-version>0000075</resource-version>

+		</vf-module>

+	</vf-modules>

+	<relationship-list/>

+	<l-interfaces/>

+	<lag-interfaces/>

+</generic-vnf>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
index b2560bc..85427e2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/GenericVnf.xml
@@ -1,38 +1,38 @@
-<generic-vnf xmlns="http://org.openecomp.aai.inventory/v7">
-	<vnf-id>skask</vnf-id>
-	<vnf-name>STMTN5MMSC20</vnf-name>
-	<vnf-type>pcrf-capacity</vnf-type>
-	<service-id>SDN-MOBILITY</service-id>
-	<equipment-role>vPCRF</equipment-role>
-	<orchestration-status>pending-create</orchestration-status>
-	<in-maint>false</in-maint>
-	<is-closed-loop-disabled>false</is-closed-loop-disabled>
-	<persona-model-id>introvert</persona-model-id>
-	<persona-model-version>2.0</persona-model-version>
-	<resource-version>0000020</resource-version>
-	<vf-modules>
-		<vf-module>
-			<vf-module-id>lukewarm</vf-module-id>
-			<vf-module-name>PCRF::module-0-0</vf-module-name>
-			<persona-model-id>introvert</persona-model-id>
-			<persona-model-version>2.0</persona-model-version>
-			<is-base-vf-module>true</is-base-vf-module>
-			<heat-stack-id>fastburn</heat-stack-id>
-			<orchestration-status>pending-create</orchestration-status>
-			<resource-version>0000074</resource-version>
-		</vf-module>
-		<vf-module>
-			<vf-module-id>supercool</vf-module-id>
-			<vf-module-name>PCRF::module-1-0</vf-module-name>
-			<persona-model-id>extrovert</persona-model-id>
-			<persona-model-version>2.0</persona-model-version>
-			<is-base-vf-module>false</is-base-vf-module>
-			<heat-stack-id>slowburn</heat-stack-id>
-			<orchestration-status>pending-create</orchestration-status>
-			<resource-version>0000075</resource-version>
-		</vf-module>
-	</vf-modules>
-	<relationship-list/>
-	<l-interfaces/>
-	<lag-interfaces/>
-</generic-vnf>
+<generic-vnf xmlns="http://com.att.aai.inventory/v7">

+	<vnf-id>skask</vnf-id>

+	<vnf-name>STMTN5MMSC20</vnf-name>

+	<vnf-type>pcrf-capacity</vnf-type>

+	<service-id>SDN-MOBILITY</service-id>

+	<equipment-role>vPCRF</equipment-role>

+	<orchestration-status>pending-create</orchestration-status>

+	<in-maint>false</in-maint>

+	<is-closed-loop-disabled>false</is-closed-loop-disabled>

+	<model-invariant-id>introvert</model-invariant-id>

+	<model-version-id>2.0</model-version-id>

+	<resource-version>0000020</resource-version>

+	<vf-modules>

+		<vf-module>

+			<vf-module-id>lukewarm</vf-module-id>

+			<vf-module-name>PCRF::module-0-0</vf-module-name>

+			<model-invariant-id>introvert</model-invariant-id>

+			<model-version-id>2.0</model-version-id>

+			<is-base-vf-module>true</is-base-vf-module>

+			<heat-stack-id>fastburn</heat-stack-id>

+			<orchestration-status>pending-create</orchestration-status>

+			<resource-version>0000074</resource-version>

+		</vf-module>

+		<vf-module>

+			<vf-module-id>supercool</vf-module-id>

+			<vf-module-name>PCRF::module-1-0</vf-module-name>

+			<model-invariant-id>extrovert</model-invariant-id>

+			<model-version-id>2.0</model-version-id>

+			<is-base-vf-module>false</is-base-vf-module>

+			<heat-stack-id>slowburn</heat-stack-id>

+			<orchestration-status>pending-create</orchestration-status>

+			<resource-version>0000075</resource-version>

+		</vf-module>

+	</vf-modules>

+	<relationship-list/>

+	<l-interfaces/>

+	<lag-interfaces/>

+</generic-vnf>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCSITopologyAssignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCSITopologyAssignCallback.xml
new file mode 100644
index 0000000..f6314e5
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCSITopologyAssignCallback.xml
@@ -0,0 +1,11 @@
+<output
+    xmlns="com:att:sdnctl:generic-resource">
+    <svc-request-id>094d311c-40bc-4ff1-9617-37c4226efcc3</svc-request-id>
+    <response-code>200</response-code>
+    <response-message></response-message>
+    <ack-final-indicator>Y</ack-final-indicator>
+    <service-response-information>
+        <instance-id>8462db9b-3e91-4e90-a2c8-6471313f87bf</instance-id>
+        <object-path>restconf/config/GENERIC-RESOURCE-API:services/service/8462db9b-3e91-4e90-a2c8-6471313f87bf/service-data/service-topology/</object-path>
+    </service-response-information>
+</output>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyActivateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyActivateCallback.xml
new file mode 100644
index 0000000..5fa58e9
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyActivateCallback.xml
@@ -0,0 +1,13 @@
+<output xmlns="com:att:sdnctl:vnf">

+	<vnf-information>

+		<vnf-id>skask</vnf-id>

+	</vnf-information>

+	<response-code>200</response-code>

+	<svc-request-id>{{REQUEST-ID}}</svc-request-id>

+	<ack-final-indicator>Y</ack-final-indicator>

+	<service-information>

+		<subscriber-name>dontcare</subscriber-name>

+		<service-instance-id>0</service-instance-id>

+		<service-type>SDN-MOBILITY</service-type>

+	</service-information>

+</output>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyAssignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyAssignCallback.xml
new file mode 100644
index 0000000..2b732f9
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyAssignCallback.xml
@@ -0,0 +1,16 @@
+	<output xmlns="com:att:sdnctl:vnf">

+		<vnf-information>

+			<vnf-id>skask</vnf-id>			

+		</vnf-information>

+		<response-code>200</response-code>

+		<svc-request-id>{{REQUEST-ID}}</svc-request-id>

+		<ack-final-indicator>Y</ack-final-indicator>

+		<service-information>

+			<subscriber-name>dontcare</subscriber-name>

+			<service-instance-id>0</service-instance-id>

+			<service-type>SDN-MOBILITY</service-type>

+		</service-information>

+		<instance-reference>

+			<object-path>restconf/SDNCObjectPath</object-path>

+		</instance-reference>

+	</output>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyChangeAssignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyChangeAssignCallback.xml
new file mode 100644
index 0000000..3e13877
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyChangeAssignCallback.xml
@@ -0,0 +1,13 @@
+	<output xmlns="com:att:sdnctl:vnf">

+		<vnf-information>

+			<vnf-id>skask</vnf-id>

+		</vnf-information>

+		<response-code>200</response-code>

+		<svc-request-id>{{REQUEST-ID}}</svc-request-id>

+		<ack-final-indicator>Y</ack-final-indicator>

+		<service-information>

+			<subscriber-name>dontcare</subscriber-name>

+			<service-instance-id>0</service-instance-id>

+			<service-type>SDN-MOBILITY</service-type>

+		</service-information>

+	</output>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
new file mode 100644
index 0000000..27cab6b
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallback.xml
@@ -0,0 +1,315 @@
+<output xmlns="com:att:sdnctl:vnf">

+<vnf-list xmlns="com:att:sdnctl:vnf">

+	<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

+	<service-data>

+		<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

+		<sdnc-request-header>

+			<svc-request-id>9ddf628a-9eca-430e-8974-22d520a31be1</svc-request-id>

+			<svc-action>assign</svc-action>

+			<svc-notification-url>https://msojra.infra.aic.att.net:8443/adapters/rest/SDNCNotify</svc-notification-url>

+		</sdnc-request-header>

+		<service-information>

+			<subscriber-name>notsurewecare</subscriber-name>

+			<service-instance-id>bd1b3789-6474-4935-94b2-90b656e035d0</service-instance-id>

+			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>

+			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+		</service-information>

+		<oper-status>

+			<order-status>PendingCreate</order-status>

+		</oper-status>

+		<vnf-request-information>

+			<aic-cloud-region>VNN1CA52LCP</aic-cloud-region>

+			<vnf-name>skask</vnf-name>

+			<generic-vnf-id>afd0f02a-1ddb-43bb-aded-5113e46e82ae</generic-vnf-id>

+			<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>

+			<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>

+			<tenant>33d209df14ac4c08ad60747185d2f3e0</tenant>

+			<vnf-id>bd1b3789-6474-4935-94b2-90b656e035d0</vnf-id>

+			<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>

+		</vnf-request-information>

+		<vnf-topology-information>

+			<vnf-assignments>

+				<vnf-networks>

+					<network-role>mog_exn</network-role>

+					<network-id>03dbd833-785c-40c0-bf32-37594b5334bc</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_exn_protected_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>6f82d234-41a4-48e9-a9e8-415667a72929</neutron-id>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter1</sriov-vlan-filter>

+					</sriov-vlan-filter-list>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         

+                     </sriov-vlan-filter-list>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_oam</network-role>

+					<network-id>3f181cde-9380-4c20-9d3a-e1a4ee74f994</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_oam_protected_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>713b6770-13fa-4949-8dbb-a1288c5e5932</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_cor_B</network-role>

+					<network-id>821a550a-3f50-4725-995b-f212d5caec7c</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>18926e56-12b6-4a4d-98b6-37e0c05626ee</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_cor_A</network-role>

+					<network-id>3dabf5c0-cffb-420c-8960-8499c74eb25f</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_cor_direct_net_2</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>35530b29-a4de-48ff-a014-111110ccc652</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_gn</network-role>

+					<network-id>3ce97321-6e7f-49af-bd12-f833e377c310</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_gn_direct_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>32bfdd2c-28e1-4895-87a6-373bf12c3129</neutron-id>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>mog_dmz</network-role>

+					<network-id>d43ca910-02a5-47dc-8510-100a68a3c9e0</network-id>

+					<network-name>MNS-25180-P-VNNYCA01_dmz_protected_net_1</network-name>

+					<contrail-network-fqdn/>

+					<subnet-id/>

+					<neutron-id>cb9500fb-943f-412e-aea6-458711564a75</neutron-id>

+				</vnf-networks>

+				<availability-zones>

+					<availability-zone>nova</availability-zone>

+				</availability-zones>

+				<vnf-vms>

+					<vm-type>ps</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS002</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS003</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPS004</vm-name>

+					</vm-names>

+					<vm-count>4</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.251</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.252</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>cm</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MCM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM002</vm-name>

+					</vm-names>

+					<vm-count>1</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.249</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.250</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.250</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.251</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>oam</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM002</vm-name>

+					</vm-names>

+					<vm-count>2</vm-count>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.252</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.251</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.249</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.250</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>pd</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPD001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MPD002</vm-name>

+					</vm-names>

+					<vm-count>2</vm-count>

+					<vm-networks>

+						<network-role>mog_dmz</network-role>

+						<network-ips>

+							<ip-address>107.225.25.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.225.25.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.225.254.253</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.254</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.253</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.239.167.249</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_exn</network-role>

+						<network-ips>

+							<ip-address>107.224.46.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.46.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.46.252</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.247</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.248</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.41.252</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_gn</network-role>

+						<network-ips>

+							<ip-address>107.224.41.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.41.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.41.252</floating-ip>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_cor_A</network-role>

+						<network-ips>

+							<ip-address>107.224.38.253</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.38.254</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+				<vnf-vms>

+					<vm-type>sm</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM002</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM003</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MSM004</vm-name>

+					</vm-names>

+					<vm-count>4</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.243</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.244</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.245</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.246</ip-address>

+						</network-ips>

+						<use-dhcp>N</use-dhcp>

+					</vm-networks>

+				</vnf-vms>

+			</vnf-assignments>

+			<vnf-topology-identifier>

+				<vnf-name>ZVNNMOGX01_base</vnf-name>

+				<service-type>SDN-MOBILITY</service-type>

+				<vnf-type>ZVNN1MOGX01 - VF AUG 1::module-0</vnf-type>

+				<generic-vnf-type>ZVNN1MOGX01-SVC/ZVNN1MOGX01 - VF AUG 1 1</generic-vnf-type>

+				<generic-vnf-name>ZVNN1MOGX01</generic-vnf-name>

+			</vnf-topology-identifier>

+		</vnf-topology-information>

+		<request-information>

+			<request-id>9ddf628a-9eca-430e-8974-22d520a31be1</request-id>

+			<notification-url/>

+			<source>PORTAL</source>

+			<request-action>VNFActivateRequest</request-action>

+		</request-information>

+	</service-data>

+	<service-status>

+		<response-code>200</response-code>

+		<final-indicator>Y</final-indicator>

+		<request-status>synccomplete</request-status>

+		<response-timestamp>2016-08-05T16:15:19.398Z</response-timestamp>

+		<rpc-name>vnf-topology-operation</rpc-name>

+		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>

+		<rpc-action>assign</rpc-action>

+	</service-status>

+</vnf-list>

+

+</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
new file mode 100644
index 0000000..be6f973
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModule.xml
@@ -0,0 +1,141 @@
+<output xmlns="com:att:sdnctl:vnf">

+	<vnf-list xmlns="com:att:sdnctl:vnf">

+	<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>

+	<service-status>

+		<response-code>200</response-code>

+		<final-indicator>Y</final-indicator>

+		<request-status>synccomplete</request-status>

+		<response-timestamp>2016-06-08T19:44:59.138Z</response-timestamp>

+		<rpc-name>vnf-topology-operation</rpc-name>

+		<vnfsdn-action>VNFActivateRequest</vnfsdn-action>

+		<rpc-action>assign</rpc-action>

+	</service-status>

+	<service-data>

+		<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743</vnf-id>

+		<service-information>

+			<subscriber-name>notsurewecare</subscriber-name>

+			<service-instance-id>28455973-1ee5-4ad1-8d35-c4732679743a</service-instance-id>

+			<service-type>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-type>

+			<service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

+		</service-information>

+		<sdnc-request-header>

+			<svc-request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</svc-request-id>

+			<svc-notification-url>http://mtanjv9moja01-eth1-0.aic.cip.att.com:8080/adapters/rest/SDNCNotify</svc-notification-url>

+			<svc-action>assign</svc-action>

+		</sdnc-request-header>

+		<vnf-request-information>

+			<aic-cloud-region>AAIAIC25</aic-cloud-region>

+			<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>

+			<generic-vnf-id>91ad7ab0-9ffd-471d-971c-3eb913a2cc75</generic-vnf-id>

+			<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>

+			<generic-vnf-name>MSOTEST06</generic-vnf-name>

+			<tenant>4ae1d3446a4c48b2bec44b6cfba06d68</tenant>

+			<vnf-id>28455973-1ee5-4ad1-8d35-c4732679743a</vnf-id>

+			<vnf-type>vSAMP3::base::module-0</vnf-type>

+		</vnf-request-information>

+		<oper-status>

+			<order-status>PendingCreate</order-status>			

+		</oper-status>

+		<vnf-topology-information>

+			<vnf-parameters>

+				<vnf-parameter-name>image</vnf-parameter-name>

+				<vnf-parameter-value>Ubuntu_Perf</vnf-parameter-value>

+			</vnf-parameters>

+			<vnf-parameters>

+				<vnf-parameter-name>flavor</vnf-parameter-name>

+				<vnf-parameter-value>m1.small</vnf-parameter-value>

+			</vnf-parameters>

+			<vnf-assignments>

+				<vnf-networks>

+					<network-role>int_imbl</network-role>

+					<network-id>680b7453-0ec4-4d96-b355-280d981d418f</network-id>

+					<network-name>Nimbus-25193-T-Willows2_int_imbl_net_1</network-name>

+					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_int_imbl_net_1</contrail-network-fqdn>

+					<subnet-id></subnet-id>

+					<ipv6-subnet-id>775607fb-e16a-45ef-94a7-82fba0d16eec</ipv6-subnet-id>

+					<neutron-id>640d07fb-e16a-45ef-94a7-82fba0d169bf</neutron-id>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter1</sriov-vlan-filter>

+					</sriov-vlan-filter-list>

+					<sriov-vlan-filter-list>

+						<sriov-vlan-filter>filter2</sriov-vlan-filter>                         

+                     </sriov-vlan-filter-list>

+				</vnf-networks>

+				<vnf-networks>

+					<network-role>sgi_protected</network-role>

+					<network-id>f9039ce9-e3cf-4716-b2d1-ec7912178ea4</network-id>

+					<network-name>Nimbus-25193-T-Willows2_sgi_protected_net_1</network-name>

+					<contrail-network-fqdn>default-domain:Nimbus-25193-T-Willows2:Nimbus-25193-T-Willows2_sgi_protected_net_1</contrail-network-fqdn>

+					<subnet-id>b9999ce9-e3cf-4716-b2d1-ec791217678c</subnet-id>

+					<ipv6-subnet-id></ipv6-subnet-id>

+					<neutron-id>bf11bba8-b971-4ab5-8281-215b3fedcd3c</neutron-id>

+				</vnf-networks>

+				<vnf-vms>

+					<vm-type>cm</vm-type>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01MCM001</vm-name>

+					</vm-names>

+					<vm-names>

+						<vm-name>ZVNN1MOGX01OAM002</vm-name>

+					</vm-names>

+					<vm-count>1</vm-count>

+					<vm-networks>

+						<network-role>mog_cor_B</network-role>

+						<network-ips>

+							<ip-address>107.224.36.249</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.224.36.250</ip-address>

+						</network-ips>

+						<network-ips-v6>

+							<ip-address-ipv6>2606:ae00:2e01:800::67</ip-address-ipv6>

+						</network-ips-v6>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip>107.224.41.252</floating-ip>

+						<floating-ip-v6>2001:1890:1001:2B32::29:C</floating-ip-v6>

+					</vm-networks>

+					<vm-networks>

+						<network-role>mog_oam</network-role>

+						<network-ips>

+							<ip-address>107.239.167.250</ip-address>

+						</network-ips>

+						<network-ips>

+							<ip-address>107.239.167.251</ip-address>

+						</network-ips>

+						<network-ips-v6>

+							<ip-address-ipv6>aa::aa::aa::aa::aa::aa</ip-address-ipv6>							

+						</network-ips-v6>

+						<network-ips-v6>

+							<ip-address-ipv6>bb::bb::bb::bb::bb::bb</ip-address-ipv6>

+						</network-ips-v6>

+						<interface-route-prefixes>							

+							<interface-route-prefix-cidr>1.2.3.4/26</interface-route-prefix-cidr>

+						</interface-route-prefixes>

+						<interface-route-prefixes>							

+							<interface-route-prefix-cidr>2002::/64</interface-route-prefix-cidr>

+						</interface-route-prefixes>

+						<use-dhcp>N</use-dhcp>

+						<floating-ip-v6>1111:1890:1001:2B32::29:D</floating-ip-v6>

+					</vm-networks>

+				</vnf-vms>

+				<availability-zones>

+					<availability-zone>nova</availability-zone>

+				</availability-zones>

+			</vnf-assignments>

+			<vnf-topology-identifier>

+				<vnf-name>MSOTEST06-vSAMP3::base::module-0</vnf-name>

+				<service-type>SDN-MOBILITY</service-type>

+				<vnf-type>vSAMP3::base::module-0</vnf-type>

+				<generic-vnf-type>Test/vSAMP3 1</generic-vnf-type>

+				<generic-vnf-name>MSOTEST06</generic-vnf-name>

+			</vnf-topology-identifier>			

+		</vnf-topology-information>

+		<request-information>

+			<request-id>5e168556-a5c6-4813-bff3-cc03007afbbc</request-id>

+			<notification-url></notification-url>

+			<source>SoapUI-bns-vf-base-vSAMP3-9001</source>

+			<request-action>VNFActivateRequest</request-action>			

+		</request-information>

+	</service-data>

+</vnf-list>

+</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestCreateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestCreateCallback.xml
new file mode 100644
index 0000000..3afcb3f
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestCreateCallback.xml
@@ -0,0 +1,55 @@
+<createVfModuleResponse>

+    <vnfId>skask</vnfId>

+    <vfModuleId>supercool</vfModuleId>

+    <vfModuleStackId>slowburn</vfModuleStackId>

+    <vfModuleCreated>true</vfModuleCreated>

+    <vfModuleOutputs>

+        <entry>

+            <key>key1</key>

+            <value>value1</value>

+        </entry>

+        <entry>

+            <key>key2</key>

+            <value>value2</value>

+        </entry>

+        <entry>

+<key>server1_private_ip</key>

+<value>192.168.28.3</value>

+</entry>

+<entry>

+<key>contrail-service-instance-fqdn</key>

+<value>default-domain:MSOTest:MsoNW-RA</value>

+</entry>

+<entry>

+<key>policyKey1_contrail_network_policy_fqdn</key>

+<value>MSOTest:DefaultPolicyFQDN1</value>

+</entry>

+<entry>

+<key>policyKey2_contrail_network_policy_fqdn</key>

+<value>MSOTest:DefaultPolicyFQDN2</value>

+</entry>

+<entry>

+<key>oam_management_v6_address</key>

+<value>2000:abc:bce:1111</value>

+</entry>

+<entry>

+<key>oam_management_v4_address</key>

+<value>127.0.0.1</value>

+</entry>

+    </vfModuleOutputs>

+    <rollback> <!-- JC's doc has "vfModuleRollback" -->

+        <vnfId>skask</vnfId>

+        <vfModuleId>supercool</vfModuleId>

+        <vfModuleStackId>slowburn</vfModuleStackId>

+        <vfModuleCreated>true</vfModuleCreated>

+        <tenantId>tenantId</tenantId>

+        <cloudSiteId>cloudSiteId</cloudSiteId>

+        <msoRequest>

+            <requestId>requestId</requestId>

+            <serviceInstanceId>serviceInstanceId</serviceInstanceId>

+        </msoRequest>

+        <messageId>{{MESSAGE-ID}}</messageId> <!-- JC's doc does not have this -->

+    </rollback>

+    <messageId>{{MESSAGE-ID}}</messageId>

+</createVfModuleResponse>

+

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestUpdateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestUpdateCallback.xml
new file mode 100644
index 0000000..2d3ebeb
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestUpdateCallback.xml
@@ -0,0 +1,16 @@
+<updateVfModuleResponse>

+    <vnfId>skask</vnfId>

+    <vfModuleId>supercool</vfModuleId>

+    <vfModuleStackId>slowburn</vfModuleStackId>

+    <vfModuleOutputs>

+        <entry>

+            <key>key1</key>

+            <value>value1</value>

+        </entry>

+        <entry>

+            <key>key2</key>

+            <value>value2</value>

+        </entry>

+    </vfModuleOutputs>

+    <messageId>{{MESSAGE-ID}}</messageId>

+</updateVfModuleResponse>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml
new file mode 100644
index 0000000..af2bd7a
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VNFAdapterRestVolumeGroupCallback.xml
@@ -0,0 +1,15 @@
+<updateVolumeGroupResponse>

+    <volumeGroupId>78987</volumeGroupId>

+    <volumeGroupStackId>slowburn</volumeGroupStackId>

+    <vfModuleOutputs>

+        <entry>

+            <key>key1</key>

+            <value>value1</value>

+        </entry>

+        <entry>

+            <key>key2</key>

+            <value>value2</value>

+        </entry>

+    </vfModuleOutputs>

+    <messageId>{{MESSAGE-ID}}</messageId>

+</updateVolumeGroupResponse>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
new file mode 100644
index 0000000..8de2f95
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-lukewarm.xml
@@ -0,0 +1,10 @@
+<vf-module xmlns="http://com.att.aai.inventory/v7">

+	<vf-module-id>lukewarm</vf-module-id>

+	<vf-module-name>PCRF::module-1</vf-module-name>

+	<heat-stack-id>slowburn</heat-stack-id>

+	<orchestration-status>pending-create</orchestration-status>

+	<is-base-vf-module>true</is-base-vf-module>

+	<resource-version>330-90</resource-version>

+	<model-invariant-id>introvert</model-invariant-id>

+	<model-version-id>2.0</model-version-id>

+</vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
index a71441e..e72d23d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-new.xml
@@ -1,9 +1,9 @@
-<vf-module xmlns="http://org.openecomp.aai.inventory/v7">
-	<vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>
-	<vf-module-name>PCRF::module-0-2</vf-module-name>
-	<persona-model-id>00000000-0000-0000-0000-000000000000</persona-model-id>
-	<persona-model-version>1.0</persona-model-version>
-	<is-base-vf-module>false</is-base-vf-module>
-	<orchestration-status>pending-create</orchestration-status>
-	<resource-version>330-90</resource-version>
+<vf-module xmlns="http://com.att.aai.inventory/v7">

+	<vf-module-id>b37d96db-7d2c-47ce-bf61-a6c7b82fe161</vf-module-id>

+	<vf-module-name>PCRF::module-0-2</vf-module-name>

+	<model-invariant-id>00000000-0000-0000-0000-000000000000</model-invariant-id>

+	<model-version-id>1.0</model-version-id>

+	<is-base-vf-module>false</is-base-vf-module>

+	<orchestration-status>pending-create</orchestration-status>

+	<resource-version>330-90</resource-version>

 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
index 1066b17..15a84aa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/VfModule-supercool.xml
@@ -1,27 +1,27 @@
-<vf-module xmlns="http://org.openecomp.aai.inventory/v7">
-	<vf-module-id>supercool</vf-module-id>
-	<vf-module-name>PCRF::module-2</vf-module-name>
-	<heat-stack-id>fastburn</heat-stack-id>
-	<orchestration-status>pending-create</orchestration-status>
-	<is-base-vf-module>false</is-base-vf-module>
-	<resource-version>330-89</resource-version>
-	<persona-model-id>introvert</persona-model-id>
-	<persona-model-version>2.0</persona-model-version>
-	<relationship-list>
-		<relationship>
-			<related-to>volume-group</related-to>
-			<relationship-data>
-				<relationship-key>cloud-region.cloud-owner</relationship-key>
-				<relationship-value>att-aic</relationship-value>
-			</relationship-data>
-			<relationship-data>
-				<relationship-key>cloud-region.cloud-region-id</relationship-key>
-				<relationship-value>pdk1</relationship-value>
-			</relationship-data>
-			<relationship-data>
-				<relationship-key>volume-group.volume-group-id</relationship-key>
-				<relationship-value>78987</relationship-value>
-			</relationship-data>
-		</relationship>
-	</relationship-list>
+<vf-module xmlns="http://com.att.aai.inventory/v7">

+	<vf-module-id>supercool</vf-module-id>

+	<vf-module-name>PCRF::module-2</vf-module-name>

+	<heat-stack-id>fastburn</heat-stack-id>

+	<orchestration-status>pending-create</orchestration-status>

+	<is-base-vf-module>false</is-base-vf-module>

+	<resource-version>330-89</resource-version>

+	<model-invariant-id>introvert</model-invariant-id>

+	<model-version-id>2.0</model-version-id>

+	<relationship-list>

+		<relationship>

+			<related-to>volume-group</related-to>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-owner</relationship-key>

+				<relationship-value>att-aic</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-region-id</relationship-key>

+				<relationship-value>pdk1</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>volume-group.volume-group-id</relationship-key>

+				<relationship-value>78987</relationship-value>

+			</relationship-data>

+		</relationship>

+	</relationship-list>

 </vf-module>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
index ac340c7..b14d495 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -10,7 +10,8 @@ mso.csi.usrname=mso
 mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7

 

 mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess

-

+mso.workflow.message.endpoint=http://localhost:8080/mso/WorkflowMessage

+mso.catalog.db.endpoint=http://localhost:8090

 mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter

 mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC

 

@@ -30,6 +31,7 @@ mso.sdnc.firewall.yang.model=http://com/openecomp/svc/mis/firewall-lite-gui
 mso.sdnc.firewall.yang.model.version=2015-05-15

 mso.sdnc.password=3141634BF7E070AA289CF2892C986C0B

 mso.sdnc.timeout.firewall.minutes=20

+mso.callbackRetryAttempts=5

 mso.sdnc.timeout=PT10S

 mso.sdnc.timeout.ucpe.async.hours=120

 mso.sdnc.timeout.ucpe.async.minutes=5

@@ -56,7 +58,7 @@ aai.endpoint=http://localhost:28090
 # Example to override default version for a resource:

 #mso.workflow.default.aai.vce.version=6

 #mso.workflow.default.aai.v6.vce.uri=/aai/v6/network/vces/vce

-

+mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/

 mso.workflow.global.default.aai.version=8

 mso.workflow.default.aai.cloud-region.version=9

 mso.workflow.default.aai.generic-vnf.version=9

diff --git a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java
index 07bde0a..c4139c9 100644
--- a/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java
+++ b/bpmn/MSOMockServer/src/main/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java
@@ -27,6 +27,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;

 import static com.github.tomakehurst.wiremock.client.WireMock.delete;

 import static com.github.tomakehurst.wiremock.client.WireMock.get;

+import static com.github.tomakehurst.wiremock.client.WireMock.post;

 import static com.github.tomakehurst.wiremock.client.WireMock.patch;

 import static com.github.tomakehurst.wiremock.client.WireMock.put;

 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;

@@ -516,6 +517,129 @@ public class StubResponseAAI {
 						.withStatus(200)));

 	}

 	

+	/////////////

+	

+	public static void MockVNFAdapterRestVfModule() {

+		stubFor(put(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules/supercool"))

+			.willReturn(aResponse()

+				.withStatus(202)

+				.withHeader("Content-Type", "application/xml")));

+		stubFor(post(urlMatching("/vnfs/v1/vnfs/.*/vf-modules"))

+				.willReturn(aResponse()

+					.withStatus(202)

+					.withHeader("Content-Type", "application/xml")));

+		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules"))

+			.willReturn(aResponse()

+				.withStatus(202)

+				.withHeader("Content-Type", "application/xml")));

+		stubFor(put(urlEqualTo("/vnfs/v1/volume-groups/78987"))

+			.willReturn(aResponse()

+				.withStatus(202)

+				.withHeader("Content-Type", "application/xml")));

+	}

+	

+	public static void MockDBUpdateVfModule(){

+		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))

+			.willReturn(aResponse()

+				.withStatus(200)

+			    .withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/DBUpdateResponse.xml")));

+	}

+	

+	// start of mocks used locally and by other VF Module unit tests

+	public static void MockSDNCAdapterVfModule() {

+		// simplified the implementation to return "success" for all requests

+		stubFor(post(urlEqualTo("/SDNCAdapter"))

+//			.withRequestBody(containing("SvcInstanceId><"))

+			.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/StandardSDNCSynchResponse.xml")));

+

+	}

+	

+	// start of mocks used locally and by other VF Module unit tests

+	public static void MockAAIVfModule() {

+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))

+			.atPriority(1)

+			.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/VfModule-supercool.xml")));		

+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/lukewarm"))

+			.atPriority(2)

+			.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/VfModule-lukewarm.xml")));

+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))

+			.atPriority(5)

+			.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/VfModule-new.xml")));

+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask[?]depth=1"))

+			.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/GenericVnf.xml")));

+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))

+//			.withRequestBody(containing("PCRF"))

+			.willReturn(aResponse()

+				.withStatus(200)));

+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))

+//				.withRequestBody(containing("PCRF"))

+				.willReturn(aResponse()

+					.withStatus(200)));

+		// HTTP PUT stub still used by CreateAAIvfModuleVolumeGroup

+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))

+				.withRequestBody(containing("PCRF"))

+				.willReturn(aResponse()

+					.withStatus(200)));

+		// HTTP PUT stub still used by DoCreateVfModuleTest

+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))

+				.withRequestBody(containing("MODULELABEL"))

+				.willReturn(aResponse()

+					.withStatus(200)));

+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))

+			.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/ConfirmVolumeGroupTenantResponse.xml")));

+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))

+				.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/ConfirmVolumeGroupTenantResponse.xml")));

+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/MDTWNJ21/volume-groups/volume-group/78987"))

+			.willReturn(aResponse()

+				.withStatus(200)

+				.withHeader("Content-Type", "text/xml")

+				.withBodyFile("VfModularity/VolumeGroup.xml")));

+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/volume-groups/volume-group/78987"))

+				.willReturn(aResponse()

+					.withStatus(200)

+					.withHeader("Content-Type", "text/xml")

+					.withBodyFile("VfModularity/VolumeGroup.xml")));

+		stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group/78987[?]resource-version=0000020"))

+			     .willReturn(aResponse()

+			     .withStatus(200)

+			     .withHeader("Content-Type", "text/xml")

+			     .withBodyFile("DeleteCinderVolumeV1/DeleteVolumeId_AAIResponse_Success.xml")));

+		stubFor(put(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))

+				  .willReturn(aResponse()

+				  .withStatus(200)

+				  .withHeader("Content-Type", "text/xml")

+				  .withBodyFile("VfModularity/AddNetworkPolicy_AAIResponse_Success.xml")));

+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/NEWvBNGModuleId"))

+				.withRequestBody(containing("NEWvBNGModuleId"))

+				.willReturn(aResponse()

+					.withStatus(200)));

+	}

+

+	

+	

+	//////////////

 

 	/**

 	 * Cloud infrastructure below

@@ -607,6 +731,12 @@ public class StubResponseAAI {
 						.withStatus(returnCode)));

 	}

 

+	public static void MockAAIVfModuleBadPatch(String endpoint, int statusCode) {

+		stubFor(patch(urlMatching(endpoint))

+			.willReturn(aResponse()

+				.withStatus(statusCode)));

+	}

+	

 	//// Deprecated Stubs below - to be deleted once unit test that reference them are refactored to use common ones above ////

 	@Deprecated

 	public static void MockGetVceById(){

diff --git a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
index e4eee6d..ea9ca62 100644
--- a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
+++ b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,19 +25,18 @@ import java.util.Arrays;
 
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
-import org.apache.http.message.BasicHeader;
 import org.apache.http.util.EntityUtils;
 
 /**
  * An immutable class that encapsulates an API response.
- *
+ * 
  * @version 1.0
  * @since 1.0
  */
 public class APIResponse {
     private final int statusCode;
     private final byte[] responseBody;
-    private final BasicHeader[] headers;
+    private final HttpHeader[] headers;
 
     /**
      * Internal method used to create http headers using the specified
@@ -46,17 +45,17 @@ public class APIResponse {
      * @param httpResponse used to create headers
      * @return http headers
      */
-    private static BasicHeader[] buildHeaders(final HttpResponse httpResponse) {
+    private static HttpHeader[] buildHeaders(final HttpResponse httpResponse) {
         final Header[] headers = httpResponse.getAllHeaders();
 
-        BasicHeader[] httpHeaders = new BasicHeader[headers.length];
+        HttpHeader[] httpHeaders = new HttpHeader[headers.length];
         for (int i = 0; i < headers.length; ++i) {
             final Header header = headers[i];
             final String name = header.getName();
-            final String value = header.getValue();
-            final BasicHeader httpHeader = new BasicHeader(name, value);
+            final String value = header.getValue(); 
+            final HttpHeader httpHeader = new HttpHeader(name, value);
             httpHeaders[i] = httpHeader;
-        }
+        } 
 
         return httpHeaders;
     }
@@ -90,7 +89,7 @@ public class APIResponse {
     /**
      * Gets the http status code returned by the api server.
      * <p>
-     * For example, status code 200 represents 'OK.'
+     * For example, status code 200 represents 'OK.' 
      *
      * @return status code
      */
@@ -128,15 +127,15 @@ public class APIResponse {
     /**
      * Gets a list of all the headers returned by the API response.
      *
-     * @return an array of all the BasicHeaders
+     * @return an array of all the HttpHeaders 
      */
-    public BasicHeader[] getAllHeaders() {
+    public HttpHeader[] getAllHeaders() {
         // avoid exposing internals, create copy
         return Arrays.copyOf(this.headers, this.headers.length);
     }
 
     public String getFirstHeader(String name) {
-        for (BasicHeader header : headers) {
+        for (HttpHeader header : headers) {
             if (header.getName().equals(name)) {
                 return header.getValue();
             }
diff --git a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/HttpHeader.java b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/HttpHeader.java
new file mode 100644
index 0000000..e0d6c30
--- /dev/null
+++ b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/HttpHeader.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.rest;
+
+/**
+ * An immutable class used to wrap an http header.
+ *
+ * @version 1.0
+ * @since 1.0
+ */
+public class HttpHeader {
+    private final String name;
+    private final String value;
+
+    /**
+     * Create an http header using the specified name and value
+     *
+     * @param name name of http header
+     * @param value value of http header
+     */
+    public HttpHeader(final String name, final String value) {
+        if (name == null) {
+            throw new IllegalArgumentException("Name may not be null.");
+        }
+
+        this.name = name;
+        this.value = value;
+    }
+
+    /**
+     * Gets the header name.
+     * 
+     * @return header name
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Gets the header value.
+     * 
+     * @return header value 
+     */
+    public String getValue() {
+        return this.value;
+    }
+}
diff --git a/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/APIResponseESTest.java b/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/APIResponseESTest.java
index 2bd4dbd..e44a44d 100644
--- a/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/APIResponseESTest.java
+++ b/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/APIResponseESTest.java
@@ -39,7 +39,6 @@ import org.apache.http.StatusLine;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.EnglishReasonPhraseCatalog;
-import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.message.BasicStatusLine;
 import org.evosuite.runtime.EvoRunner;
@@ -173,7 +172,7 @@ public class APIResponseESTest extends APIResponseESTestscaffolding {
       BasicHttpResponse basicHttpResponse0 = new BasicHttpResponse((ProtocolVersion) null, 0, "");
       basicHttpResponse0.addHeader("", "");
       APIResponse aPIResponse0 = new APIResponse((HttpResponse) basicHttpResponse0);
-      BasicHeader[] httpHeaderArray0 = aPIResponse0.getAllHeaders();
+      HttpHeader[] httpHeaderArray0 = aPIResponse0.getAllHeaders();
       assertNotNull(httpHeaderArray0);
   }
 
@@ -181,7 +180,7 @@ public class APIResponseESTest extends APIResponseESTestscaffolding {
   public void test11()  throws Throwable  {
       BasicHttpResponse basicHttpResponse0 = new BasicHttpResponse((ProtocolVersion) null, 1471, "0fVXWr>");
       APIResponse aPIResponse0 = new APIResponse((HttpResponse) basicHttpResponse0);
-      BasicHeader[] httpHeaderArray0 = aPIResponse0.getAllHeaders();
+      HttpHeader[] httpHeaderArray0 = aPIResponse0.getAllHeaders();
       assertNotNull(httpHeaderArray0);
   }
 
@@ -212,11 +211,11 @@ public class APIResponseESTest extends APIResponseESTestscaffolding {
       aPIResponse0.getResponseBodyAsString();
       basicHttpResponse0.getStatusLine();
       aPIResponse0.getStatusCode();
-      BasicHeader[] httpHeaderArray0 = new BasicHeader[2];
-      BasicHeader httpHeader0 = mock(BasicHeader.class, new ViolatedAssumptionAnswer());
+      HttpHeader[] httpHeaderArray0 = new HttpHeader[2];
+      HttpHeader httpHeader0 = mock(HttpHeader.class, new ViolatedAssumptionAnswer());
       doReturn((String) null).when(httpHeader0).getName();
       httpHeaderArray0[0] = httpHeader0;
-      BasicHeader httpHeader1 = mock(BasicHeader.class, new ViolatedAssumptionAnswer());
+      HttpHeader httpHeader1 = mock(HttpHeader.class, new ViolatedAssumptionAnswer());
       httpHeaderArray0[1] = httpHeader1;
       PrivateAccess.setVariable((Class<APIResponse>) APIResponse.class, aPIResponse0, "headers", (Object) httpHeaderArray0);
       // Undeclared exception!
diff --git a/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/HttpHeaderESTest.java b/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/HttpHeaderESTest.java
new file mode 100644
index 0000000..f0aeee0
--- /dev/null
+++ b/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/HttpHeaderESTest.java
@@ -0,0 +1,99 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 11:47:07 GMT 2016
+ */
+
+/*- 
+ * ============LICENSE_START======================================================= 
+ * OPENECOMP - MSO 
+ * ================================================================================ 
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.rest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.PrivateAccess;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+public class HttpHeaderESTest extends HttpHeaderESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      HttpHeader httpHeader0 = new HttpHeader("Fw", "WD#>QF/v6_|_A");
+      String string0 = httpHeader0.getValue();
+      assertEquals("WD#>QF/v6_|_A", string0);
+      assertEquals("Fw", httpHeader0.getName());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      HttpHeader httpHeader0 = new HttpHeader("", "");
+      String string0 = httpHeader0.getValue();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      HttpHeader httpHeader0 = new HttpHeader("Nae may no be null.", "Nae may no be null.");
+      PrivateAccess.setVariable((Class<HttpHeader>) HttpHeader.class, httpHeader0, "name", (Object) null);
+      String string0 = httpHeader0.getName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      HttpHeader httpHeader0 = new HttpHeader("", "EIqJp");
+      String string0 = httpHeader0.getName();
+      assertEquals("EIqJp", httpHeader0.getValue());
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      HttpHeader httpHeader0 = null;
+      try {
+        httpHeader0 = new HttpHeader((String) null, (String) null);
+        fail("Expecting exception: IllegalArgumentException");
+      
+      } catch(IllegalArgumentException e) {
+         //
+         // Name may not be null.
+         //
+         verifyException("org.openecomp.mso.rest.HttpHeader", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      HttpHeader httpHeader0 = new HttpHeader("Nae may no be null.", "Nae may no be null.");
+      String string0 = httpHeader0.getName();
+      assertEquals("Nae may no be null.", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      HttpHeader httpHeader0 = new HttpHeader("|SJ`pSz:BCB1o8~", (String) null);
+      String string0 = httpHeader0.getValue();
+      assertNull(string0);
+  }
+}
diff --git a/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/HttpHeaderESTestscaffolding.java b/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/HttpHeaderESTestscaffolding.java
new file mode 100644
index 0000000..0438c1f
--- /dev/null
+++ b/bpmn/MSORESTClient/src/test/java/org/openecomp/mso/rest/HttpHeaderESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 11:47:07 GMT 2016
+ */
+
+/*- 
+ * ============LICENSE_START======================================================= 
+ * OPENECOMP - MSO 
+ * ================================================================================ 
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.rest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class HttpHeaderESTestscaffolding {
+
+  @org.junit.Rule 
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone(); 
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass 
+  public static void initEvoSuiteFramework() { 
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.rest.HttpHeader"; 
+    org.evosuite.runtime.GuiSupport.initialize(); 
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true; 
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED; 
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT(); 
+    org.evosuite.runtime.classhandling.JDKClassResetter.init(); 
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
+  } 
+
+  @AfterClass 
+  public static void clearEvoSuiteFramework(){ 
+    Sandbox.resetDefaultSecurityManager(); 
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone()); 
+  } 
+
+  @Before 
+  public void initTestCase(){ 
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler(); 
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode(); 
+     
+    org.evosuite.runtime.GuiSupport.setHeadless(); 
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime(); 
+    org.evosuite.runtime.agent.InstrumentingAgent.activate(); 
+  } 
+
+  @After 
+  public void doneWithTestCase(){ 
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks(); 
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset(); 
+    resetClasses(); 
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode(); 
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate(); 
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode(); 
+  } 
+
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(HttpHeaderESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.rest.HttpHeader"
+    );
+  } 
+
+  private static void resetClasses() {
+  }
+}
diff --git a/common/src/main/java/org/openecomp/mso/logger/MessageEnum.java b/common/src/main/java/org/openecomp/mso/logger/MessageEnum.java
index 53a23c0..dfe2bc3 100644
--- a/common/src/main/java/org/openecomp/mso/logger/MessageEnum.java
+++ b/common/src/main/java/org/openecomp/mso/logger/MessageEnum.java
@@ -1,230 +1,231 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.logger;
-
-
-import com.att.eelf.i18n.EELFResolvableErrorEnum;
-import com.att.eelf.i18n.EELFResourceManager;
-
-public enum MessageEnum implements EELFResolvableErrorEnum{
-	// Api Handler Messages
-	APIH_REQUEST_NULL,
-	APIH_QUERY_FOUND,
-	APIH_QUERY_NOT_FOUND,
-	APIH_QUERY_PARAM_WRONG,
-	APIH_DB_ACCESS_EXC,
-	APIH_DB_ACCESS_EXC_REASON,
-	APIH_VALIDATION_ERROR,
-	APIH_REQUEST_VALIDATION_ERROR,
-	APIH_SERVICE_VALIDATION_ERROR,
-	APIH_GENERAL_EXCEPTION_ARG,
-	APIH_GENERAL_EXCEPTION,
-	APIH_GENERAL_WARNING,
-	APIH_AUDIT_EXEC,
-	APIH_GENERAL_METRICS,
-	APIH_DUPLICATE_CHECK_EXC,
-	APIH_DUPLICATE_FOUND,
-	APIH_BAD_ORDER,
-	APIH_DB_ATTRIBUTE_NOT_FOUND,
-	APIH_BPEL_COMMUNICATE_ERROR,
-	APIH_BPEL_RESPONSE_ERROR,
-	APIH_WARP_REQUEST,
-	APIH_ERROR_FROM_BPEL_SERVER,
-	APIH_DB_INSERT_EXC,
-	APIH_DB_UPDATE_EXC,
-	APIH_NO_PROPERTIES,
-	APIH_PROPERTY_LOAD_SUC,
-	APIH_LOAD_PROPERTIES_FAIL,
-	APIH_SDNC_COMMUNICATE_ERROR,
-	APIH_SDNC_RESPONSE_ERROR,
-	APIH_CANNOT_READ_SCHEMA,
-	APIH_HEALTH_CHECK_EXCEPTION,
-	APIH_REQUEST_VALIDATION_ERROR_REASON,
-	APIH_JAXB_MARSH_ERROR,
-	APIH_JAXB_UNMARSH_ERROR,
-	APIH_VNFREQUEST_VALIDATION_ERROR,
-	APIH_DOM2STR_ERROR,
-	APIH_READ_VNFOUTPUT_CLOB_EXCEPTION,
-	APIH_DUPLICATE_CHECK_EXC_ATT,
-	APIH_GENERATED_REQUEST_ID,
-	APIH_GENERATED_SERVICE_INSTANCE_ID,
-	APIH_REPLACE_REQUEST_ID,
-	// Resource Adapter Messages
-	RA_GENERAL_EXCEPTION_ARG,
-	RA_GENERAL_EXCEPTION,
-	RA_GENERAL_WARNING,
-	RA_MISSING_PARAM,
-	RA_AUDIT_EXEC,
-	RA_GENERAL_METRICS,
-	RA_CREATE_STACK_TIMEOUT,
-	RA_DELETE_STACK_TIMEOUT,
-	RA_UPDATE_STACK_TIMEOUT,
-	RA_CONNECTION_EXCEPTION,
-	RA_PARSING_ERROR,
-	RA_PROPERTIES_NOT_FOUND,
-	RA_LOAD_PROPERTIES_SUC,
-	RA_NETWORK_ALREADY_EXIST,
-	RA_UPDATE_NETWORK_ERR,
-	RA_CREATE_STACK_ERR,
-	RA_UPDATE_STACK_ERR,
-	RA_CREATE_TENANT_ERR,
-	RA_NETWORK_NOT_FOUND,
-	RA_NETWORK_ORCHE_MODE_NOT_SUPPORT,
-	RA_CREATE_NETWORK_EXC,
-	RA_PARAM_NOT_FOUND,
-	RA_CONFIG_EXC,
-	RA_UNKOWN_PARAM,
-	RA_VLAN_PARSE,
-	RA_DELETE_NETWORK_EXC,
-	RA_ROLLBACK_NULL,
-	RA_TENANT_NOT_FOUND,
-	RA_QUERY_NETWORK_EXC,
-	RA_CREATE_NETWORK_NOTIF_EXC,
-	RA_ASYNC_ROLLBACK,
-	RA_WSDL_NOT_FOUND,
-	RA_WSDL_URL_CONVENTION_EXC,
-	RA_INIT_NOTIF_EXC,
-	RA_SET_CALLBACK_AUTH_EXC,
-	RA_FAULT_INFO_EXC,
-	RA_MARSHING_ERROR,
-	RA_PARSING_REQUEST_ERROR,
-	RA_SEND_REQUEST_SDNC,
-	RA_RESPONSE_FROM_SDNC,
-	RA_EXCEPTION_COMMUNICATE_SDNC,
-	RA_EVALUATE_XPATH_ERROR,
-	RA_ANALYZE_ERROR_EXC,
-	RA_ERROR_GET_RESPONSE_SDNC,
-	RA_CALLBACK_BPEL,
-	RA_INIT_CALLBACK_WSDL_ERR,
-	RA_CALLBACK_BPEL_EXC,
-	RA_CALLBACK_BPEL_COMPLETE,
-	RA_SDNC_MISS_CONFIG_PARAM,
-	RA_SDNC_INVALID_CONFIG,
-	RA_PRINT_URL,
-	RA_ERROR_CREATE_SDNC_REQUEST,
-	RA_ERROR_CREATE_SDNC_RESPONSE,
-	RA_ERROR_CONVERT_XML2STR,
-	RA_RECEIVE_SDNC_NOTIF,
-	RA_INIT_SDNC_ADAPTER,
-	RA_SEND_REQUEST_APPC_ERR,
-	RA_SEND_REQUEST_SDNC_ERR,
-	RA_RECEIVE_BPEL_REQUEST,
-	RA_TENANT_ALREADY_EXIST,
-	RA_UPDATE_TENANT_ERR,
-	RA_DELETE_TEMAMT_ERR,
-	RA_ROLLBACK_TENANT_ERR,
-	RA_QUERY_VNF_ERR,
-	RA_VNF_ALREADY_EXIST,
-	RA_VNF_UNKNOWN_PARAM,
-	RA_VNF_EXTRA_PARAM,
-	RA_CREATE_VNF_ERR,
-	RA_VNF_NOT_EXIST,
-	RA_UPDATE_VNF_ERR,
-	RA_DELETE_VNF_ERR,
-	RA_ASYNC_CREATE_VNF,
-	RA_SEND_VNF_NOTIF_ERR,
-	RA_ASYNC_CREATE_VNF_COMPLETE,
-	RA_ASYNC_UPDATE_VNF,
-	RA_ASYNC_UPDATE_VNF_COMPLETE,
-	RA_ASYNC_QUERY_VNF,
-	RA_ASYNC_QUERY_VNF_COMPLETE,
-	RA_ASYNC_DELETE_VNF,
-	RA_ASYNC_DELETE_VNF_COMPLETE,
-	RA_ASYNC_ROLLBACK_VNF,
-	RA_ASYNC_ROLLBACK_VNF_COMPLETE,
-	RA_ROLLBACK_VNF_ERR,
-	RA_DB_INVALID_STATUS,
-	RA_CANT_UPDATE_REQUEST,
-	RA_DB_REQUEST_NOT_EXIST,
-	RA_CONFIG_NOT_FOUND,
-	RA_CONFIG_LOAD,
-	RA_RECEIVE_WORKFLOW_MESSAGE,
-	// BPEL engine Messages
-	BPMN_GENERAL_INFO,
-	BPMN_GENERAL_EXCEPTION_ARG,
-	BPMN_GENERAL_EXCEPTION,
-	BPMN_GENERAL_WARNING,
-	BPMN_AUDIT_EXEC,
-	BPMN_GENERAL_METRICS,
-	BPMN_URN_MAPPING_FAIL,
-	BPMN_VARIABLE_NULL,
-	BPMN_SDNC_CALLBACK_EXCEPTION,
-	// ASDC Messages
-	ASDC_GENERAL_EXCEPTION_ARG,
-	ASDC_GENERAL_EXCEPTION,
-	ASDC_GENERAL_WARNING,
-	ASDC_AUDIT_EXEC,
-	ASDC_GENERAL_METRICS,
-	ASDC_CREATE_SERVICE,
-	ASDC_ARTIFACT_ALREADY_DEPLOYED,
-	ASDC_CREATE_ARTIFACT,
-	ASDC_ARTIFACT_INSTALL_EXC,
-	ASDC_ARTIFACT_ALREADY_DEPLOYED_DETAIL,
-	ASDC_ARTIFACT_NOT_DEPLOYED_DETAIL,
-	ASDC_ARTIFACT_CHECK_EXC,
-	ASDC_INIT_ASDC_CLIENT_EXC,
-	ASDC_INIT_ASDC_CLIENT_SUC,
-	ASDC_LOAD_ASDC_CLIENT_EXC,
-	ASDC_SINGLETON_CHECKT_EXC,
-	ASDC_SHUTDOWN_ASDC_CLIENT_EXC,
-	ASDC_CHECK_HEAT_TEMPLATE,
-	ASDC_START_INSTALL_ARTIFACT,
-	ASDC_ARTIFACT_TYPE_NOT_SUPPORT,
-	ASDC_ARTIFACT_ALREADY_EXIST,
-	ASDC_ARTIFACT_DOWNLOAD_SUC,
-	ASDC_ARTIFACT_DOWNLOAD_FAIL,
-	ASDC_START_DEPLOY_ARTIFACT,
-	ASDC_SEND_NOTIF_ASDC,
-	ASDC_SEND_NOTIF_ASDC_EXEC,
-	ASDC_RECEIVE_CALLBACK_NOTIF,
-	ASDC_RECEIVE_SERVICE_NOTIF,
-	ASDC_ARTIFACT_NULL,
-	ASDC_SERVICE_NOT_SUPPORT,
-	ASDC_ARTIFACT_DEPLOY_SUC,
-	ASDC_PROPERTIES_NOT_FOUND,
-	// Default Messages, in case Log catalog is not defined
-	GENERAL_EXCEPTION_ARG,
-	GENERAL_EXCEPTION,
-	GENERAL_WARNING,
-	AUDIT_EXEC,
-	GENERAL_METRICS,
-	LOGGER_SETUP,
-	LOGGER_NOT_FOUND,
-	LOGGER_UPDATE_SUC,
-	LOGGER_UPDATE_DEBUG,
-	LOGGER_UPDATE_DEBUG_SUC,
-	LOAD_PROPERTIES_SUC,
-	NO_PROPERTIES,
-	MADATORY_PARAM_MISSING,
-	LOAD_PROPERTIES_FAIL,
-	INIT_LOGGER,
-	INIT_LOGGER_FAIL,
-	JAXB_EXCEPTION,
-    IDENTITY_SERVICE_NOT_FOUND;
-
-	static {
-		EELFResourceManager.loadMessageBundle("GenericMessages");
-		EELFResourceManager.loadMessageBundle("ApiHandler");
-		EELFResourceManager.loadMessageBundle("BPMN");
-		EELFResourceManager.loadMessageBundle("ResourceAdapter");
-		EELFResourceManager.loadMessageBundle("ASDC");
-	}
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.logger;

+

+

+import com.att.eelf.i18n.EELFResolvableErrorEnum;

+import com.att.eelf.i18n.EELFResourceManager;

+

+public enum MessageEnum implements EELFResolvableErrorEnum{

+	// Api Handler Messages

+	APIH_REQUEST_NULL,

+	APIH_QUERY_FOUND,

+	APIH_QUERY_NOT_FOUND,

+	APIH_QUERY_PARAM_WRONG,

+	APIH_DB_ACCESS_EXC,

+	APIH_DB_ACCESS_EXC_REASON,

+	APIH_VALIDATION_ERROR,

+	APIH_REQUEST_VALIDATION_ERROR,

+	APIH_SERVICE_VALIDATION_ERROR,

+	APIH_GENERAL_EXCEPTION_ARG,

+	APIH_GENERAL_EXCEPTION,

+	APIH_GENERAL_WARNING,

+	APIH_AUDIT_EXEC,

+	APIH_GENERAL_METRICS,

+	APIH_DUPLICATE_CHECK_EXC,

+	APIH_DUPLICATE_FOUND,

+	APIH_BAD_ORDER,

+	APIH_DB_ATTRIBUTE_NOT_FOUND,

+	APIH_BPEL_COMMUNICATE_ERROR,

+	APIH_BPEL_RESPONSE_ERROR,

+	APIH_WARP_REQUEST,

+	APIH_ERROR_FROM_BPEL_SERVER,

+	APIH_DB_INSERT_EXC,

+	APIH_DB_UPDATE_EXC,

+	APIH_NO_PROPERTIES,

+	APIH_PROPERTY_LOAD_SUC,

+	APIH_LOAD_PROPERTIES_FAIL,

+	APIH_SDNC_COMMUNICATE_ERROR,

+	APIH_SDNC_RESPONSE_ERROR,

+	APIH_CANNOT_READ_SCHEMA,

+	APIH_HEALTH_CHECK_EXCEPTION,

+	APIH_REQUEST_VALIDATION_ERROR_REASON,

+	APIH_JAXB_MARSH_ERROR,

+	APIH_JAXB_UNMARSH_ERROR,

+	APIH_VNFREQUEST_VALIDATION_ERROR,

+	APIH_DOM2STR_ERROR,

+	APIH_READ_VNFOUTPUT_CLOB_EXCEPTION,

+	APIH_DUPLICATE_CHECK_EXC_ATT,

+	APIH_GENERATED_REQUEST_ID,

+	APIH_GENERATED_SERVICE_INSTANCE_ID,

+	APIH_REPLACE_REQUEST_ID,

+	// Resource Adapter Messages

+	RA_GENERAL_EXCEPTION_ARG,

+	RA_GENERAL_EXCEPTION,

+	RA_GENERAL_WARNING,

+	RA_MISSING_PARAM,

+	RA_AUDIT_EXEC,

+	RA_GENERAL_METRICS,

+	RA_CREATE_STACK_TIMEOUT,

+	RA_DELETE_STACK_TIMEOUT,

+	RA_UPDATE_STACK_TIMEOUT,

+	RA_CONNECTION_EXCEPTION,

+	RA_PARSING_ERROR,

+	RA_PROPERTIES_NOT_FOUND,

+	RA_LOAD_PROPERTIES_SUC,

+	RA_NETWORK_ALREADY_EXIST,

+	RA_UPDATE_NETWORK_ERR,

+	RA_CREATE_STACK_ERR,

+	RA_UPDATE_STACK_ERR,

+	RA_CREATE_TENANT_ERR,

+	RA_NETWORK_NOT_FOUND,

+	RA_NETWORK_ORCHE_MODE_NOT_SUPPORT,

+	RA_CREATE_NETWORK_EXC,

+	RA_PARAM_NOT_FOUND,

+	RA_CONFIG_EXC,

+	RA_UNKOWN_PARAM,

+	RA_VLAN_PARSE,

+	RA_DELETE_NETWORK_EXC,

+	RA_ROLLBACK_NULL,

+	RA_TENANT_NOT_FOUND,

+	RA_QUERY_NETWORK_EXC,

+	RA_CREATE_NETWORK_NOTIF_EXC,

+	RA_ASYNC_ROLLBACK,

+	RA_WSDL_NOT_FOUND,

+	RA_WSDL_URL_CONVENTION_EXC,

+	RA_INIT_NOTIF_EXC,

+	RA_SET_CALLBACK_AUTH_EXC,

+	RA_FAULT_INFO_EXC,

+	RA_MARSHING_ERROR,

+	RA_PARSING_REQUEST_ERROR,

+	RA_SEND_REQUEST_SDNC,

+	RA_RESPONSE_FROM_SDNC,

+	RA_EXCEPTION_COMMUNICATE_SDNC,

+	RA_EVALUATE_XPATH_ERROR,

+	RA_ANALYZE_ERROR_EXC,

+	RA_ERROR_GET_RESPONSE_SDNC,

+	RA_CALLBACK_BPEL,

+	RA_INIT_CALLBACK_WSDL_ERR,

+	RA_CALLBACK_BPEL_EXC,

+	RA_CALLBACK_BPEL_COMPLETE,

+	RA_SDNC_MISS_CONFIG_PARAM,

+	RA_SDNC_INVALID_CONFIG,

+	RA_PRINT_URL,

+	RA_ERROR_CREATE_SDNC_REQUEST,

+	RA_ERROR_CREATE_SDNC_RESPONSE,

+	RA_ERROR_CONVERT_XML2STR,

+	RA_RECEIVE_SDNC_NOTIF,

+	RA_INIT_SDNC_ADAPTER,

+	RA_SEND_REQUEST_APPC_ERR,

+	RA_SEND_REQUEST_SDNC_ERR,

+	RA_RECEIVE_BPEL_REQUEST,

+	RA_TENANT_ALREADY_EXIST,

+	RA_UPDATE_TENANT_ERR,

+	RA_DELETE_TEMAMT_ERR,

+	RA_ROLLBACK_TENANT_ERR,

+	RA_QUERY_VNF_ERR,

+	RA_VNF_ALREADY_EXIST,

+	RA_VNF_UNKNOWN_PARAM,

+	RA_VNF_EXTRA_PARAM,

+	RA_CREATE_VNF_ERR,

+	RA_VNF_NOT_EXIST,

+	RA_UPDATE_VNF_ERR,

+	RA_DELETE_VNF_ERR,

+	RA_ASYNC_CREATE_VNF,

+	RA_SEND_VNF_NOTIF_ERR,

+	RA_ASYNC_CREATE_VNF_COMPLETE,

+	RA_ASYNC_UPDATE_VNF,

+	RA_ASYNC_UPDATE_VNF_COMPLETE,

+	RA_ASYNC_QUERY_VNF,

+	RA_ASYNC_QUERY_VNF_COMPLETE,

+	RA_ASYNC_DELETE_VNF,

+	RA_ASYNC_DELETE_VNF_COMPLETE,

+	RA_ASYNC_ROLLBACK_VNF,

+	RA_ASYNC_ROLLBACK_VNF_COMPLETE,

+	RA_ROLLBACK_VNF_ERR,

+	RA_DB_INVALID_STATUS,

+	RA_CANT_UPDATE_REQUEST,

+	RA_DB_REQUEST_NOT_EXIST,

+	RA_CONFIG_NOT_FOUND,

+	RA_CONFIG_LOAD,

+	RA_RECEIVE_WORKFLOW_MESSAGE,

+	// BPEL engine Messages

+	BPMN_GENERAL_INFO,

+	BPMN_GENERAL_EXCEPTION_ARG,

+	BPMN_GENERAL_EXCEPTION,

+	BPMN_GENERAL_WARNING,

+	BPMN_AUDIT_EXEC,

+	BPMN_GENERAL_METRICS,

+	BPMN_URN_MAPPING_FAIL,

+	BPMN_VARIABLE_NULL,

+	BPMN_SDNC_CALLBACK_EXCEPTION,

+	BPMN_CALLBACK_EXCEPTION,

+	// ASDC Messages

+	ASDC_GENERAL_EXCEPTION_ARG,

+	ASDC_GENERAL_EXCEPTION,

+	ASDC_GENERAL_WARNING,

+	ASDC_AUDIT_EXEC,

+	ASDC_GENERAL_METRICS,

+	ASDC_CREATE_SERVICE,

+	ASDC_ARTIFACT_ALREADY_DEPLOYED,

+	ASDC_CREATE_ARTIFACT,

+	ASDC_ARTIFACT_INSTALL_EXC,

+	ASDC_ARTIFACT_ALREADY_DEPLOYED_DETAIL,

+	ASDC_ARTIFACT_NOT_DEPLOYED_DETAIL,

+	ASDC_ARTIFACT_CHECK_EXC,

+	ASDC_INIT_ASDC_CLIENT_EXC,

+	ASDC_INIT_ASDC_CLIENT_SUC,

+	ASDC_LOAD_ASDC_CLIENT_EXC,

+	ASDC_SINGLETON_CHECKT_EXC,

+	ASDC_SHUTDOWN_ASDC_CLIENT_EXC,

+	ASDC_CHECK_HEAT_TEMPLATE,

+	ASDC_START_INSTALL_ARTIFACT,

+	ASDC_ARTIFACT_TYPE_NOT_SUPPORT,

+	ASDC_ARTIFACT_ALREADY_EXIST,

+	ASDC_ARTIFACT_DOWNLOAD_SUC,

+	ASDC_ARTIFACT_DOWNLOAD_FAIL,

+	ASDC_START_DEPLOY_ARTIFACT,

+	ASDC_SEND_NOTIF_ASDC,

+	ASDC_SEND_NOTIF_ASDC_EXEC,

+	ASDC_RECEIVE_CALLBACK_NOTIF,

+	ASDC_RECEIVE_SERVICE_NOTIF,

+	ASDC_ARTIFACT_NULL,

+	ASDC_SERVICE_NOT_SUPPORT,

+	ASDC_ARTIFACT_DEPLOY_SUC,

+	ASDC_PROPERTIES_NOT_FOUND,

+	// Default Messages, in case Log catalog is not defined

+	GENERAL_EXCEPTION_ARG,

+	GENERAL_EXCEPTION,

+	GENERAL_WARNING,

+	AUDIT_EXEC,

+	GENERAL_METRICS,

+	LOGGER_SETUP,

+	LOGGER_NOT_FOUND,

+	LOGGER_UPDATE_SUC,

+	LOGGER_UPDATE_DEBUG,

+	LOGGER_UPDATE_DEBUG_SUC,

+	LOAD_PROPERTIES_SUC,

+	NO_PROPERTIES,

+	MADATORY_PARAM_MISSING,

+	LOAD_PROPERTIES_FAIL,

+	INIT_LOGGER,

+	INIT_LOGGER_FAIL,

+	JAXB_EXCEPTION,

+    IDENTITY_SERVICE_NOT_FOUND;

+

+	static {

+		EELFResourceManager.loadMessageBundle("GenericMessages");

+		EELFResourceManager.loadMessageBundle("ApiHandler");

+		EELFResourceManager.loadMessageBundle("BPMN");

+		EELFResourceManager.loadMessageBundle("ResourceAdapter");

+		EELFResourceManager.loadMessageBundle("ASDC");

+	}

+}

diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml
index 2d3424c..6215d0c 100644
--- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml
+++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project id="5e41efd3-b2b2-4507-a41a-02227bd51b8a" activeEnvironment="Default" name="HealthCheck" resourceRoot="" soapui-version="5.3.0" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:RestService" id="c7309861-55a2-458f-9408-6ddee8ed79a7" wadlVersion="http://wadl.dev.java.net/2009/02" name="SetStatus" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="SetStatus false infra" path="/ecomp/mso/infra/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false Infra" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true infra" path="/ecomp/mso/infra/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true infra" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false apih asdc" path="/asdc/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false apih asdc" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true apih asdc" path="/asdc/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true apih asdc" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false networks" path="/networks/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false networks" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true networks" path="/networks/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true networks" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false vnfs" path="/vnfs/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false vnfs" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true vnfs" path="/vnfs/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true vnfs" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false tenants" path="/tenants/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false tenants" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true tenants" path="/tenants/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true tenants" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false JRA" path="/adapters/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false JRA" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true JRA" path="/adapters/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true JRA" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="f1eae1f1-1a12-43a3-84ea-b966442eafb0" wadlVersion="http://wadl.dev.java.net/2009/02" name="GlobalHealthcheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="Infra" path="/ecomp/mso/infra/globalhealthcheck" id="85e05d47-4f09-4925-ab77-63f8a1665c27"><con:settings/><con:parameters><con:parameter><con:name>enableBpmn</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="GlobalHC Infra" id="1b6937c7-9d88-43c6-99b6-9dca4e891d5c" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="42ea1c51-a0ca-445e-8f98-4af039a2b59c" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/globalhealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="JRA adapters" path="/adapters/rest/globalhealthcheck" id="cba118a2-5d68-47ab-9440-51920466fff0"><con:settings/><con:parameters><con:parameter><con:name>enableBpmn</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="GlobalHC adapters" id="52ffdb3c-6f8a-43b0-8a52-a2b603e3d9c5" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="4609f980-4202-4e50-b09f-abec5534dfa3" wadlVersion="http://wadl.dev.java.net/2009/02" name="SubModulesHealthcheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://${#Project#jrahost}</con:endpoint></con:endpoints><con:resource name="JRA networks" path="/networks/rest/healthcheck" id="61b35716-b06e-47ba-9567-7757980f1b5a"><con:settings/><con:parameters/><con:method name="LocalHC networks" id="48acb940-91ac-4b32-b32b-8808b552e059" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="a8aa066b-ad81-40bc-9976-de44fe3dcc0a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/admin/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA adapters" path="/adapters/rest/healthcheck" id="fa70036c-7280-43c5-a26d-8e2d42584ee1"><con:settings/><con:parameters/><con:method name="LocalHC adapters" id="7587d026-ebda-4c13-80df-b5a26f322164" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="ea2c9416-63eb-4219-83fd-db0593bf63e3" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@bind_address"/><con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA vnfs" path="/vnfs/rest/healthcheck" id="ee547629-e2ac-4932-b582-9586c6a3f464"><con:settings/><con:parameters/><con:method name="LocalHC vnfs" id="285c0bac-3c68-4f07-b231-5bba3217b60a" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="f2effc08-5569-4e5b-a2e8-fa3bebc958b9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/rest/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA tenants" path="/tenants/rest/healthcheck" id="796ada77-fce3-493d-b003-10d4c1ecc498"><con:settings/><con:parameters/><con:method name="LocalHC tenants" id="2f9ae7ac-c18d-48eb-a43c-8624d9475b7f" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH Infra" path="/ecomp/mso/infra/healthcheck" id="29001acb-f40a-4ed3-af96-0415649eeacf"><con:settings/><con:parameters/><con:method name="LocalHC infra" id="6d7685fa-354e-44c6-b512-0e802673d341" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="287d8590-e1da-49e5-afef-5f7191a55925" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH asdc" path="/asdc/healthcheck" id="b79d1f28-0b27-4897-90a5-b17032d533da"><con:settings/><con:parameters/><con:method name="LocalHC asdc" id="f251569b-3e62-44c0-80c2-b806a0b2cda1" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camunadalocal" path="/mso/healthcheck" id="6740d63f-f8ba-40d8-8397-c8d9135d241a"><con:settings/><con:parameters/><con:method name="CamundaLocal" id="a3ae9bf4-e129-4c12-a1ac-0f2fab31d509" method="GET"><con:description>not used in Arquilian as not same repo</con:description><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>500 503</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Fault</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>400 404 405</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH dbadapters" path="/dbadapters/healthcheck" id="c9adf66c-dbfa-4f87-ba07-be9799ed3ef7"><con:settings/><con:parameters/><con:method name="LocalHC apih dbadapters" id="602a2bad-4bac-4bdc-b64a-c6b0250997e7" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="91778949-a8b8-4211-be98-5dcb477512a8" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camunadalocal variables2" path="/mso/async/services/HealthCheck" id="6740d63f-f8ba-40d8-8397-c8d9135d241a"><con:settings/><con:parameters/><con:method name="CamundaLocal2" id="a3ae9bf4-e129-4c12-a1ac-0f2fab31d509" method="POST"><con:description>not used in Arquilian as not same repo</con:description><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>500 503</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Fault</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>400 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{"requestId":{"value":"test","type":"String"}}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camundalocal2" path="/mso/common/healthcheck" id="5300f433-6b32-447a-b0de-1d26353167d8"><con:settings/><con:parameters/><con:method name="Method 1" id="6fc76777-eeee-4126-bfd1-9da0eb5b7921" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="02e386ce-803e-4d34-b2fd-a694a2cb2fc2" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="bc7ec14b-913e-4b98-bdd2-772f5a98e77d" wadlVersion="http://wadl.dev.java.net/2009/02" name="GetStatus" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://192.168.126.130:8080</con:endpoint></con:endpoints><con:resource name="GetStatus DB Adapter" path="/dbadapters/RequestsDbAdapter" id="911c26b8-4b1d-49e3-b969-02de4c62bd3f"><con:settings/><con:parameters/><con:method name="GetStatus RequestsDbAdapter" id="4748011f-fcc6-4920-b1f2-1956b8cafa34" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/xml;charset=ISO-8859-1</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/xml;charset=ISO-8859-1</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
+<con:soapui-project id="5e41efd3-b2b2-4507-a41a-02227bd51b8a" activeEnvironment="Default" name="HealthCheck" resourceRoot="" soapui-version="5.2.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:RestService" id="c7309861-55a2-458f-9408-6ddee8ed79a7" wadlVersion="http://wadl.dev.java.net/2009/02" name="SetStatus" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="SetStatus false infra" path="/ecomp/mso/infra/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false Infra" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true infra" path="/ecomp/mso/infra/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true infra" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false apih asdc" path="/asdc/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false apih asdc" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true apih asdc" path="/asdc/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true apih asdc" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 401 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false networks" path="/networks/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false networks" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true networks" path="/networks/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true networks" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false vnfs" path="/vnfs/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false vnfs" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true vnfs" path="/vnfs/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true vnfs" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:domain/><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false tenants" path="/tenants/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false tenants" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true tenants" path="/tenants/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true tenants" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus false JRA" path="/adapters/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus false JRA" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="false" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SetStatus true JRA" path="/adapters/rest/setStatus/{siteName}" id="d03a4e5b-b5a2-4215-a37d-d5852a03e2e8"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value>true</con:value><con:style>QUERY</con:style><con:default>true</con:default><con:path xsi:nil="true"/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>siteName</con:name><con:value>${#Project#sitename}</con:value><con:style>TEMPLATE</con:style><con:default>${#Project#sitename}</con:default></con:parameter></con:parameters><con:method name="SetStatus true JRA" id="5d87cc87-ef01-44e7-8e6f-e177e088a6fe" method="POST"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>405 404 403</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>text/plain</con:mediaType><con:status>500</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="e0314e05-9a73-4402-a404-3a1b0aa78232" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/setStatus</con:originalUri><con:credentials><con:username>${#Project#userlogin}</con:username><con:password>${#Project#userpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/><con:parameterOrder><con:entry>enable</con:entry><con:entry>siteName</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="f1eae1f1-1a12-43a3-84ea-b966442eafb0" wadlVersion="http://wadl.dev.java.net/2009/02" name="GlobalHealthcheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="Infra" path="/ecomp/mso/infra/globalhealthcheck" id="85e05d47-4f09-4925-ab77-63f8a1665c27"><con:settings/><con:parameters><con:parameter><con:name>enableBpmn</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="GlobalHC Infra" id="1b6937c7-9d88-43c6-99b6-9dca4e891d5c" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="42ea1c51-a0ca-445e-8f98-4af039a2b59c" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/globalhealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="JRA adapters" path="/adapters/rest/globalhealthcheck" id="cba118a2-5d68-47ab-9440-51920466fff0"><con:settings/><con:parameters><con:parameter><con:name>enableBpmn</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="GlobalHC adapters" id="52ffdb3c-6f8a-43b0-8a52-a2b603e3d9c5" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="4609f980-4202-4e50-b09f-abec5534dfa3" wadlVersion="http://wadl.dev.java.net/2009/02" name="SubModulesHealthcheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://${#Project#jrahost}</con:endpoint></con:endpoints><con:resource name="JRA networks" path="/networks/rest/healthcheck" id="61b35716-b06e-47ba-9567-7757980f1b5a"><con:settings/><con:parameters/><con:method name="LocalHC networks" id="48acb940-91ac-4b32-b32b-8808b552e059" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>500</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="a8aa066b-ad81-40bc-9976-de44fe3dcc0a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/admin/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA adapters" path="/adapters/rest/healthcheck" id="fa70036c-7280-43c5-a26d-8e2d42584ee1"><con:settings/><con:parameters/><con:method name="LocalHC adapters" id="7587d026-ebda-4c13-80df-b5a26f322164" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="ea2c9416-63eb-4219-83fd-db0593bf63e3" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@bind_address"/><con:setting id="com.eviware.soapui.impl.support.AbstractHttpRequest@follow-redirects">true</con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA vnfs" path="/vnfs/rest/healthcheck" id="ee547629-e2ac-4932-b582-9586c6a3f464"><con:settings/><con:parameters/><con:method name="LocalHC vnfs" id="285c0bac-3c68-4f07-b231-5bba3217b60a" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>500 404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="f2effc08-5569-4e5b-a2e8-fa3bebc958b9" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/rest/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="JRA tenants" path="/tenants/rest/healthcheck" id="796ada77-fce3-493d-b003-10d4c1ecc498"><con:settings/><con:parameters/><con:method name="LocalHC tenants" id="2f9ae7ac-c18d-48eb-a43c-8624d9475b7f" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH Infra" path="/ecomp/mso/infra/healthcheck" id="29001acb-f40a-4ed3-af96-0415649eeacf"><con:settings/><con:parameters/><con:method name="LocalHC infra" id="6d7685fa-354e-44c6-b512-0e802673d341" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="287d8590-e1da-49e5-afef-5f7191a55925" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH asdc" path="/asdc/healthcheck" id="b79d1f28-0b27-4897-90a5-b17032d533da"><con:settings/><con:parameters/><con:method name="LocalHC asdc" id="f251569b-3e62-44c0-80c2-b806a0b2cda1" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camunadalocal" path="/mso/healthcheck" id="6740d63f-f8ba-40d8-8397-c8d9135d241a"><con:settings/><con:parameters/><con:method name="CamundaLocal" id="a3ae9bf4-e129-4c12-a1ac-0f2fab31d509" method="GET"><con:description>not used in Arquilian as not same repo</con:description><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>500 503</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Fault</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>400 404 405</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="APIH dbadapters" path="/dbadapters/healthcheck" id="c9adf66c-dbfa-4f87-ba07-be9799ed3ef7"><con:settings/><con:parameters/><con:method name="LocalHC apih dbadapters" id="602a2bad-4bac-4bdc-b64a-c6b0250997e7" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="91778949-a8b8-4211-be98-5dcb477512a8" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/healthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camunadalocal variables2" path="/mso/async/services/HealthCheck" id="6740d63f-f8ba-40d8-8397-c8d9135d241a"><con:settings/><con:parameters/><con:method name="CamundaLocal2" id="a3ae9bf4-e129-4c12-a1ac-0f2fab31d509" method="POST"><con:description>not used in Arquilian as not same repo</con:description><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="FAULT"><con:mediaType>application/json</con:mediaType><con:status>500 503</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Fault</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>400 404</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:heal="localhost/mso/async/services/HealthCheck">heal:Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="b85f87ca-6c69-46be-aa1d-cd9f0b1ce48d" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request>{"variables":{"requestId":{"value":"test","type":"String"}}}</con:request><con:originalUri>localhost/mso/async/services/HealthCheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="Camundalocal2" path="/mso/common/healthcheck" id="5300f433-6b32-447a-b0de-1d26353167d8"><con:settings/><con:parameters/><con:method name="Method 1" id="6fc76777-eeee-4126-bfd1-9da0eb5b7921" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="02e386ce-803e-4d34-b2fd-a694a2cb2fc2" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="bc7ec14b-913e-4b98-bdd2-772f5a98e77d" wadlVersion="http://wadl.dev.java.net/2009/02" name="GetStatus" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://192.168.126.130:8080</con:endpoint></con:endpoints><con:resource name="GetStatus DB Adapter" path="/dbadapters/RequestsDbAdapter" id="911c26b8-4b1d-49e3-b969-02de4c62bd3f"><con:settings/><con:parameters/><con:method name="GetStatus RequestsDbAdapter" id="4748011f-fcc6-4920-b1f2-1956b8cafa34" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/xml;charset=ISO-8859-1</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/xml</con:mediaType><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/xml;charset=ISO-8859-1</con:mediaType><con:status>500</con:status><con:params/><con:element xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">soapenv:Envelope</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>404</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
 <soapenv:Header/>
 <soapenv:Body>
 <req:getSiteStatus>
 <siteName>${#Project#sitename}</siteName>
 </req:getSiteStatus>
 </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="045c84cd-4ad1-4f49-a187-7b4448b5cf97" wadlVersion="http://wadl.dev.java.net/2009/02" name="NodeHealthCheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="NodehealthcheckJRA" path="/adapters/rest/nodehealthcheck" id="eb7dc74a-2b7f-4d1e-88f3-15987452e24d"><con:settings/><con:parameters/><con:method name="NodehealthcheckJRA" id="67871396-2679-4871-bbe4-2e2b63ed4180" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="NodehealthcheckAPIH-Infra" path="/ecomp/mso/infra/nodehealthcheck" id="eb7dc74a-2b7f-4d1e-88f3-15987452e24d"><con:settings/><con:parameters/><con:method name="NodehealthcheckAPIH-Infra" id="67871396-2679-4871-bbe4-2e2b63ed4180" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="NodehealthcheckBPMN" path="/mso/nodehealthcheck" id="30a0b380-93d5-4611-896a-1afe2150434a"><con:settings/><con:parameters/><con:method name="Method 1" id="e8a46161-d0f0-4afa-ac17-705694845302" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="2259e1c1-003d-485f-b424-925d1ee65f01" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="0da04960-3bf4-4066-9ec2-d35d2d3c8c4d" wadlVersion="http://wadl.dev.java.net/2009/02" name="Logging" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints/><con:resource name="NetworkAdapter" path="/networks/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="TenantAdapter" path="/tenants/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VNFAdapter" path="/vnfs/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SDNCAdapter" path="/adapters/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="APIH Infra" path="/ecomp/mso/infra/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="ASDC" path="/asdc/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="RequestDBAdapter" path="/dbadapters/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:testSuite id="bcee4cc9-9c4e-4eeb-a520-9a3c73458e1f" name="Healthcheck TestSuite"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="9b4e70e4-1cd1-4152-89e9-18e8a0225108" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="TestCaseHC" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1" id="b3161fab-24b4-442d-b662-49bdc46f697b"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
+</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="045c84cd-4ad1-4f49-a187-7b4448b5cf97" wadlVersion="http://wadl.dev.java.net/2009/02" name="NodeHealthCheck" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:8080</con:endpoint></con:endpoints><con:resource name="NodehealthcheckJRA" path="/adapters/rest/nodehealthcheck" id="eb7dc74a-2b7f-4d1e-88f3-15987452e24d"><con:settings/><con:parameters/><con:method name="NodehealthcheckJRA" id="67871396-2679-4871-bbe4-2e2b63ed4180" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="NodehealthcheckAPIH-Infra" path="/ecomp/mso/infra/nodehealthcheck" id="eb7dc74a-2b7f-4d1e-88f3-15987452e24d"><con:settings/><con:parameters/><con:method name="NodehealthcheckAPIH-Infra" id="67871396-2679-4871-bbe4-2e2b63ed4180" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType>text/html</con:mediaType><con:status>503</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="NodehealthcheckBPMN" path="/mso/nodehealthcheck" id="30a0b380-93d5-4611-896a-1afe2150434a"><con:settings/><con:parameters/><con:method name="Method 1" id="e8a46161-d0f0-4afa-ac17-705694845302" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/html</con:mediaType><con:status>200</con:status><con:params/><con:element>html</con:element></con:representation><con:request name="Request 1" id="2259e1c1-003d-485f-b424-925d1ee65f01" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:8080</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:interface xsi:type="con:RestService" id="0da04960-3bf4-4066-9ec2-d35d2d3c8c4d" wadlVersion="http://wadl.dev.java.net/2009/02" name="Logging" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints/><con:resource name="NetworkAdapter" path="/networks/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="TenantAdapter" path="/tenants/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="VNFAdapter" path="/vnfs/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="SDNCAdapter" path="/adapters/rest/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="APIH Infra" path="/ecomp/mso/infra/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="ASDC" path="/asdc/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="RequestDBAdapter" path="/dbadapters/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="BPMN" path="/mso/logging/debug" id="957cb67e-9f74-40ef-bbc6-bfee1ef3c1d7"><con:settings/><con:parameters><con:parameter><con:name>enable</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Debug 1" id="41e16995-0c45-4156-91b3-5fec12bb5aa8" method="GET"><con:settings/><con:parameters/><con:request name="Request 1" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#bpmnhost}</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:testSuite id="bcee4cc9-9c4e-4eeb-a520-9a3c73458e1f" name="Healthcheck TestSuite"><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="9b4e70e4-1cd1-4152-89e9-18e8a0225108" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="TestCaseHC" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Enable RequestDBAdapter debug logs" id="e83f44c7-1cd6-4c9f-9afd-fb91faf7cf41"><con:settings/><con:config service="Logging" resourcePath="/dbadapters/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable RequestDBAdapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/dbadapters/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="2e5b9577-aa74-43c7-9440-eb00314d091c" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable ASDC debug logs" id="d938876a-34c6-4de9-89dc-55a63e710c18"><con:settings/><con:config service="Logging" resourcePath="/asdc/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable ASDC debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="62995dde-fa57-409d-8480-befef3f6ff70" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable NetworkAdapter debug logs" id="64f3deb6-2675-4eb8-8600-9ed2be76acc3"><con:settings/><con:config service="Logging" methodName="Debug 1" resourcePath="/networks/rest/logging/debug" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable NetworkAdapter debug logs" id="ba42db46-5a97-48d1-a88c-bab5a11313ae" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="1f209f2c-b621-4168-bca4-cbe4b5da4c7e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable TenantAdapter debug logs" id="a0ec3eda-28c1-43c1-9737-70a1b355874c"><con:settings/><con:config service="Logging" methodName="Debug 1" resourcePath="/tenants/rest/logging/debug" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable TenantAdapter debug logs" id="a97a886d-002c-4431-bf33-c7ab1d31e881" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenantss/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="d984f832-9790-496a-911e-57e3d1780969" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable VNF Adapter debug logs" id="6153b51b-165a-4406-ab7e-e1f32ede7d75"><con:settings/><con:config service="Logging" resourcePath="/vnfs/rest/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable VNF Adapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="bdd35643-b216-4200-8f07-45fc8b0ad304" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable SDNC Adapter debug logs" id="69f77bce-b9e1-4462-b7e3-0a8620eafddc"><con:settings/><con:config service="Logging" resourcePath="/adapters/rest/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable SDNC Adapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="f4db96ec-603d-4c1c-897f-2a76e2948637" name="Valid HTTP Status Codes"><con:configuration><codes>200
+</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable APIH Infra debug logs" id="99d0ad17-f116-4506-82ab-7f8a60924fb6"><con:settings/><con:config service="Logging" resourcePath="/ecomp/mso/infra/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable APIH Infra debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="df4e7c2f-384d-47d3-a772-309d8a7d6dd5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable BPMN debug logs" id="57b545f9-8eb8-45f4-8c91-8b8ce8866e62"><con:settings/><con:config service="Logging" resourcePath="/mso/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable BPMN debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="df4e7c2f-384d-47d3-a772-309d8a7d6dd5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GetStatus RequestsDbAdapter - Request 1" id="b3161fab-24b4-442d-b662-49bdc46f697b"><con:settings/><con:config service="GetStatus" resourcePath="/dbadapters/RequestsDbAdapter" methodName="GetStatus RequestsDbAdapter" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GetStatus RequestsDbAdapter - Request 1" id="8fbeebe9-cdf0-4715-837c-16ae3cfdd5fb" mediaType="application/xml" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:req="http://org.openecomp.mso/requestsdb">
 <soapenv:Header/>
 <soapenv:Body>
 <req:getSiteStatus>
@@ -111,5 +112,4 @@
 <siteName>${#Project#sitename}</siteName>
 </req:getSiteStatus>
 </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="98f1d604-1865-45ac-ae71-3d94000738f3" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckAPIH - Request 1 2" id="afd352c1-685b-4bd3-be41-72ba3f3e2885"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/ecomp/mso/infra/nodehealthcheck" methodName="NodehealthcheckAPIH-Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckAPIH - Request 1 2" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="222b1461-2b33-4951-9c5d-87a850dc1971" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC adapters - Request 1 3" id="0e877ae9-1d63-486c-8530-fc99e5416ac6"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/adapters/rest/globalhealthcheck" methodName="GlobalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC adapters - Request 1 3" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="96e389cc-3e30-4ec0-b9bd-5eda145f6bbb" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC tenants - Request 1 2" id="c87beffd-7f8b-408d-9275-5876f5eb5dd4"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/tenants/rest/healthcheck" methodName="LocalHC tenants" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC tenants - Request 1 2" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="99a55011-59f5-4693-9b9f-5c0400172b8e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC asdc - Request 1 2" id="5ea8229f-7cb6-4660-8b84-b9930822934a"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/asdc/healthcheck" methodName="LocalHC asdc" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC asdc - Request 1 2" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="eb5af8a7-1730-4b42-a604-10172a4a10ac" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable NetworkAdapter debug logs" id="64f3deb6-2675-4eb8-8600-9ed2be76acc3"><con:settings/><con:config service="Logging" methodName="Debug 1" resourcePath="/networks/rest/logging/debug" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable debug logs" id="ba42db46-5a97-48d1-a88c-bab5a11313ae" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/networks/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="1f209f2c-b621-4168-bca4-cbe4b5da4c7e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable TenantAdapter debug logs" id="a0ec3eda-28c1-43c1-9737-70a1b355874c"><con:settings/><con:config service="Logging" methodName="Debug 1" resourcePath="/tenants/rest/logging/debug" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable TenantAdapter debug logs" id="a97a886d-002c-4431-bf33-c7ab1d31e881" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenantss/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="d984f832-9790-496a-911e-57e3d1780969" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable VNF Adapter debug logs" id="6153b51b-165a-4406-ab7e-e1f32ede7d75"><con:settings/><con:config service="Logging" resourcePath="/vnfs/rest/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable VNF Adapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/vnfs/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="bdd35643-b216-4200-8f07-45fc8b0ad304" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable SDNC Adapter debug logs" id="69f77bce-b9e1-4462-b7e3-0a8620eafddc"><con:settings/><con:config service="Logging" resourcePath="/adapters/rest/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable SDNC Adapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="f4db96ec-603d-4c1c-897f-2a76e2948637" name="Valid HTTP Status Codes"><con:configuration><codes>200
-</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable APIH Infra debug logs" id="99d0ad17-f116-4506-82ab-7f8a60924fb6"><con:settings/><con:config service="Logging" resourcePath="/ecomp/mso/infra/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable APIH Infra debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/ecomp/mso/infra/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="df4e7c2f-384d-47d3-a772-309d8a7d6dd5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable ASDC debug logs" id="d938876a-34c6-4de9-89dc-55a63e710c18"><con:settings/><con:config service="Logging" resourcePath="/asdc/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable ASDC debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="62995dde-fa57-409d-8480-befef3f6ff70" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Enable RequestDBAdapter debug logs" id="e83f44c7-1cd6-4c9f-9afd-fb91faf7cf41"><con:settings/><con:config service="Logging" resourcePath="/dbadapters/logging/debug" methodName="Debug 1" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Enable RequestDBAdapter debug logs" id="8d1e6e96-d9d6-4166-bd74-ac7e9266db16" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/dbadapters/logging/debug</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="2e5b9577-aa74-43c7-9440-eb00314d091c" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#msoclient}</con:username><con:password>${#Project#msoclientpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enable" value="true" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enable</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>apihhost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>jrahost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>userlogin</con:name><con:value>sitecontrol</con:value></con:property><con:property><con:name>userpassword</con:name><con:value>Domain2.0!</con:value></con:property><con:property><con:name>bpmnhost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>sitename</con:name><con:value>mso-docker</con:value></con:property><con:property><con:name>enableBpmn</con:name><con:value/></con:property><con:property><con:name>dbadapteruser</con:name><con:value>BPELClient</con:value></con:property><con:property><con:name>dbadapterpassword</con:name><con:value>password1$</con:value></con:property><con:property><con:name>msoclient</con:name><con:value>MSOClient</con:value></con:property><con:property><con:name>msoclientpassword</con:name><con:value>password1$</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
+</soapenv:Envelope>]]></con:request><con:originalUri>http://localhost/dbadapters/RequestsDbAdapter</con:originalUri><con:assertion type="Simple Contains" id="98f1d604-1865-45ac-ae71-3d94000738f3" name="Contains"><con:configuration><token>&lt;return>true&lt;/return></token><ignoreCase>false</ignoreCase><useRegEx>false</useRegEx></con:configuration></con:assertion><con:credentials><con:username>${#Project#dbadapteruser}</con:username><con:password>${#Project#dbadapterpassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="NodehealthcheckAPIH - Request 1 2" id="afd352c1-685b-4bd3-be41-72ba3f3e2885"><con:settings/><con:config service="NodeHealthCheck" resourcePath="/ecomp/mso/infra/nodehealthcheck" methodName="NodehealthcheckAPIH-Infra" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="NodehealthcheckAPIH - Request 1 2" id="00db386c-942d-4286-853f-01e279f6c2cb" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/nodehealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="222b1461-2b33-4951-9c5d-87a850dc1971" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="GlobalHC adapters - Request 1 3" id="0e877ae9-1d63-486c-8530-fc99e5416ac6"><con:settings/><con:config service="GlobalHealthcheck" resourcePath="/adapters/rest/globalhealthcheck" methodName="GlobalHC adapters" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GlobalHC adapters - Request 1 3" id="b1109ecf-fd73-4a30-8c98-ac50a10e9cb7" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/adapters/rest/globalhealthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="96e389cc-3e30-4ec0-b9bd-5eda145f6bbb" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="enableBpmn" value="${#Project#enableBpmn}" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>enableBpmn</con:entry></con:parameterOrder></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC tenants - Request 1 2" id="c87beffd-7f8b-408d-9275-5876f5eb5dd4"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/tenants/rest/healthcheck" methodName="LocalHC tenants" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC tenants - Request 1 2" id="432c2172-deba-4173-a0af-0b6fccfd60dc" mediaType="application/json"><con:settings/><con:endpoint>http://${#Project#jrahost}</con:endpoint><con:request/><con:originalUri>http://localhost/tenants/admin/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="99a55011-59f5-4693-9b9f-5c0400172b8e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="LocalHC asdc - Request 1 2" id="5ea8229f-7cb6-4660-8b84-b9930822934a"><con:settings/><con:config service="SubModulesHealthcheck" resourcePath="/asdc/healthcheck" methodName="LocalHC asdc" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="LocalHC asdc - Request 1 2" id="b0d9d540-073e-4d1d-ac19-32566206d0c6" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://${#Project#apihhost}</con:endpoint><con:request/><con:originalUri>http://localhost/asdc/healthcheck</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="eb5af8a7-1730-4b42-a604-10172a4a10ac" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties><con:property><con:name>apihhost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>jrahost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>userlogin</con:name><con:value>sitecontrol</con:value></con:property><con:property><con:name>userpassword</con:name><con:value>Domain2.0!</con:value></con:property><con:property><con:name>bpmnhost</con:name><con:value>localhost:8080</con:value></con:property><con:property><con:name>sitename</con:name><con:value>mso-docker</con:value></con:property><con:property><con:name>enableBpmn</con:name><con:value/></con:property><con:property><con:name>dbadapteruser</con:name><con:value>BPELClient</con:value></con:property><con:property><con:name>dbadapterpassword</con:name><con:value>password1$</con:value></con:property><con:property><con:name>msoclient</con:name><con:value>MSOClient</con:value></con:property><con:property><con:name>msoclientpassword</con:name><con:value>password1$</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql
index 6bda994..2165041 100644
--- a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql
+++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql
@@ -84,8 +84,8 @@ INSERT INTO `VNF_COMPONENTS_RECIPE`
 UNLOCK TABLES;
 
 INSERT INTO service (id, SERVICE_NAME, VERSION_STR, DESCRIPTION, SERVICE_NAME_VERSION_ID) VALUES ('4', 'VID_DEFAULT', '1.0', 'Default service for VID to use for infra APIH orchestration', 'MANUAL_RECORD');
-INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateServiceInstance', '180');
-INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DelServiceInstance', '180');
+INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateGenericALaCarteServiceInstance', '180');
+INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DeleteGenericALaCarteServiceInstance', '180');
 INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'createInstance', '1', 'VID_DEFAULT recipe to create VNF if no custom BPMN flow is found', '/mso/async/services/CreateVnfInfra', '180');
 INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete VNF if no custom BPMN flow is found', '/mso/async/services/DeleteVnfInfra', '180');
 INSERT INTO vnf_components_recipe (VNF_TYPE, VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_ID) VALUES (NULL, 'volumeGroup', 'createInstance', '1', 'VID_DEFAULT recipe to create volume-group if no custom BPMN flow is found', '/mso/async/services/CreateVfModuleVolumeInfraV1', '180', 'VID_DEFAULT');