move network adapter to an external client task

Began impelenting new network external task.
Made the vnfAdapterTask subflow an openstack subflow, refactored infra
flows and BB to call it for network functions.
Fixed bugs discovered through a robot dry run, added unit test, added
support for rollback network request
Updated junit test files for comparison due to not polling for response
Removed the no longer used network adapter rest task from bpmn tasks
Removed the unused network adapter async and its beans
Removed network async client package from open pojo scan

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

76 files changed, 6210 insertions, 13750 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java
index 62d9f068f9..c33160d255 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java
@@ -184,6 +184,7 @@ public class MsoHeatUtils extends MsoCommonUtils implements VduPlugin {
             if (CREATE_COMPLETE.equals(currentStack.getStackStatus())) {
                 new StackInfoMapper(currentStack).map();
             } else if (CREATE_IN_PROGRESS.equals(currentStack.getStackStatus())) {
+                // TODO should check poll for completion right here
                 currentStack = processCreateStack(cloudSiteId, tenantId, timeoutMinutes, backout, currentStack,
                         createStack, true);
             } else if (CREATE_FAILED.equals(currentStack.getStackStatus())
@@ -322,6 +323,27 @@ public class MsoHeatUtils extends MsoCommonUtils implements VduPlugin {
         }
     }
 
+    public Stack postProcessStackUpdate(Stack updateStack) throws MsoOpenstackException {
+        if (!"UPDATE_COMPLETE".equals(updateStack.getStackStatus())) {
+            logger.error("{} Stack status: {} Stack status reason: {} {} Update Stack error",
+                    MessageEnum.RA_UPDATE_STACK_ERR, updateStack.getStackStatus(), updateStack.getStackStatusReason(),
+                    ErrorCode.DataError.getValue());
+
+            MsoOpenstackException me = null;
+            if ("UPDATE_IN_PROGRESS".equals(updateStack.getStackStatus())) {
+                me = new MsoOpenstackException(0, "", "Stack Update Timeout");
+            } else {
+                String error =
+                        "Stack error (" + updateStack.getStackStatus() + "): " + updateStack.getStackStatusReason();
+                me = new MsoOpenstackException(0, "", error);
+            }
+            me.addContext("UpdateStack");
+            throw me;
+        } else {
+            return updateStack;
+        }
+    }
+
     public Stack pollStackForStatus(int timeoutMinutes, Stack stack, String stackStatus, String cloudSiteId,
             String tenantId, boolean notFoundIsSuccess) throws MsoException {
         int pollingFrequency =
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapter.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapter.java
index 302a6d302b..010d91fec9 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapter.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapter.java
@@ -191,13 +191,16 @@ public interface MsoNetworkAdapter {
             @WebParam(name = "modelCustomizationUuid") String modelCustomizationUuid,
             @WebParam(name = "networkId") @XmlElement(required = true) String networkId,
             @WebParam(name = "request") MsoRequest msoRequest,
-            @WebParam(name = "networkDeleted", mode = Mode.OUT) Holder<Boolean> networkDeleted) throws NetworkException;
+            @WebParam(name = "networkDeleted", mode = Mode.OUT) Holder<Boolean> networkDeleted,
+            @WebParam(name = "pollForCompletion") @XmlElement(required = false) Boolean pollForCompletion)
+            throws NetworkException;
 
     /**
      * This is the "Rollback Network" Web Service endpoint definition.
      */
     @WebMethod
-    public void rollbackNetwork(@WebParam(name = "rollback") @XmlElement(required = true) NetworkRollback rollback)
+    public void rollbackNetwork(@WebParam(name = "rollback") @XmlElement(required = true) NetworkRollback rollback,
+            @WebParam(name = "pollForCompletion") @XmlElement(required = false) Boolean pollForCompletion)
             throws NetworkException;
 
     @WebMethod
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsync.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsync.java
deleted file mode 100644
index 5b7340e24f..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsync.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network;
-
-
-import java.util.List;
-import java.util.Map;
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlElement;
-import org.onap.so.entity.MsoRequest;
-import org.onap.so.openstack.beans.NetworkRollback;
-import org.onap.so.openstack.beans.Subnet;
-
-/**
- * This webservice defines the Asynchronous versions of NETWORK adapter calls. The notification messages for final
- * responses are documented elsewhere (by the client service WSDL).
- *
- */
-@WebService(name = "NetworkAdapterAsync", targetNamespace = "http://org.onap.so/networkA")
-public interface MsoNetworkAdapterAsync {
-    /**
-     * This is the "Create NETWORK" Web Service Endpoint definition.
-     */
-    @WebMethod
-    @Oneway
-    public void createNetworkA(@WebParam(name = "cloudSiteId") @XmlElement(required = true) String cloudSiteId,
-            @WebParam(name = "tenantId") @XmlElement(required = true) String tenantId,
-            @WebParam(name = "networkType") @XmlElement(required = true) String networkType,
-            @WebParam(name = "modelCustomizationUuid") String modelCustomizationUuid,
-            @WebParam(name = "networkName") @XmlElement(required = true) String networkName,
-            @WebParam(name = "physicalNetworkName") String physicalNetworkName,
-            @WebParam(name = "vlans") List<Integer> vlans, @WebParam(name = "failIfExists") Boolean failIfExists,
-            @WebParam(name = "backout") Boolean backout, @WebParam(name = "subnets") List<Subnet> subnets,
-            @WebParam(name = "networkParams") Map<String, String> networkParams,
-            @WebParam(name = "messageId") @XmlElement(required = true) String messageId,
-            @WebParam(name = "request") MsoRequest msoRequest,
-            @WebParam(name = "notificationUrl") @XmlElement(required = true) String notificationUrl);
-
-    @WebMethod
-    @Oneway
-    public void updateNetworkA(@WebParam(name = "cloudSiteId") @XmlElement(required = true) String cloudSiteId,
-            @WebParam(name = "tenantId") @XmlElement(required = true) String tenantId,
-            @WebParam(name = "networkType") @XmlElement(required = true) String networkType,
-            @WebParam(name = "modelCustomizationUuid") String modelCustomizationUuid,
-            @WebParam(name = "networkId") @XmlElement(required = true) String networkId,
-            @WebParam(name = "networkName") @XmlElement(required = true) String networkName,
-            @WebParam(name = "physicalNetworkName") @XmlElement(required = true) String physicalNetworkName,
-            @WebParam(name = "vlans") @XmlElement(required = true) List<Integer> vlans,
-            @WebParam(name = "subnets") List<Subnet> subnets,
-            @WebParam(name = "networkParams") Map<String, String> networkParams,
-            @WebParam(name = "messageId") @XmlElement(required = true) String messageId,
-            @WebParam(name = "request") MsoRequest msoRequest,
-            @WebParam(name = "notificationUrl") @XmlElement(required = true) String notificationUrl);
-
-    @WebMethod
-    @Oneway
-    public void queryNetworkA(@WebParam(name = "cloudSiteId") @XmlElement(required = true) String cloudSiteId,
-            @WebParam(name = "tenantId") @XmlElement(required = true) String tenantId,
-            @WebParam(name = "networkNameOrId") @XmlElement(required = true) String networkNameOrId,
-            @WebParam(name = "messageId") @XmlElement(required = true) String messageId,
-            @WebParam(name = "request") MsoRequest msoRequest,
-            @WebParam(name = "notificationUrl") @XmlElement(required = true) String notificationUrl);
-
-    @WebMethod
-    @Oneway
-    public void deleteNetworkA(@WebParam(name = "cloudSiteId") @XmlElement(required = true) String cloudSiteId,
-            @WebParam(name = "tenantId") @XmlElement(required = true) String tenantId,
-            @WebParam(name = "networkType") @XmlElement(required = true) String networkType,
-            @WebParam(name = "modelCustomizationUuid") String modelCustomizationUuid,
-            @WebParam(name = "networkId") @XmlElement(required = true) String networkId,
-            @WebParam(name = "messageId") @XmlElement(required = true) String messageId,
-            @WebParam(name = "request") MsoRequest msoRequest,
-            @WebParam(name = "notificationUrl") @XmlElement(required = true) String notificationUrl);
-
-    @WebMethod
-    @Oneway
-    public void rollbackNetworkA(@WebParam(name = "rollback") @XmlElement(required = true) NetworkRollback rollback,
-            @WebParam(name = "messageId") @XmlElement(required = true) String messageId,
-            @WebParam(name = "notificationUrl") @XmlElement(required = true) String notificationUrl);
-
-    @WebMethod
-    public void healthCheckA();
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImpl.java
deleted file mode 100644
index 8d75212f4e..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImpl.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018 IBM.
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.onap.so.adapters.network;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.jws.WebService;
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.handler.MessageContext;
-import org.onap.so.adapters.network.async.client.CreateNetworkNotification;
-import org.onap.so.adapters.network.async.client.MsoExceptionCategory;
-import org.onap.so.adapters.network.async.client.NetworkAdapterNotify;
-import org.onap.so.adapters.network.async.client.NetworkAdapterNotify_Service;
-import org.onap.so.adapters.network.async.client.QueryNetworkNotification;
-import org.onap.so.adapters.network.async.client.UpdateNetworkNotification;
-import org.onap.so.adapters.network.exceptions.NetworkException;
-import org.onap.so.entity.MsoRequest;
-import org.onap.logging.filter.base.ErrorCode;
-import org.onap.so.logger.LoggingAnchor;
-import org.onap.so.logger.MessageEnum;
-import org.onap.so.openstack.beans.NetworkRollback;
-import org.onap.so.openstack.beans.NetworkStatus;
-import org.onap.so.openstack.beans.Subnet;
-import org.onap.so.utils.CryptoUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-
-@Component
-@WebService(serviceName = "NetworkAdapterAsync",
-        endpointInterface = "org.onap.so.adapters.network.MsoNetworkAdapterAsync",
-        targetNamespace = "http://org.onap.so/networkA")
-public class MsoNetworkAdapterAsyncImpl implements MsoNetworkAdapterAsync {
-
-    private static final Logger logger = LoggerFactory.getLogger(MsoNetworkAdapterAsyncImpl.class);
-
-    private static final String BPEL_AUTH_PROP = "org.onap.so.adapters.network.bpelauth";
-    private static final String ENCRYPTION_KEY_PROP = "mso.msoKey";
-    private static final String NETWORK_EXCEPTION_MSG = "Got a NetworkException on createNetwork: ";
-    private static final String CREATE_NETWORK_ERROR_LOGMSG = "{} {} Error sending createNetwork notification {} ";
-    private static final String FAULT_INFO_ERROR_LOGMSG = "{} {} Exception - fault info ";
-    private static final String SHARED = "shared";
-    private static final String EXTERNAL = "external";
-
-    @Autowired
-    private Environment environment;
-
-    @Autowired
-    private MsoNetworkAdapter networkAdapter;
-
-    /**
-     * Health Check web method. Does nothing but return to show the adapter is deployed.
-     */
-    @Override
-    public void healthCheckA() {
-        logger.debug("Health check call in Network Adapter");
-    }
-
-    /**
-     * This is the "Create Network" web service implementation. It will create a new Network of the requested type in
-     * the specified cloud and tenant. The tenant must exist at the time this service is called.
-     *
-     * If a network with the same name already exists, this can be considered a success or failure, depending on the
-     * value of the 'failIfExists' parameter.
-     *
-     * There will be a pre-defined set of network types defined in the MSO Catalog. All such networks will have a
-     * similar configuration, based on the allowable Openstack networking definitions. This includes basic networks,
-     * provider networks (with a single VLAN), and multi-provider networks (one or more VLANs)
-     *
-     * Initially, all provider networks must be "vlan" type, and multiple segments in a multi-provider network must be
-     * multiple VLANs on the same physical network.
-     *
-     * This service supports two modes of Network creation/update: - via Heat Templates - via Neutron API The network
-     * orchestration mode for each network type is declared in its catalog definition. All Heat-based templates must
-     * support some subset of the same input parameters: network_name, physical_network, vlan(s).
-     *
-     * The method returns the network ID and a NetworkRollback object. This latter object can be passed as-is to the
-     * rollbackNetwork operation to undo everything that was created. This is useful if a network is successfully
-     * created but the orchestration fails on a subsequent operation.
-     */
-    @Override
-    public void createNetworkA(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
-            String networkName, String physicalNetworkName, List<Integer> vlans, Boolean failIfExists, Boolean backout,
-            List<Subnet> subnets, Map<String, String> networkParams, String messageId, MsoRequest msoRequest,
-            String notificationUrl) {
-
-        logger.debug("Async Create Network: {} of type {} in {}/{}", networkName, networkType, cloudSiteId, tenantId);
-
-        // Use the synchronous method to perform the actual Create
-
-
-        // Synchronous Web Service Outputs
-        Holder<String> networkId = new Holder<>();
-        Holder<String> neutronNetworkId = new Holder<>();
-        Holder<NetworkRollback> networkRollback = new Holder<>();
-        Holder<Map<String, String>> subnetIdMap = new Holder<>();
-
-        HashMap<String, String> params = (HashMap<String, String>) networkParams;
-        if (params == null)
-            params = new HashMap<>();
-        String shared = null;
-        String external = null;
-        if (params.containsKey(SHARED))
-            shared = params.get(SHARED);
-        if (params.containsKey(EXTERNAL))
-            external = params.get(EXTERNAL);
-
-        try {
-            networkAdapter.createNetwork(cloudSiteId, tenantId, networkType, modelCustomizationUuid, networkName,
-                    physicalNetworkName, vlans, shared, external, failIfExists, backout, subnets, params, msoRequest,
-                    networkId, neutronNetworkId, subnetIdMap, networkRollback);
-        } catch (NetworkException e) {
-            logger.debug(NETWORK_EXCEPTION_MSG, e);
-            MsoExceptionCategory exCat = null;
-            String eMsg = null;
-            try {
-                eMsg = e.getFaultInfo().getMessage();
-                exCat = MsoExceptionCategory.fromValue(e.getFaultInfo().getCategory().name());
-            } catch (Exception e1) {
-                logger.error(FAULT_INFO_ERROR_LOGMSG, MessageEnum.RA_FAULT_INFO_EXC, ErrorCode.DataError.getValue(),
-                        e1);
-            }
-            // Build and send Asynchronous error response
-            try {
-                NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-                notifyPort.createNetworkNotification(messageId, false, exCat, eMsg, null, null, null, null);
-            } catch (Exception e1) {
-                logger.error(CREATE_NETWORK_ERROR_LOGMSG, MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                        ErrorCode.DataError.getValue(), e1.getMessage(), e1);
-
-            }
-            return;
-        }
-        logger.debug("Async Create Network:Name {} physicalNetworkName:{}", networkName, physicalNetworkName);
-        // Build and send Asynchronous response
-        try {
-            NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-            notifyPort.createNetworkNotification(messageId, true, null, null, networkId.value, neutronNetworkId.value,
-                    copyCreateSubnetIdMap(subnetIdMap), copyNrb(networkRollback));
-        } catch (Exception e) {
-            logger.error(CREATE_NETWORK_ERROR_LOGMSG, MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                    ErrorCode.DataError.getValue(), e.getMessage(), e);
-
-        }
-        return;
-    }
-
-    /**
-     * This is the "Update Network" web service implementation. It will update an existing Network of the requested type
-     * in the specified cloud and tenant. The typical use will be to replace the VLANs with the supplied list (to add or
-     * remove a VLAN), but other properties may be updated as well.
-     *
-     * There will be a pre-defined set of network types defined in the MSO Catalog. All such networks will have a
-     * similar configuration, based on the allowable Openstack networking definitions. This includes basic networks,
-     * provider networks (with a single VLAN), and multi-provider networks (one or more VLANs).
-     *
-     * Initially, all provider networks must currently be "vlan" type, and multi-provider networks must be multiple
-     * VLANs on the same physical network.
-     *
-     * This service supports two modes of Network update: - via Heat Templates - via Neutron API The network
-     * orchestration mode for each network type is declared in its catalog definition. All Heat-based templates must
-     * support some subset of the same input parameters: network_name, physical_network, vlan, segments.
-     *
-     * The method returns a NetworkRollback object. This object can be passed as-is to the rollbackNetwork operation to
-     * undo everything that was updated. This is useful if a network is successfully updated but orchestration fails on
-     * a subsequent operation.
-     */
-    @Override
-    public void updateNetworkA(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
-            String networkId, String networkName, String physicalNetworkName, List<Integer> vlans, List<Subnet> subnets,
-            Map<String, String> networkParams, String messageId, MsoRequest msoRequest, String notificationUrl) {
-
-        logger.debug("Async Update Network: {} of type {} in {}/{}", networkId, networkType, cloudSiteId, tenantId);
-
-        // Use the synchronous method to perform the actual Create
-
-
-        // Synchronous Web Service Outputs
-        Holder<NetworkRollback> networkRollback = new Holder<>();
-        Holder<Map<String, String>> subnetIdMap = new Holder<>();
-
-        HashMap<String, String> params = (HashMap<String, String>) networkParams;
-        if (params == null)
-            params = new HashMap<>();
-        String shared = null;
-        String external = null;
-        if (params.containsKey(SHARED))
-            shared = params.get(SHARED);
-        if (params.containsKey(EXTERNAL))
-            external = params.get(EXTERNAL);
-
-        try {
-            networkAdapter.updateNetwork(cloudSiteId, tenantId, networkType, modelCustomizationUuid, networkId,
-                    networkName, physicalNetworkName, vlans, shared, external, subnets, params, msoRequest, subnetIdMap,
-                    networkRollback);
-        } catch (NetworkException e) {
-            logger.debug("Got a NetworkException on updateNetwork: ", e);
-            MsoExceptionCategory exCat = null;
-            String eMsg = null;
-            try {
-                eMsg = e.getFaultInfo().getMessage();
-                exCat = MsoExceptionCategory.fromValue(e.getFaultInfo().getCategory().name());
-            } catch (Exception e1) {
-                logger.error(FAULT_INFO_ERROR_LOGMSG, MessageEnum.RA_FAULT_INFO_EXC, ErrorCode.DataError.getValue(),
-                        e1);
-            }
-            // Build and send Asynchronous error response
-            try {
-                NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-                notifyPort.updateNetworkNotification(messageId, false, exCat, eMsg, null, copyNrb(networkRollback));
-            } catch (Exception e1) {
-                logger.error("{} {} Error sending updateNetwork notification {} ",
-                        MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC, ErrorCode.DataError.getValue(), e1.getMessage(), e1);
-
-            }
-            return;
-        }
-        logger.debug("Async Update Network:Name {} NetworkId:{}", networkName, networkId);
-        // Build and send Asynchronous response
-        try {
-            NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-            notifyPort.updateNetworkNotification(messageId, true, null, null, copyUpdateSubnetIdMap(subnetIdMap),
-                    copyNrb(networkRollback));
-        } catch (Exception e) {
-            logger.error("{} {} Error sending updateNotification request {} ", MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                    ErrorCode.DataError.getValue(), e.getMessage(), e);
-        }
-        return;
-    }
-
-    /**
-     * This is the queryNetwork method. It returns the existence and status of the specified network, along with its
-     * Neutron UUID and list of VLANs. This method attempts to find the network using both Heat and Neutron. Heat stacks
-     * are first searched based on the provided network name/id. If none is found, the Neutron is directly queried.
-     */
-    @Override
-    public void queryNetworkA(String cloudSiteId, String tenantId, String networkNameOrId, String messageId,
-            MsoRequest msoRequest, String notificationUrl) {
-
-        logger.debug("Async Query Network {} in {}/{}", networkNameOrId, cloudSiteId, tenantId);
-        String errorCreateNetworkMessage = CREATE_NETWORK_ERROR_LOGMSG;
-
-        // Use the synchronous method to perform the actual Create
-
-
-        // Synchronous Web Service Outputs
-        Holder<Boolean> networkExists = new Holder<>();
-        Holder<String> networkId = new Holder<>();
-        Holder<String> neutronNetworkId = new Holder<>();
-        Holder<NetworkStatus> status = new Holder<>();
-        Holder<List<Integer>> vlans = new Holder<>();
-        Holder<Map<String, String>> subnetIdMap = new Holder<>();
-
-        try {
-            networkAdapter.queryNetwork(cloudSiteId, tenantId, networkNameOrId, msoRequest, networkExists, networkId,
-                    neutronNetworkId, status, vlans, subnetIdMap);
-        } catch (NetworkException e) {
-            logger.debug(NETWORK_EXCEPTION_MSG, e);
-            MsoExceptionCategory exCat = null;
-            String eMsg = null;
-            try {
-                eMsg = e.getFaultInfo().getMessage();
-                exCat = MsoExceptionCategory.fromValue(e.getFaultInfo().getCategory().name());
-            } catch (Exception e1) {
-                logger.error(FAULT_INFO_ERROR_LOGMSG, MessageEnum.RA_FAULT_INFO_EXC, ErrorCode.DataError.getValue(),
-                        e1);
-            }
-            // Build and send Asynchronous error response
-            try {
-                NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-                notifyPort.queryNetworkNotification(messageId, false, exCat, eMsg, null, null, null, null, null, null);
-            } catch (Exception e1) {
-                logger.error(errorCreateNetworkMessage, MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                        ErrorCode.DataError.getValue(), e1.getMessage(), e1);
-            }
-            return;
-        }
-        logger.debug("Async Query Network:NameOrId {} tenantId:{}", networkNameOrId, tenantId);
-        // Build and send Asynchronous response
-        try {
-            NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-            org.onap.so.adapters.network.async.client.NetworkStatus networkS =
-                    org.onap.so.adapters.network.async.client.NetworkStatus.fromValue(status.value.name());
-            notifyPort.queryNetworkNotification(messageId, true, null, null, networkExists.value, networkId.value,
-                    neutronNetworkId.value, networkS, vlans.value, copyQuerySubnetIdMap(subnetIdMap));
-        } catch (Exception e) {
-            logger.error(errorCreateNetworkMessage, MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                    ErrorCode.DataError.getValue(), e.getMessage(), e);
-        }
-        return;
-    }
-
-    /**
-     * This is the "Delete Network" web service implementation. It will delete a Network in the specified cloud and
-     * tenant.
-     *
-     * If the network is not found, it is treated as a success.
-     *
-     * This service supports two modes of Network creation/update/delete: - via Heat Templates - via Neutron API The
-     * network orchestration mode for each network type is declared in its catalog definition.
-     *
-     * For Heat-based orchestration, the networkId should be the stack ID. For Neutron-based orchestration, the
-     * networkId should be the Neutron network UUID.
-     *
-     * The method returns nothing on success. Rollback is not possible for delete commands, so any failure on delete
-     * will require manual fallout in the client.
-     */
-    @Override
-    public void deleteNetworkA(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
-            String networkId, String messageId, MsoRequest msoRequest, String notificationUrl) {
-
-        String serviceName = "DeleteNetworkA";
-        logger.debug("Async Delete Network {} in {}/{}", networkId, cloudSiteId, tenantId);
-
-        // Use the synchronous method to perform the actual Create
-
-
-        // Synchronous Web Service Outputs
-        Holder<Boolean> networkDeleted = new Holder<>();
-
-        try {
-            networkAdapter.deleteNetwork(cloudSiteId, tenantId, networkType, modelCustomizationUuid, networkId,
-                    msoRequest, networkDeleted);
-        } catch (NetworkException e) {
-            logger.debug(NETWORK_EXCEPTION_MSG, e);
-            MsoExceptionCategory exCat = null;
-            String eMsg = null;
-            try {
-                eMsg = e.getFaultInfo().getMessage();
-                exCat = MsoExceptionCategory.fromValue(e.getFaultInfo().getCategory().name());
-            } catch (Exception e1) {
-                logger.error(FAULT_INFO_ERROR_LOGMSG, MessageEnum.RA_FAULT_INFO_EXC, ErrorCode.DataError.getValue(),
-                        e1);
-            }
-            // Build and send Asynchronous error response
-            try {
-                NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-                notifyPort.deleteNetworkNotification(messageId, false, exCat, eMsg, null);
-            } catch (Exception e1) {
-                logger.error(CREATE_NETWORK_ERROR_LOGMSG, MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                        ErrorCode.DataError.getValue(), e1.getMessage(), e1);
-
-            }
-            return;
-        }
-        logger.debug("Async Delete NetworkId: {} tenantId:{}", networkId, tenantId);
-        // Build and send Asynchronous response
-        try {
-            NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-            notifyPort.deleteNetworkNotification(messageId, true, null, null, networkDeleted.value);
-        } catch (Exception e) {
-            logger.error("{} {} Error sending deleteNetwork notification {} ", MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                    ErrorCode.DataError.getValue(), e.getMessage(), e);
-
-        }
-        return;
-    }
-
-    /**
-     * This web service endpoint will rollback a previous Create VNF operation. A rollback object is returned to the
-     * client in a successful creation response. The client can pass that object as-is back to the rollbackNetwork
-     * operation to undo the creation.
-     *
-     * The rollback includes removing the VNF and deleting the tenant if the tenant did not exist prior to the VNF
-     * creation.
-     */
-    @Override
-    public void rollbackNetworkA(NetworkRollback rollback, String messageId, String notificationUrl) {
-        // rollback may be null (e.g. if network already existed when Create was called)
-        if (rollback == null) {
-            logger.warn("{} {} Rollback is null", MessageEnum.RA_ROLLBACK_NULL, ErrorCode.SchemaError.getValue());
-            return;
-        }
-
-        logger.info(LoggingAnchor.TWO, MessageEnum.RA_ASYNC_ROLLBACK, rollback.getNetworkStackId());
-        // Use the synchronous method to perform the actual Create
-
-
-        try {
-            networkAdapter.rollbackNetwork(rollback);
-        } catch (NetworkException e) {
-            logger.debug("Got a NetworkException on rollbackNetwork: ", e);
-            // Build and send Asynchronous error response
-            MsoExceptionCategory exCat = null;
-            String eMsg = null;
-            try {
-                eMsg = e.getFaultInfo().getMessage();
-                exCat = MsoExceptionCategory.fromValue(e.getFaultInfo().getCategory().name());
-            } catch (Exception e1) {
-                logger.error("{} {} Exception in get fault info ", MessageEnum.RA_FAULT_INFO_EXC,
-                        ErrorCode.DataError.getValue(), e1);
-            }
-            // Build and send Asynchronous error response
-            try {
-                NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-                notifyPort.rollbackNetworkNotification(rollback.getMsoRequest().getRequestId(), false, exCat, eMsg);
-            } catch (Exception e1) {
-                logger.error(CREATE_NETWORK_ERROR_LOGMSG, MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC,
-                        ErrorCode.DataError.getValue(), e1.getMessage(), e1);
-
-            }
-            return;
-        }
-        logger.debug("Async Rollback NetworkId: {} tenantId:{}", rollback.getNetworkStackId(), rollback.getTenantId());
-        // Build and send Asynchronous response
-        try {
-            NetworkAdapterNotify notifyPort = getNotifyEP(notificationUrl);
-            notifyPort.rollbackNetworkNotification(rollback.getMsoRequest().getRequestId(), true, null, null);
-        } catch (Exception e) {
-            logger.error("{} {} Error sending rollbackNetwork notification {} ",
-                    MessageEnum.RA_CREATE_NETWORK_NOTIF_EXC, ErrorCode.DataError.getValue(), e.getMessage(), e);
-
-        }
-        return;
-    }
-
-    private org.onap.so.adapters.network.async.client.NetworkRollback copyNrb(Holder<NetworkRollback> hNrb) {
-        org.onap.so.adapters.network.async.client.NetworkRollback cnrb =
-                new org.onap.so.adapters.network.async.client.NetworkRollback();
-
-        if (hNrb != null && hNrb.value != null) {
-            org.onap.so.adapters.network.async.client.MsoRequest cmr =
-                    new org.onap.so.adapters.network.async.client.MsoRequest();
-
-            cnrb.setCloudId(hNrb.value.getCloudId());
-            cmr.setRequestId(hNrb.value.getMsoRequest().getRequestId());
-            cmr.setServiceInstanceId(hNrb.value.getMsoRequest().getServiceInstanceId());
-            cnrb.setMsoRequest(cmr);
-            cnrb.setNetworkId(hNrb.value.getNetworkId());
-            cnrb.setNetworkStackId(hNrb.value.getNetworkStackId());
-            cnrb.setNeutronNetworkId(hNrb.value.getNeutronNetworkId());
-            cnrb.setTenantId(hNrb.value.getTenantId());
-            cnrb.setNetworkType(hNrb.value.getNetworkType());
-            cnrb.setNetworkCreated(hNrb.value.getNetworkCreated());
-            cnrb.setNetworkName(hNrb.value.getNetworkName());
-            cnrb.setPhysicalNetwork(hNrb.value.getPhysicalNetwork());
-            List<Integer> vlansc = cnrb.getVlans();
-            List<Integer> vlansh = hNrb.value.getVlans();
-            if (vlansh != null) {
-                vlansc.addAll(vlansh);
-            }
-        }
-        return cnrb;
-    }
-
-    private NetworkAdapterNotify getNotifyEP(String notificationUrl) {
-
-        URL warWsdlLoc = null;
-        try {
-            warWsdlLoc = Thread.currentThread().getContextClassLoader().getResource("NetworkAdapterNotify.wsdl");
-        } catch (Exception e) {
-            logger.error("{} {} Exception - WSDL not found ", MessageEnum.RA_WSDL_NOT_FOUND,
-                    ErrorCode.DataError.getValue(), e);
-        }
-        if (warWsdlLoc == null) {
-            logger.error("{} {} WSDL not found", MessageEnum.RA_WSDL_NOT_FOUND, ErrorCode.DataError.getValue());
-        } else {
-            try {
-                logger.debug("NetworkAdpaterNotify.wsdl location: {}", warWsdlLoc.toURI().toString());
-            } catch (Exception e) {
-                logger.error("{} {} Exception - WSDL URL convention ", MessageEnum.RA_WSDL_URL_CONVENTION_EXC,
-                        ErrorCode.SchemaError.getValue(), e);
-            }
-        }
-
-        NetworkAdapterNotify_Service notifySvc = new NetworkAdapterNotify_Service(warWsdlLoc,
-                new QName("http://org.onap.so/networkNotify", "networkAdapterNotify"));
-
-        NetworkAdapterNotify notifyPort = notifySvc.getMsoNetworkAdapterAsyncImplPort();
-
-        BindingProvider bp = (BindingProvider) notifyPort;
-
-        URL epUrl = null;
-        try {
-            epUrl = new URL(notificationUrl);
-        } catch (MalformedURLException e1) {
-            logger.error("{} {} Exception - init notification ", MessageEnum.RA_INIT_NOTIF_EXC,
-                    ErrorCode.DataError.getValue(), e1);
-        }
-
-        if (null != epUrl) {
-            logger.debug("Notification Endpoint URL: {}", epUrl.toExternalForm());
-            bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, epUrl.toExternalForm());
-        } else {
-            logger.debug("Notification Endpoint URL is NULL: ");
-        }
-
-        // authentication
-        try {
-            Map<String, Object> reqCtx = bp.getRequestContext();
-            Map<String, List<String>> headers = new HashMap<>();
-
-            String userCredentials = this.getEncryptedProperty(BPEL_AUTH_PROP, "", ENCRYPTION_KEY_PROP);
-
-            String basicAuth = "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes());
-            reqCtx.put(MessageContext.HTTP_REQUEST_HEADERS, headers);
-            headers.put("Authorization", Collections.singletonList(basicAuth));
-        } catch (Exception e) {
-            logger.error("{} {} Unable to set authorization in callback request {} ",
-                    MessageEnum.RA_SET_CALLBACK_AUTH_EXC, ErrorCode.DataError.getValue(), e.getMessage(), e);
-        }
-
-        return notifyPort;
-    }
-
-    public String getEncryptedProperty(String key, String defaultValue, String encryptionKey) {
-        try {
-            return CryptoUtils.decrypt(this.environment.getProperty(key), this.environment.getProperty(encryptionKey));
-        } catch (GeneralSecurityException e) {
-            logger.debug("Exception while decrypting property: {} ", this.environment.getProperty(key), e);
-        }
-        return defaultValue;
-
-    }
-
-    private CreateNetworkNotification.SubnetIdMap copyCreateSubnetIdMap(Holder<Map<String, String>> hMap) {
-
-        CreateNetworkNotification.SubnetIdMap subnetIdMap = new CreateNetworkNotification.SubnetIdMap();
-
-        if (hMap != null && hMap.value != null) {
-            Map<String, String> sMap = hMap.value;
-            CreateNetworkNotification.SubnetIdMap.Entry entry = new CreateNetworkNotification.SubnetIdMap.Entry();
-
-            for (Map.Entry<String, String> mapEntry : sMap.entrySet()) {
-                String key = mapEntry.getKey();
-                String value = mapEntry.getValue();
-                entry.setKey(key);
-                entry.setValue(value);
-                subnetIdMap.getEntry().add(entry);
-            }
-        }
-        return subnetIdMap;
-    }
-
-    private UpdateNetworkNotification.SubnetIdMap copyUpdateSubnetIdMap(Holder<Map<String, String>> hMap) {
-
-        UpdateNetworkNotification.SubnetIdMap subnetIdMap = new UpdateNetworkNotification.SubnetIdMap();
-
-        if (hMap != null && hMap.value != null) {
-            Map<String, String> sMap = hMap.value;
-            UpdateNetworkNotification.SubnetIdMap.Entry entry = new UpdateNetworkNotification.SubnetIdMap.Entry();
-
-            for (Map.Entry<String, String> mapEntry : sMap.entrySet()) {
-                String key = mapEntry.getKey();
-                String value = mapEntry.getValue();
-                entry.setKey(key);
-                entry.setValue(value);
-                subnetIdMap.getEntry().add(entry);
-            }
-        }
-        return subnetIdMap;
-    }
-
-    private QueryNetworkNotification.SubnetIdMap copyQuerySubnetIdMap(Holder<Map<String, String>> hMap) {
-
-        QueryNetworkNotification.SubnetIdMap subnetIdMap = new QueryNetworkNotification.SubnetIdMap();
-
-        if (hMap != null && hMap.value != null) {
-            Map<String, String> sMap = hMap.value;
-            QueryNetworkNotification.SubnetIdMap.Entry entry = new QueryNetworkNotification.SubnetIdMap.Entry();
-
-            for (Map.Entry<String, String> mapEntry : sMap.entrySet()) {
-                String key = mapEntry.getKey();
-                String value = mapEntry.getValue();
-                entry.setKey(key);
-                entry.setValue(value);
-                subnetIdMap.getEntry().add(entry);
-            }
-        }
-        return subnetIdMap;
-    }
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
index 860c747f15..489585c04b 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
@@ -140,6 +140,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
      * @see MsoNetworkAdapterImpl#MsoNetworkAdapterImpl(MsoPropertiesFactory)
      */
 
+    @Deprecated
     @Override
     public void createNetwork(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
             String networkName, String physicalNetworkName, List<Integer> vlans, String shared, String external,
@@ -149,9 +150,10 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
         Holder<String> networkFqdn = new Holder<>();
         createNetwork(cloudSiteId, tenantId, networkType, modelCustomizationUuid, networkName, physicalNetworkName,
                 vlans, null, shared, external, failIfExists, backout, subnets, null, null, msoRequest, networkId,
-                neutronNetworkId, networkFqdn, subnetIdMap, rollback);
+                neutronNetworkId, networkFqdn, subnetIdMap, rollback, true);
     }
 
+    @Deprecated
     @Override
     public void createNetworkContrail(String cloudSiteId, String tenantId, String networkType,
             String modelCustomizationUuid, String networkName, List<RouteTarget> routeTargets, String shared,
@@ -162,7 +164,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
             throws NetworkException {
         createNetwork(cloudSiteId, tenantId, networkType, modelCustomizationUuid, networkName, null, null, routeTargets,
                 shared, external, failIfExists, backout, subnets, policyFqdns, routeTableFqdns, msoRequest, networkId,
-                neutronNetworkId, networkFqdn, subnetIdMap, rollback);
+                neutronNetworkId, networkFqdn, subnetIdMap, rollback, true);
     }
 
     /**
@@ -188,12 +190,12 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
      * created but the orchestration fails on a subsequent operation.
      */
 
-    private void createNetwork(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
+    public void createNetwork(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
             String networkName, String physicalNetworkName, List<Integer> vlans, List<RouteTarget> routeTargets,
             String shared, String external, Boolean failIfExists, Boolean backout, List<Subnet> subnets,
             List<String> policyFqdns, List<String> routeTableFqdns, MsoRequest msoRequest, Holder<String> networkId,
             Holder<String> neutronNetworkId, Holder<String> networkFqdn, Holder<Map<String, String>> subnetIdMap,
-            Holder<NetworkRollback> rollback) throws NetworkException {
+            Holder<NetworkRollback> rollback, Boolean pollForCompletion) throws NetworkException {
         logger.debug("*** CREATE Network: {} of type {} in {}/{}", networkName, networkType, cloudSiteId, tenantId);
 
         // Will capture execution time for metrics
@@ -365,7 +367,8 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
             if (backout == null)
                 backout = true;
             heatStack = heat.createStack(cloudSiteId, CLOUD_OWNER, tenantId, networkName, null, template, stackParams,
-                    true, heatTemplate.getTimeoutMinutes(), null, null, null, backout.booleanValue(), failIfExists);
+                    pollForCompletion, heatTemplate.getTimeoutMinutes(), null, null, null, backout.booleanValue(),
+                    failIfExists);
         } catch (MsoException me) {
             me.addContext(CREATE_NETWORK_CONTEXT);
             logger.error("{} {} Exception creating network type {} in {}/{} ", MessageEnum.RA_CREATE_NETWORK_EXC,
@@ -423,6 +426,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
         return;
     }
 
+    @Deprecated
     @Override
     public void updateNetwork(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
             String networkId, String networkName, String physicalNetworkName, List<Integer> vlans, String shared,
@@ -434,6 +438,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
 
     }
 
+    @Deprecated
     @Override
     public void updateNetworkContrail(String cloudSiteId, String tenantId, String networkType,
             String modelCustomizationUuid, String networkId, String networkName, List<RouteTarget> routeTargets,
@@ -465,7 +470,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
      * undo everything that was updated. This is useful if a network is successfully updated but orchestration fails on
      * a subsequent operation.
      */
-    private void updateNetwork(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
+    public void updateNetwork(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
             String networkId, String networkName, String physicalNetworkName, List<Integer> vlans,
             List<RouteTarget> routeTargets, String shared, String external, List<Subnet> subnets,
             List<String> policyFqdns, List<String> routeTableFqdns, MsoRequest msoRequest,
@@ -524,7 +529,6 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
                 // Does not exist. Throw an exception (can't update a non-existent network)
                 throw new NetworkException(error, MsoExceptionCategory.USERDATA);
             }
-            long updateNetworkStarttime = System.currentTimeMillis();
             try {
                 netInfo = neutron.updateNetwork(cloudSiteId, tenantId, networkId, neutronNetworkType,
                         physicalNetworkName, vlans);
@@ -671,7 +675,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
             // Ignore MsoStackNotFound exception because we already checked.
             try {
                 heatStack = heatWithUpdate.updateStack(cloudSiteId, CLOUD_OWNER, tenantId, networkId, template,
-                        stackParams, true, heatTemplate.getTimeoutMinutes());
+                        stackParams, false, heatTemplate.getTimeoutMinutes());
             } catch (MsoException me) {
                 me.addContext(UPDATE_NETWORK_CONTEXT);
                 logger.error("{} {} Exception - update network {} in {}/{} ", MessageEnum.RA_UPDATE_NETWORK_ERR,
@@ -944,7 +948,8 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
      */
     @Override
     public void deleteNetwork(String cloudSiteId, String tenantId, String networkType, String modelCustomizationUuid,
-            String networkId, MsoRequest msoRequest, Holder<Boolean> networkDeleted) throws NetworkException {
+            String networkId, MsoRequest msoRequest, Holder<Boolean> networkDeleted, Boolean pollForCompletion)
+            throws NetworkException {
         logger.debug("*** DELETE Network adapter with Network: {} in {}/{}", networkId, cloudSiteId, tenantId);
         if (commonUtils.isNullOrEmpty(cloudSiteId) || commonUtils.isNullOrEmpty(tenantId)
                 || commonUtils.isNullOrEmpty(networkId)) {
@@ -953,6 +958,10 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
             throw new NetworkException(error, MsoExceptionCategory.USERDATA);
         }
 
+        if (pollForCompletion == null) {
+            pollForCompletion = true;
+        }
+
         // Retrieve the Network Resource definition
         NetworkResource networkResource = null;
         if (commonUtils.isNullOrEmpty(modelCustomizationUuid)) {
@@ -980,7 +989,8 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
         }
 
         try {
-            StackInfo stack = heat.deleteStack(tenantId, CLOUD_OWNER, cloudSiteId, networkId, true, timeoutMinutes);
+            StackInfo stack =
+                    heat.deleteStack(tenantId, CLOUD_OWNER, cloudSiteId, networkId, pollForCompletion, timeoutMinutes);
             networkDeleted.value = stack.isOperationPerformed();
         } catch (MsoException me) {
             me.addContext("DeleteNetwork");
@@ -1006,12 +1016,16 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
      * creation.
      */
     @Override
-    public void rollbackNetwork(NetworkRollback rollback) throws NetworkException {
+    public void rollbackNetwork(NetworkRollback rollback, Boolean pollForCompletion) throws NetworkException {
         if (rollback == null) {
             logger.error("{} {} rollback is null", MessageEnum.RA_ROLLBACK_NULL, ErrorCode.DataError.getValue());
             return;
         }
 
+        if (pollForCompletion == null) {
+            pollForCompletion = true;
+        }
+
         // Get the elements of the VnfRollback object for easier access
         String cloudSiteId = rollback.getCloudId();
         String tenantId = rollback.getTenantId();
@@ -1021,7 +1035,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
 
         if (rollback.getNetworkCreated()) {
             try {
-                heat.deleteStack(tenantId, CLOUD_OWNER, cloudSiteId, networkId, true, 120);
+                heat.deleteStack(tenantId, CLOUD_OWNER, cloudSiteId, networkId, pollForCompletion, 120);
             } catch (MsoException me) {
                 me.addContext("RollbackNetwork");
                 logger.error("{} {} Exception - Rollback Network (heat): {} in {}/{} ",
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/NetworkAdapterRest.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/NetworkAdapterRest.java
deleted file mode 100644
index 09356d02c8..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/NetworkAdapterRest.java
+++ /dev/null
@@ -1,660 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.onap.so.adapters.network;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Provider;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.xml.ws.Holder;
-import org.apache.http.HttpStatus;
-import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.onap.so.adapters.network.exceptions.NetworkException;
-import org.onap.so.adapters.nwrest.ContrailNetwork;
-import org.onap.so.adapters.nwrest.CreateNetworkError;
-import org.onap.so.adapters.nwrest.CreateNetworkRequest;
-import org.onap.so.adapters.nwrest.CreateNetworkResponse;
-import org.onap.so.adapters.nwrest.DeleteNetworkError;
-import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
-import org.onap.so.adapters.nwrest.DeleteNetworkResponse;
-import org.onap.so.adapters.nwrest.ProviderVlanNetwork;
-import org.onap.so.adapters.nwrest.QueryNetworkError;
-import org.onap.so.adapters.nwrest.QueryNetworkResponse;
-import org.onap.so.adapters.nwrest.RollbackNetworkError;
-import org.onap.so.adapters.nwrest.RollbackNetworkRequest;
-import org.onap.so.adapters.nwrest.RollbackNetworkResponse;
-import org.onap.so.adapters.nwrest.UpdateNetworkError;
-import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
-import org.onap.so.adapters.nwrest.UpdateNetworkResponse;
-import org.onap.so.adapters.vnf.BpelRestClient;
-import org.onap.so.entity.MsoRequest;
-import org.onap.logging.filter.base.ErrorCode;
-import org.onap.so.logger.MessageEnum;
-import org.onap.so.openstack.beans.NetworkRollback;
-import org.onap.so.openstack.beans.NetworkStatus;
-import org.onap.so.openstack.beans.RouteTarget;
-import org.onap.so.openstack.exceptions.MsoExceptionCategory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-
-@Path("/v1/networks")
-@Api(value = "/v1/networks", description = "root of network adapters restful web service")
-@Component
-@Transactional
-public class NetworkAdapterRest {
-
-    private static final Logger logger = LoggerFactory.getLogger(NetworkAdapterRest.class);
-    private static final String TESTING_KEYWORD = "___TESTING___";
-    private String exceptionMsg = "Exception:";
-    private static final String SHARED = "shared";
-    private static final String EXTERNAL = "external";
-
-    @Autowired
-    private MsoNetworkAdapterImpl adapter;
-
-    @Autowired
-    private Provider<BpelRestClient> bpelRestClientProvider;
-
-
-    @POST
-    @Path("")
-    @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(value = "CreateNetwork", response = Response.class,
-            notes = "Creates a new network, CreateNetworkRquest JSON is required")
-    @ApiResponses({@ApiResponse(code = 200, message = "network has been successfully created"),
-            @ApiResponse(code = 202, message = "create network request has been accepted (async only)"),
-            @ApiResponse(code = 500, message = "create network failed, examine entity object for details")})
-    public Response createNetwork(
-            @ApiParam(value = "details of network being created", required = true) CreateNetworkRequest req) {
-        logger.debug("createNetwork enter: {}", req.toJsonString());
-        CreateNetworkTask task = new CreateNetworkTask(req);
-        if (req.isSynchronous()) {
-            // This is a synchronous request
-            task.run();
-            return Response.status(task.getStatusCode()).entity(task.getGenericEntityResponse()).build();
-        } else {
-            // This is an asynchronous request
-            try {
-                Thread t1 = new Thread(task);
-                t1.start();
-            } catch (Exception e) {
-                // problem handling create, send generic failure as sync resp to caller
-                logger.error("{} {} Exception while create network ", MessageEnum.RA_CREATE_NETWORK_EXC,
-                        ErrorCode.BusinessProcessError.getValue(), e);
-                return Response.serverError().build();
-            }
-            // send sync response (ACK) to caller
-            logger.debug("createNetwork exit");
-            return Response.status(HttpStatus.SC_ACCEPTED).build();
-        }
-    }
-
-    public class CreateNetworkTask implements Runnable {
-        private final CreateNetworkRequest req;
-        private CreateNetworkResponse response = null;
-        private CreateNetworkError eresp = null;
-        private boolean sendxml;
-
-        public CreateNetworkTask(CreateNetworkRequest req) {
-            this.req = req;
-            this.sendxml = true; // can be set with a field or header later
-        }
-
-        public int getStatusCode() {
-            return (response != null) ? HttpStatus.SC_OK : HttpStatus.SC_BAD_REQUEST;
-        }
-
-        public Object getGenericEntityResponse() {
-            return (response != null) ? new GenericEntity<CreateNetworkResponse>(response) {}
-                    : new GenericEntity<CreateNetworkError>(eresp) {};
-        }
-
-        private String getResponse() {
-            if (response != null) {
-                return sendxml ? response.toXmlString() : response.toJsonString();
-            } else {
-                return sendxml ? eresp.toXmlString() : eresp.toJsonString();
-            }
-        }
-
-        @Override
-        public void run() {
-            try {
-                MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, req.getMsoRequest().getRequestId());
-            } catch (Exception e) {
-                logger.error("Error adding RequestId to MDC", e);
-            }
-            logger.debug("CreateNetworkTask start");
-            try {
-                // Synchronous Web Service Outputs
-                Holder<String> networkId = new Holder<>();
-                Holder<String> neutronNetworkId = new Holder<>();
-                Holder<String> networkFqdn = new Holder<>();
-                Holder<Map<String, String>> subnetIdMap = new Holder<>();
-                Holder<NetworkRollback> rollback = new Holder<>();
-
-                HashMap<String, String> params = (HashMap<String, String>) req.getNetworkParams();
-                if (params == null) {
-                    params = new HashMap<>();
-                }
-                String shared = null;
-                String external = null;
-
-                String cloudsite = req.getCloudSiteId();
-                if (cloudsite != null && cloudsite.equals(TESTING_KEYWORD)) {
-                    String tenant = req.getTenantId();
-                    if (tenant != null && tenant.equals(TESTING_KEYWORD)) {
-                        throw new NetworkException("testing.");
-                    }
-                    networkId.value = "479D3D8B-6360-47BC-AB75-21CC91981484";
-                    neutronNetworkId.value = "55e55884-28fa-11e6-8971-0017f20fe1b8";
-                    networkFqdn.value = "086f70b6-28fb-11e6-8260-0017f20fe1b8";
-                    subnetIdMap.value = testMap();
-                    rollback.value = new NetworkRollback();
-                } else if (req.isContrailRequest()) {
-                    ContrailNetwork ctn = req.getContrailNetwork();
-                    if (ctn == null) {
-                        ctn = new ContrailNetwork();
-                        req.setContrailNetwork(ctn);
-                    }
-                    if (params.containsKey(SHARED)) {
-                        shared = params.get(SHARED);
-                    } else {
-                        if (ctn.getShared() != null) {
-                            shared = ctn.getShared();
-                        }
-                    }
-                    if (params.containsKey(EXTERNAL)) {
-                        external = params.get(EXTERNAL);
-                    } else {
-                        if (ctn.getExternal() != null) {
-                            external = ctn.getExternal();
-                        }
-                    }
-                    adapter.createNetworkContrail(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
-                            req.getModelCustomizationUuid(), req.getNetworkName(),
-                            req.getContrailNetwork().getRouteTargets(), shared, external, req.getFailIfExists(),
-                            req.getBackout(), req.getSubnets(), params, req.getContrailNetwork().getPolicyFqdns(),
-                            req.getContrailNetwork().getRouteTableFqdns(), req.getMsoRequest(), networkId,
-                            neutronNetworkId, networkFqdn, subnetIdMap, rollback);
-                } else {
-                    ProviderVlanNetwork pvn = req.getProviderVlanNetwork();
-                    if (pvn == null) {
-                        pvn = new ProviderVlanNetwork();
-                        req.setProviderVlanNetwork(pvn);
-                    }
-                    if (params.containsKey(SHARED))
-                        shared = params.get(SHARED);
-                    if (params.containsKey(EXTERNAL))
-                        external = params.get(EXTERNAL);
-                    adapter.createNetwork(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
-                            req.getModelCustomizationUuid(), req.getNetworkName(),
-                            req.getProviderVlanNetwork().getPhysicalNetworkName(),
-                            req.getProviderVlanNetwork().getVlans(), shared, external, req.getFailIfExists(),
-                            req.getBackout(), req.getSubnets(), params, req.getMsoRequest(), networkId,
-                            neutronNetworkId, subnetIdMap, rollback);
-                }
-                response = new CreateNetworkResponse(req.getNetworkId(), neutronNetworkId.value,
-                        rollback.value.getNetworkStackId(), networkFqdn.value, rollback.value.getNetworkCreated(),
-                        subnetIdMap.value, rollback.value, req.getMessageId());
-            } catch (NetworkException e) {
-                logger.debug(exceptionMsg, e);
-                eresp = new CreateNetworkError(e.getMessage(), MsoExceptionCategory.INTERNAL, true, req.getMessageId());
-            }
-            if (!req.isSynchronous()) {
-                // This is asynch, so POST response back to caller
-                BpelRestClient bpelClient = bpelRestClientProvider.get();
-                bpelClient.bpelPost(getResponse(), req.getNotificationUrl(), sendxml);
-            }
-            logger.debug("CreateNetworkTask exit: code={}, resp={}", getStatusCode(), getResponse());
-        }
-    }
-
-    @DELETE
-    @Path("{aaiNetworkId}")
-    @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(value = "DeleteNetwork", response = Response.class,
-            notes = "Deletes an existing network, aaiNetworkId and DeleteNetworkRequest JSON are required")
-    @ApiResponses({@ApiResponse(code = 200, message = "network has been successfully deleted"),
-            @ApiResponse(code = 202, message = "request to delete network has been accepted (async only)"),
-            @ApiResponse(code = 500, message = "delete network failed, examine entity object for details")})
-    public Response deleteNetwork(
-            @ApiParam(value = "aaiNetworkId to be deleted ",
-                    required = true) @PathParam("aaiNetworkId") String aaiNetworkId,
-            @ApiParam(value = "details of network being deleted", required = true) DeleteNetworkRequest req) {
-        logger.debug("deleteNetwork enter: {}", req.toJsonString());
-        if (aaiNetworkId == null || !aaiNetworkId.equals(req.getNetworkId())) {
-            return Response.status(HttpStatus.SC_BAD_REQUEST).type(MediaType.TEXT_PLAIN).entity(
-                    "A&AI NetworkId in URL (" + aaiNetworkId + ") does not match content (" + req.getNetworkId() + ")")
-                    .build();
-        }
-        DeleteNetworkTask task = new DeleteNetworkTask(req);
-        if (req.isSynchronous()) {
-            // This is a synchronous request
-            task.run();
-            return Response.status(task.getStatusCode()).entity(task.getGenericEntityResponse()).build();
-        } else {
-            // This is an asynchronous request
-            try {
-                Thread t1 = new Thread(task);
-                t1.start();
-            } catch (Exception e) {
-                // problem handling create, send generic failure as sync resp to caller
-                logger.error("{} {} Exception while delete network ", MessageEnum.RA_DELETE_NETWORK_EXC,
-                        ErrorCode.BusinessProcessError.getValue(), e);
-                return Response.serverError().build();
-            }
-            // send sync response (ACK) to caller
-            logger.debug("deleteNetwork exit");
-            return Response.status(HttpStatus.SC_ACCEPTED).build();
-        }
-    }
-
-    public class DeleteNetworkTask implements Runnable {
-        private final DeleteNetworkRequest req;
-        private DeleteNetworkResponse response = null;
-        private DeleteNetworkError eresp = null;
-        private boolean sendxml;
-
-        public DeleteNetworkTask(DeleteNetworkRequest req) {
-            this.req = req;
-            this.sendxml = true; // can be set with a field or header later
-        }
-
-        public int getStatusCode() {
-            return (response != null) ? HttpStatus.SC_OK : HttpStatus.SC_BAD_REQUEST;
-        }
-
-        public Object getGenericEntityResponse() {
-            return (response != null) ? new GenericEntity<DeleteNetworkResponse>(response) {}
-                    : new GenericEntity<DeleteNetworkError>(eresp) {};
-        }
-
-        private String getResponse() {
-            if (response != null) {
-                return sendxml ? response.toXmlString() : response.toJsonString();
-            } else {
-                return sendxml ? eresp.toXmlString() : eresp.toJsonString();
-            }
-        }
-
-        @Override
-        public void run() {
-            try {
-                MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, req.getMsoRequest().getRequestId());
-            } catch (Exception e) {
-                logger.error("Error adding RequestId to MDC", e);
-            }
-            logger.debug("DeleteNetworkTask start");
-            try {
-                Holder<Boolean> networkDeleted = new Holder<>();
-                if (req.getCloudSiteId().equals(TESTING_KEYWORD)) {
-                    networkDeleted.value = true;
-                } else {
-                    adapter.deleteNetwork(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
-                            req.getModelCustomizationUuid(), req.getNetworkStackId(), req.getMsoRequest(),
-                            networkDeleted);
-                }
-                response = new DeleteNetworkResponse(req.getNetworkId(), networkDeleted.value, req.getMessageId());
-            } catch (NetworkException e) {
-                logger.debug(exceptionMsg, e);
-                eresp = new DeleteNetworkError(e.getMessage(), MsoExceptionCategory.INTERNAL, true, req.getMessageId());
-            }
-            if (!req.isSynchronous()) {
-                // This is asynch, so POST response back to caller
-                BpelRestClient bpelClient = bpelRestClientProvider.get();
-                bpelClient.bpelPost(getResponse(), req.getNotificationUrl(), sendxml);
-            }
-            logger.debug("DeleteNetworkTask exit: code={}, resp={}", getStatusCode(), getResponse());
-        }
-    }
-
-    @GET
-    @Path("{aaiNetworkId}")
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(value = "QueryNetwork", response = Response.class, notes = "Queries an existing network")
-    @ApiResponses({@ApiResponse(code = 200, message = "Query network successful"),
-            @ApiResponse(code = 500, message = "Query network failed, examine entity object for details")})
-    public Response queryNetwork(
-            @ApiParam(value = "cloudSiteId", required = false) @QueryParam("cloudSiteId") String cloudSiteId,
-            @ApiParam(value = "tenantId", required = false) @QueryParam("tenantId") String tenantId,
-            @ApiParam(value = "networkStackId", required = false) @QueryParam("networkStackId") String networkStackId,
-            @ApiParam(value = "skipAAI", required = false) @QueryParam("skipAAI") String skipAAI,
-            @ApiParam(value = "msoRequest.requestId",
-                    required = false) @QueryParam("msoRequest.requestId") String requestId,
-            @ApiParam(value = "msoRequest.serviceInstanceId",
-                    required = false) @QueryParam("msoRequest.serviceInstanceId") String serviceInstanceId,
-            @ApiParam(value = "aaiNetworkId", required = false) @PathParam("aaiNetworkId") String aaiNetworkId) {
-        // This request responds synchronously only
-        logger.debug("Query network enter:{}" + aaiNetworkId);
-        MsoRequest msoRequest = new MsoRequest(requestId, serviceInstanceId);
-
-        try {
-            int respStatus = HttpStatus.SC_OK;
-            QueryNetworkResponse resp = new QueryNetworkResponse(networkStackId, null, networkStackId, null, null);
-            Holder<Boolean> networkExists = new Holder<>();
-            Holder<String> networkId = new Holder<>();
-            Holder<String> neutronNetworkId = new Holder<>();
-            Holder<NetworkStatus> status = new Holder<>();
-            Holder<List<RouteTarget>> routeTargets = new Holder<>();
-            Holder<Map<String, String>> subnetIdMap = new Holder<>();
-
-            adapter.queryNetworkContrail(cloudSiteId, tenantId, aaiNetworkId, msoRequest, networkExists, networkId,
-                    neutronNetworkId, status, routeTargets, subnetIdMap);
-
-            if (!networkExists.value) {
-                logger.debug("network not found");
-                respStatus = HttpStatus.SC_NOT_FOUND;
-            } else {
-                logger.debug("network found {}, status={}", networkId.value, status.value);
-                resp.setNetworkExists(networkExists.value);
-                resp.setNetworkId(networkId.value);
-                resp.setNeutronNetworkId(neutronNetworkId.value);
-                resp.setNetworkStatus(status.value);
-                resp.setRouteTargets(routeTargets.value);
-                resp.setSubnetIdMap(subnetIdMap.value);
-            }
-            logger.debug("Query network exit");
-            return Response.status(respStatus).entity(new GenericEntity<QueryNetworkResponse>(resp) {}).build();
-        } catch (NetworkException e) {
-            logger.error("{} {} Exception when query VNF ", MessageEnum.RA_QUERY_VNF_ERR,
-                    ErrorCode.BusinessProcessError.getValue(), e);
-            QueryNetworkError err = new QueryNetworkError();
-            err.setMessage(e.getMessage());
-            err.setCategory(MsoExceptionCategory.INTERNAL);
-            return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-                    .entity(new GenericEntity<QueryNetworkError>(err) {}).build();
-        }
-    }
-
-    @DELETE
-    @Path("{aaiNetworkId}/rollback")
-    @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(value = "RollbackNetwork", response = Response.class, notes = "Rollback an existing network")
-    @ApiResponses({@ApiResponse(code = 200, message = "Rollback network successful"),
-            @ApiResponse(code = 202, message = "Rollback network request has been accepted (async only)"),
-            @ApiResponse(code = 500, message = "Rollback network failed, examine entity object for details")})
-    public Response rollbackNetwork(
-            @ApiParam(value = "RollbackNetworkRequest in JSON format", required = true) RollbackNetworkRequest req) {
-        logger.debug("rollbackNetwork enter: {}", req.toJsonString());
-        RollbackNetworkTask task = new RollbackNetworkTask(req);
-        if (req.isSynchronous()) {
-            // This is a synchronous request
-            task.run();
-            return Response.status(task.getStatusCode()).entity(task.getGenericEntityResponse()).build();
-        } else {
-            // This is an asynchronous request
-            try {
-                Thread t1 = new Thread(task);
-                t1.start();
-            } catch (Exception e) {
-                // problem handling create, send generic failure as sync resp to caller
-                logger.error("{} {} Exception in rollbackNetwork ", MessageEnum.RA_ROLLBACK_NULL,
-                        ErrorCode.BusinessProcessError.getValue(), e);
-                return Response.serverError().build();
-            }
-            // send sync response (ACK) to caller
-            logger.debug("rollbackNetwork exit");
-            return Response.status(HttpStatus.SC_ACCEPTED).build();
-        }
-    }
-
-    public class RollbackNetworkTask implements Runnable {
-        private final RollbackNetworkRequest req;
-        private RollbackNetworkResponse response = null;
-        private RollbackNetworkError eresp = null;
-        private boolean sendxml;
-
-        public RollbackNetworkTask(RollbackNetworkRequest req) {
-            this.req = req;
-            this.sendxml = true; // can be set with a field or header later
-        }
-
-        public int getStatusCode() {
-            return (response != null) ? HttpStatus.SC_OK : HttpStatus.SC_BAD_REQUEST;
-        }
-
-        public Object getGenericEntityResponse() {
-            return (response != null) ? new GenericEntity<RollbackNetworkResponse>(response) {}
-                    : new GenericEntity<RollbackNetworkError>(eresp) {};
-        }
-
-        private String getResponse() {
-            if (response != null) {
-                return sendxml ? response.toXmlString() : response.toJsonString();
-            } else {
-                return sendxml ? eresp.toXmlString() : eresp.toJsonString();
-            }
-        }
-
-        @Override
-        public void run() {
-            try {
-                MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, req.getNetworkRollback().getMsoRequest().getRequestId());
-            } catch (Exception e) {
-                logger.error("Error adding RequestId to MDC", e);
-            }
-            logger.debug("RollbackNetworkTask start");
-            try {
-                NetworkRollback nwr = req.getNetworkRollback();
-                adapter.rollbackNetwork(nwr);
-                response = new RollbackNetworkResponse(true, req.getMessageId());
-            } catch (NetworkException e) {
-                logger.debug(exceptionMsg, e);
-                eresp = new RollbackNetworkError(e.getMessage(), MsoExceptionCategory.INTERNAL, true,
-                        req.getMessageId());
-            }
-            if (!req.isSynchronous()) {
-                // This is asynch, so POST response back to caller
-                BpelRestClient bpelClient = bpelRestClientProvider.get();
-                bpelClient.bpelPost(getResponse(), req.getNotificationUrl(), sendxml);
-            }
-            logger.debug("RollbackNetworkTask exit: code={}, resp={}", getStatusCode(), getResponse());
-        }
-    }
-
-    @PUT
-    @Path("{aaiNetworkId}")
-    @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(value = "UpdateNetwork", response = Response.class, notes = "Update an existing network")
-    @ApiResponses({@ApiResponse(code = 200, message = "Update network successful"),
-            @ApiResponse(code = 202, message = "Update network request has been accepted (async only)"),
-            @ApiResponse(code = 500, message = "Update network failed, examine entity object for details")})
-    public Response updateNetwork(
-            @ApiParam(value = "aaiNetworkId", required = true) @PathParam("aaiNetworkId") String aaiNetworkId,
-            @ApiParam(value = "UpdateNetworkRequest in JSON format", required = true) UpdateNetworkRequest req) {
-        logger.debug("updateNetwork enter: {}", req.toJsonString());
-        if (aaiNetworkId == null || !aaiNetworkId.equals(req.getNetworkId())) {
-            return Response.status(HttpStatus.SC_BAD_REQUEST).type(MediaType.TEXT_PLAIN).entity(
-                    "A&AI NetworkId in URL (" + aaiNetworkId + ") does not match content (" + req.getNetworkId() + ")")
-                    .build();
-        }
-        UpdateNetworkTask task = new UpdateNetworkTask(req);
-        if (req.isSynchronous()) {
-            // This is a synchronous request
-            task.run();
-            return Response.status(task.getStatusCode()).entity(task.getGenericEntityResponse()).build();
-        } else {
-            // This is an asynchronous request
-            try {
-                Thread t1 = new Thread(task);
-                t1.start();
-            } catch (Exception e) {
-                // problem handling create, send generic failure as sync resp to caller
-                logger.error("{} {} Exception in updateNetwork ", MessageEnum.RA_UPDATE_NETWORK_ERR,
-                        ErrorCode.BusinessProcessError.getValue(), e);
-                return Response.serverError().build();
-            }
-            // send sync response (ACK) to caller
-            logger.debug("updateNetwork exit");
-            return Response.status(HttpStatus.SC_ACCEPTED).build();
-        }
-    }
-
-    public class UpdateNetworkTask implements Runnable {
-        private final UpdateNetworkRequest req;
-        private UpdateNetworkResponse response = null;
-        private UpdateNetworkError eresp = null;
-        private boolean sendxml;
-
-        public UpdateNetworkTask(UpdateNetworkRequest req) {
-            this.req = req;
-            this.sendxml = true; // can be set with a field or header later
-        }
-
-        public int getStatusCode() {
-            return (response != null) ? HttpStatus.SC_OK : HttpStatus.SC_BAD_REQUEST;
-        }
-
-        public Object getGenericEntityResponse() {
-            return (response != null) ? new GenericEntity<UpdateNetworkResponse>(response) {}
-                    : new GenericEntity<UpdateNetworkError>(eresp) {};
-        }
-
-        private String getResponse() {
-            if (response != null) {
-                return sendxml ? response.toXmlString() : response.toJsonString();
-            } else {
-                return sendxml ? eresp.toXmlString() : eresp.toJsonString();
-            }
-        }
-
-        @Override
-        public void run() {
-            try {
-                MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, req.getMsoRequest().getRequestId());
-            } catch (Exception e) {
-                logger.error("Error adding RequestId to MDC", e);
-            }
-            logger.debug("UpdateNetworkTask start");
-            try {
-                Holder<Map<String, String>> subnetIdMap = new Holder<>();
-                Holder<NetworkRollback> rollback = new Holder<>();
-                HashMap<String, String> params = (HashMap<String, String>) req.getNetworkParams();
-                if (params == null) {
-                    params = new HashMap<String, String>();
-                }
-                String shared = null;
-                String external = null;
-
-                if (req.getCloudSiteId().equals(TESTING_KEYWORD)) {
-                    subnetIdMap.value = testMap();
-                    NetworkRollback rb = new NetworkRollback();
-                    rb.setCloudId(req.getCloudSiteId());
-                    rb.setTenantId(req.getTenantId());
-                    rb.setMsoRequest(req.getMsoRequest());
-                    rollback.value = rb;
-                } else if (req.isContrailRequest()) {
-                    ContrailNetwork ctn = req.getContrailNetwork();
-                    if (ctn == null) {
-                        ctn = new ContrailNetwork();
-                        req.setContrailNetwork(ctn);
-                    }
-                    if (params.containsKey(SHARED)) {
-                        shared = params.get(SHARED);
-                    } else {
-                        if (ctn.getShared() != null) {
-                            shared = ctn.getShared();
-                        }
-                    }
-                    if (params.containsKey(EXTERNAL)) {
-                        external = params.get(EXTERNAL);
-                    } else {
-                        if (ctn.getExternal() != null) {
-                            external = ctn.getExternal();
-                        }
-                    }
-                    adapter.updateNetworkContrail(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
-                            req.getModelCustomizationUuid(), req.getNetworkStackId(), req.getNetworkName(),
-                            req.getContrailNetwork().getRouteTargets(), shared, external, req.getSubnets(), params,
-                            req.getContrailNetwork().getPolicyFqdns(), req.getContrailNetwork().getRouteTableFqdns(),
-                            req.getMsoRequest(), subnetIdMap, rollback);
-                } else {
-                    ProviderVlanNetwork pvn = req.getProviderVlanNetwork();
-                    if (pvn == null) {
-                        pvn = new ProviderVlanNetwork();
-                        req.setProviderVlanNetwork(pvn);
-                    }
-                    if (params.containsKey(SHARED)) {
-                        shared = params.get(SHARED);
-                    }
-                    if (params.containsKey(EXTERNAL)) {
-                        external = params.get(EXTERNAL);
-                    }
-                    adapter.updateNetwork(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
-                            req.getModelCustomizationUuid(), req.getNetworkStackId(), req.getNetworkName(),
-                            req.getProviderVlanNetwork().getPhysicalNetworkName(),
-                            req.getProviderVlanNetwork().getVlans(), shared, external, req.getSubnets(), params,
-                            req.getMsoRequest(), subnetIdMap, rollback);
-                }
-                response = new UpdateNetworkResponse(req.getNetworkId(), null, // NeutronNetworkId is not available from
-                                                                               // an update
-                        subnetIdMap.value, req.getMessageId());
-            } catch (NetworkException e) {
-                logger.debug(exceptionMsg, e);
-                eresp = new UpdateNetworkError(e.getMessage(), MsoExceptionCategory.INTERNAL, true, req.getMessageId());
-            }
-            if (!req.isSynchronous()) {
-                // This is asynch, so POST response back to caller
-                BpelRestClient bpelClient = bpelRestClientProvider.get();
-                bpelClient.bpelPost(getResponse(), req.getNotificationUrl(), sendxml);
-            }
-            logger.debug("UpdateNetworkTask exit: code={}, resp={}", getStatusCode(), getResponse());
-        }
-    }
-
-    public static Map<String, String> testMap() {
-        Map<String, String> m = new HashMap<>();
-        m.put("mickey", "7");
-        m.put("clyde", "10");
-        m.put("wayne", "99");
-        return m;
-    }
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/CreateNetworkNotification.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/CreateNetworkNotification.java
deleted file mode 100644
index f30ccf2214..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/CreateNetworkNotification.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018 IBM.
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for createNetworkNotification complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="createNetworkNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.onap.so/networkNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="networkId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="neutronNetworkId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="subnetIdMap" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           &lt;sequence>
- *                             &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                             &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="rollback" type="{http://org.onap.so/networkNotify}networkRollback" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "createNetworkNotification", propOrder = {"messageId", "completed", "exception", "errorMessage",
-        "networkId", "neutronNetworkId", "subnetIdMap", "rollback"})
-public class CreateNetworkNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-    protected String networkId;
-    protected String neutronNetworkId;
-    protected CreateNetworkNotification.SubnetIdMap subnetIdMap;
-    protected NetworkRollback rollback;
-
-    /**
-     * Gets the value of the messageId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     * 
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     * 
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     * 
-     * @return possible object is {@link MsoExceptionCategory }
-     * 
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     * 
-     * @param value allowed object is {@link MsoExceptionCategory }
-     * 
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-
-    /**
-     * Gets the value of the networkId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNetworkId() {
-        return networkId;
-    }
-
-    /**
-     * Sets the value of the networkId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNetworkId(String value) {
-        this.networkId = value;
-    }
-
-    /**
-     * Gets the value of the neutronNetworkId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNeutronNetworkId() {
-        return neutronNetworkId;
-    }
-
-    /**
-     * Sets the value of the neutronNetworkId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNeutronNetworkId(String value) {
-        this.neutronNetworkId = value;
-    }
-
-    /**
-     * Gets the value of the subnetIdMap property.
-     * 
-     * @return possible object is {@link CreateNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public CreateNetworkNotification.SubnetIdMap getSubnetIdMap() {
-        return subnetIdMap;
-    }
-
-    /**
-     * Sets the value of the subnetIdMap property.
-     * 
-     * @param value allowed object is {@link CreateNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public void setSubnetIdMap(CreateNetworkNotification.SubnetIdMap value) {
-        this.subnetIdMap = value;
-    }
-
-    /**
-     * Gets the value of the rollback property.
-     * 
-     * @return possible object is {@link NetworkRollback }
-     * 
-     */
-    public NetworkRollback getRollback() {
-        return rollback;
-    }
-
-    /**
-     * Sets the value of the rollback property.
-     * 
-     * @param value allowed object is {@link NetworkRollback }
-     * 
-     */
-    public void setRollback(NetworkRollback value) {
-        this.rollback = value;
-    }
-
-
-    /**
-     * <p>
-     * Java class for anonymous complex type.
-     * 
-     * <p>
-     * The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                   &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {"entry"})
-    public static class SubnetIdMap {
-
-        protected List<CreateNetworkNotification.SubnetIdMap.Entry> entry;
-
-        /**
-         * Gets the value of the entry property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you
-         * make to the returned list will be present inside the JAXB object. This is why there is not a <CODE>set</CODE>
-         * method for the entry property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * 
-         * <pre>
-         * getEntry().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list {@link CreateNetworkNotification.SubnetIdMap.Entry }
-         * 
-         * 
-         */
-        public List<CreateNetworkNotification.SubnetIdMap.Entry> getEntry() {
-            if (entry == null) {
-                entry = new ArrayList<>();
-            }
-            return this.entry;
-        }
-
-
-        /**
-         * <p>
-         * Java class for anonymous complex type.
-         * 
-         * <p>
-         * The following schema fragment specifies the expected content contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       &lt;sequence>
-         *         &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {"key", "value"})
-        public static class Entry {
-
-            protected String key;
-            protected String value;
-
-            /**
-             * Gets the value of the key property.
-             * 
-             * @return possible object is {@link String }
-             * 
-             */
-            public String getKey() {
-                return key;
-            }
-
-            /**
-             * Sets the value of the key property.
-             * 
-             * @param value allowed object is {@link String }
-             * 
-             */
-            public void setKey(String value) {
-                this.key = value;
-            }
-
-            /**
-             * Gets the value of the value property.
-             * 
-             * @return possible object is {@link String }
-             * 
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value allowed object is {@link String }
-             * 
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-        }
-
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/CreateNetworkNotificationResponse.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/CreateNetworkNotificationResponse.java
deleted file mode 100644
index 4ade875193..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/CreateNetworkNotificationResponse.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for createNetworkNotificationResponse complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="createNetworkNotificationResponse">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "createNetworkNotificationResponse")
-public class CreateNetworkNotificationResponse {
-
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/DeleteNetworkNotification.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/DeleteNetworkNotification.java
deleted file mode 100644
index ff94be9156..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/DeleteNetworkNotification.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for deleteNetworkNotification complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="deleteNetworkNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.onap.so/networkNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="networkDeleted" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "deleteNetworkNotification",
-        propOrder = {"messageId", "completed", "exception", "errorMessage", "networkDeleted"})
-public class DeleteNetworkNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-    protected Boolean networkDeleted;
-
-    /**
-     * Gets the value of the messageId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     * 
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     * 
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     * 
-     * @return possible object is {@link MsoExceptionCategory }
-     * 
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     * 
-     * @param value allowed object is {@link MsoExceptionCategory }
-     * 
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-
-    /**
-     * Gets the value of the networkDeleted property.
-     * 
-     * @return possible object is {@link Boolean }
-     * 
-     */
-    public Boolean isNetworkDeleted() {
-        return networkDeleted;
-    }
-
-    /**
-     * Sets the value of the networkDeleted property.
-     * 
-     * @param value allowed object is {@link Boolean }
-     * 
-     */
-    public void setNetworkDeleted(Boolean value) {
-        this.networkDeleted = value;
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/DeleteNetworkNotificationResponse.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/DeleteNetworkNotificationResponse.java
deleted file mode 100644
index 7f7d0ae569..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/DeleteNetworkNotificationResponse.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for deleteNetworkNotificationResponse complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="deleteNetworkNotificationResponse">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "deleteNetworkNotificationResponse")
-public class DeleteNetworkNotificationResponse {
-
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/MsoExceptionCategory.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/MsoExceptionCategory.java
deleted file mode 100644
index ad3c541730..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/MsoExceptionCategory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for msoExceptionCategory.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * 
- * <pre>
- * &lt;simpleType name="msoExceptionCategory">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="OPENSTACK"/>
- *     &lt;enumeration value="IO"/>
- *     &lt;enumeration value="INTERNAL"/>
- *     &lt;enumeration value="USERDATA"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "msoExceptionCategory")
-@XmlEnum
-public enum MsoExceptionCategory {
-
-    OPENSTACK, IO, INTERNAL, USERDATA;
-
-    public String value() {
-        return name();
-    }
-
-    public static MsoExceptionCategory fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/MsoRequest.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/MsoRequest.java
deleted file mode 100644
index 90ae448660..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/MsoRequest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for msoRequest complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="msoRequest">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="requestId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="serviceInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "msoRequest", propOrder = {"requestId", "serviceInstanceId"})
-public class MsoRequest {
-
-    protected String requestId;
-    protected String serviceInstanceId;
-
-    /**
-     * Gets the value of the requestId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Sets the value of the requestId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setRequestId(String value) {
-        this.requestId = value;
-    }
-
-    /**
-     * Gets the value of the serviceInstanceId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getServiceInstanceId() {
-        return serviceInstanceId;
-    }
-
-    /**
-     * Sets the value of the serviceInstanceId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setServiceInstanceId(String value) {
-        this.serviceInstanceId = value;
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkAdapterNotify.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkAdapterNotify.java
deleted file mode 100644
index 8fb62cc32e..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkAdapterNotify.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import java.util.List;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI. JAX-WS RI 2.2.9-b14002 Generated source version: 2.2
- * 
- */
-@WebService(name = "networkAdapterNotify", targetNamespace = "http://org.onap.so/networkNotify")
-@XmlSeeAlso({ObjectFactory.class})
-public interface NetworkAdapterNotify {
-
-
-    /**
-     * 
-     * @param exception
-     * @param errorMessage
-     * @param messageId
-     * @param completed
-     */
-    @WebMethod
-    @RequestWrapper(localName = "rollbackNetworkNotification", targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.RollbackNetworkNotification")
-    @ResponseWrapper(localName = "rollbackNetworkNotificationResponse",
-            targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.RollbackNetworkNotificationResponse")
-    @Action(input = "http://org.onap.so/notify/adapterNotify/rollbackNetworkNotificationRequest",
-            output = "http://org.onap.so/notify/adapterNotify/rollbackNetworkNotificationResponse")
-    public void rollbackNetworkNotification(@WebParam(name = "messageId", targetNamespace = "") String messageId,
-            @WebParam(name = "completed", targetNamespace = "") boolean completed,
-            @WebParam(name = "exception", targetNamespace = "") MsoExceptionCategory exception,
-            @WebParam(name = "errorMessage", targetNamespace = "") String errorMessage);
-
-    /**
-     * 
-     * @param exception
-     * @param vlans
-     * @param networkExists
-     * @param errorMessage
-     * @param messageId
-     * @param networkId
-     * @param completed
-     * @param neutronNetworkId
-     * @param status
-     * @param subnetIdMap
-     */
-    @WebMethod
-    @RequestWrapper(localName = "queryNetworkNotification", targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.QueryNetworkNotification")
-    @ResponseWrapper(localName = "queryNetworkNotificationResponse",
-            targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.QueryNetworkNotificationResponse")
-    @Action(input = "http://org.onap.so/notify/adapterNotify/queryNetworkNotificationRequest",
-            output = "http://org.onap.so/notify/adapterNotify/queryNetworkNotificationResponse")
-    public void queryNetworkNotification(@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 = "networkExists", targetNamespace = "") Boolean networkExists,
-            @WebParam(name = "networkId", targetNamespace = "") String networkId,
-            @WebParam(name = "neutronNetworkId", targetNamespace = "") String neutronNetworkId,
-            @WebParam(name = "status", targetNamespace = "") NetworkStatus status,
-            @WebParam(name = "vlans", targetNamespace = "") List<Integer> vlans, @WebParam(name = "subnetIdMap",
-                    targetNamespace = "") org.onap.so.adapters.network.async.client.QueryNetworkNotification.SubnetIdMap subnetIdMap);
-
-    /**
-     * 
-     * @param exception
-     * @param rollback
-     * @param errorMessage
-     * @param messageId
-     * @param networkId
-     * @param completed
-     * @param neutronNetworkId
-     * @param subnetIdMap
-     */
-    @WebMethod
-    @RequestWrapper(localName = "createNetworkNotification", targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.CreateNetworkNotification")
-    @ResponseWrapper(localName = "createNetworkNotificationResponse",
-            targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.CreateNetworkNotificationResponse")
-    @Action(input = "http://org.onap.so/notify/adapterNotify/createNetworkNotificationRequest",
-            output = "http://org.onap.so/notify/adapterNotify/createNetworkNotificationResponse")
-    public void createNetworkNotification(@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 = "networkId", targetNamespace = "") String networkId,
-            @WebParam(name = "neutronNetworkId", targetNamespace = "") String neutronNetworkId,
-            @WebParam(name = "subnetIdMap",
-                    targetNamespace = "") org.onap.so.adapters.network.async.client.CreateNetworkNotification.SubnetIdMap subnetIdMap,
-            @WebParam(name = "rollback", targetNamespace = "") NetworkRollback rollback);
-
-    /**
-     * 
-     * @param exception
-     * @param networkDeleted
-     * @param errorMessage
-     * @param messageId
-     * @param completed
-     */
-    @WebMethod
-    @RequestWrapper(localName = "deleteNetworkNotification", targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.DeleteNetworkNotification")
-    @ResponseWrapper(localName = "deleteNetworkNotificationResponse",
-            targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.DeleteNetworkNotificationResponse")
-    @Action(input = "http://org.onap.so/notify/adapterNotify/deleteNetworkNotificationRequest",
-            output = "http://org.onap.so/notify/adapterNotify/deleteNetworkNotificationResponse")
-    public void deleteNetworkNotification(@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 = "networkDeleted", targetNamespace = "") Boolean networkDeleted);
-
-    /**
-     * 
-     * @param exception
-     * @param rollback
-     * @param errorMessage
-     * @param messageId
-     * @param completed
-     * @param subnetIdMap
-     */
-    @WebMethod
-    @RequestWrapper(localName = "updateNetworkNotification", targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.UpdateNetworkNotification")
-    @ResponseWrapper(localName = "updateNetworkNotificationResponse",
-            targetNamespace = "http://org.onap.so/networkNotify",
-            className = "org.onap.so.adapters.network.async.client.UpdateNetworkNotificationResponse")
-    @Action(input = "http://org.onap.so/notify/adapterNotify/updateNetworkNotificationRequest",
-            output = "http://org.onap.so/notify/adapterNotify/updateNetworkNotificationResponse")
-    public void updateNetworkNotification(@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 = "subnetIdMap",
-                    targetNamespace = "") org.onap.so.adapters.network.async.client.UpdateNetworkNotification.SubnetIdMap subnetIdMap,
-            @WebParam(name = "rollback", targetNamespace = "") NetworkRollback rollback);
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkAdapterNotify_Service.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkAdapterNotify_Service.java
deleted file mode 100644
index 68142e6cc9..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkAdapterNotify_Service.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018 IBM.
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI. JAX-WS RI 2.2.9-b14002 Generated source version: 2.2
- * 
- */
-@WebServiceClient(name = "networkAdapterNotify", targetNamespace = "http://org.onap.so/networkNotify",
-        wsdlLocation = "/NetworkAdapterNotify.wsdl")
-public class NetworkAdapterNotify_Service extends Service {
-
-    private static final URL NETWORKADAPTERNOTIFY_WSDL_LOCATION;
-    private static final WebServiceException NETWORKADAPTERNOTIFY_EXCEPTION;
-    private static final String URL = "http://org.onap.so/networkNotify";
-    private static final QName NETWORKADAPTERNOTIFY_QNAME = new QName(URL, "networkAdapterNotify");
-
-    static {
-        NETWORKADAPTERNOTIFY_WSDL_LOCATION =
-                org.onap.so.adapters.network.async.client.NetworkAdapterNotify_Service.class
-                        .getResource("/NetworkAdapterNotify.wsdl");
-        WebServiceException e = null;
-        if (NETWORKADAPTERNOTIFY_WSDL_LOCATION == null) {
-            e = new WebServiceException(
-                    "Cannot find '/NetworkAdapterNotify.wsdl' wsdl. Place the resource correctly in the classpath.");
-        }
-        NETWORKADAPTERNOTIFY_EXCEPTION = e;
-    }
-
-    public NetworkAdapterNotify_Service() {
-        super(getWsdlLocation(), NETWORKADAPTERNOTIFY_QNAME);
-    }
-
-    public NetworkAdapterNotify_Service(WebServiceFeature... features) {
-        super(getWsdlLocation(), NETWORKADAPTERNOTIFY_QNAME, features);
-    }
-
-    public NetworkAdapterNotify_Service(URL wsdlLocation) {
-        super(wsdlLocation, NETWORKADAPTERNOTIFY_QNAME);
-    }
-
-    public NetworkAdapterNotify_Service(URL wsdlLocation, WebServiceFeature... features) {
-        super(wsdlLocation, NETWORKADAPTERNOTIFY_QNAME, features);
-    }
-
-    public NetworkAdapterNotify_Service(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public NetworkAdapterNotify_Service(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
-        super(wsdlLocation, serviceName, features);
-    }
-
-    /**
-     * 
-     * @return returns NetworkAdapterNotify
-     */
-    @WebEndpoint(name = "MsoNetworkAdapterAsyncImplPort")
-    public NetworkAdapterNotify getMsoNetworkAdapterAsyncImplPort() {
-        return super.getPort(new QName(URL, "MsoNetworkAdapterAsyncImplPort"), NetworkAdapterNotify.class);
-    }
-
-    /**
-     * 
-     * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features
-     *        not in the <code>features</code> parameter will have their default values.
-     * @return returns NetworkAdapterNotify
-     */
-    @WebEndpoint(name = "MsoNetworkAdapterAsyncImplPort")
-    public NetworkAdapterNotify getMsoNetworkAdapterAsyncImplPort(WebServiceFeature... features) {
-        return super.getPort(new QName(URL, "MsoNetworkAdapterAsyncImplPort"), NetworkAdapterNotify.class, features);
-    }
-
-    private static URL getWsdlLocation() {
-        if (NETWORKADAPTERNOTIFY_EXCEPTION != null) {
-            throw NETWORKADAPTERNOTIFY_EXCEPTION;
-        }
-        return NETWORKADAPTERNOTIFY_WSDL_LOCATION;
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkRollback.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkRollback.java
deleted file mode 100644
index c51a21d5f0..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkRollback.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018 IBM.
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for networkRollback complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="networkRollback">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="cloudId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="msoRequest" type="{http://org.onap.so/networkNotify}msoRequest" minOccurs="0"/>
- *         &lt;element name="networkCreated" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="networkId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="networkStackId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="networkName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="networkType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="networkUpdated" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="neutronNetworkId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="physicalNetwork" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="tenantId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="vlans" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "networkRollback",
-        propOrder = {"cloudId", "msoRequest", "networkCreated", "networkId", "networkStackId", "networkName",
-                "networkType", "networkUpdated", "neutronNetworkId", "physicalNetwork", "tenantId", "vlans"})
-public class NetworkRollback {
-
-    protected String cloudId;
-    protected MsoRequest msoRequest;
-    protected boolean networkCreated;
-    protected String networkId;
-    protected String networkStackId;
-    protected String networkName;
-    protected String networkType;
-    protected boolean networkUpdated;
-    protected String neutronNetworkId;
-    protected String physicalNetwork;
-    protected String tenantId;
-    @XmlElement(nillable = true)
-    protected List<Integer> vlans;
-
-    /**
-     * Gets the value of the cloudId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getCloudId() {
-        return cloudId;
-    }
-
-    /**
-     * Sets the value of the cloudId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setCloudId(String value) {
-        this.cloudId = value;
-    }
-
-    /**
-     * Gets the value of the msoRequest property.
-     * 
-     * @return possible object is {@link MsoRequest }
-     * 
-     */
-    public MsoRequest getMsoRequest() {
-        return msoRequest;
-    }
-
-    /**
-     * Sets the value of the msoRequest property.
-     * 
-     * @param value allowed object is {@link MsoRequest }
-     * 
-     */
-    public void setMsoRequest(MsoRequest value) {
-        this.msoRequest = value;
-    }
-
-    /**
-     * Gets the value of the networkCreated property.
-     * 
-     */
-    public boolean isNetworkCreated() {
-        return networkCreated;
-    }
-
-    /**
-     * Sets the value of the networkCreated property.
-     * 
-     */
-    public void setNetworkCreated(boolean value) {
-        this.networkCreated = value;
-    }
-
-    /**
-     * Gets the value of the networkId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNetworkId() {
-        return networkId;
-    }
-
-    /**
-     * Sets the value of the networkId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNetworkId(String value) {
-        this.networkId = value;
-    }
-
-    /**
-     * Gets the value of the networkStackId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNetworkStackId() {
-        return networkStackId;
-    }
-
-    /**
-     * Sets the value of the networkStackId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNetworkStackId(String value) {
-        this.networkStackId = value;
-    }
-
-    /**
-     * Gets the value of the networkName property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNetworkName() {
-        return networkName;
-    }
-
-    /**
-     * Sets the value of the networkName property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNetworkName(String value) {
-        this.networkName = value;
-    }
-
-    /**
-     * Gets the value of the networkType property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNetworkType() {
-        return networkType;
-    }
-
-    /**
-     * Sets the value of the networkType property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNetworkType(String value) {
-        this.networkType = value;
-    }
-
-    /**
-     * Gets the value of the networkUpdated property.
-     * 
-     */
-    public boolean isNetworkUpdated() {
-        return networkUpdated;
-    }
-
-    /**
-     * Sets the value of the networkUpdated property.
-     * 
-     */
-    public void setNetworkUpdated(boolean value) {
-        this.networkUpdated = value;
-    }
-
-    /**
-     * Gets the value of the neutronNetworkId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNeutronNetworkId() {
-        return neutronNetworkId;
-    }
-
-    /**
-     * Sets the value of the neutronNetworkId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNeutronNetworkId(String value) {
-        this.neutronNetworkId = value;
-    }
-
-    /**
-     * Gets the value of the physicalNetwork property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getPhysicalNetwork() {
-        return physicalNetwork;
-    }
-
-    /**
-     * Sets the value of the physicalNetwork property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setPhysicalNetwork(String value) {
-        this.physicalNetwork = value;
-    }
-
-    /**
-     * Gets the value of the tenantId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    /**
-     * Sets the value of the tenantId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setTenantId(String value) {
-        this.tenantId = value;
-    }
-
-    /**
-     * Gets the value of the vlans property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to
-     * the returned list will be present inside the JAXB object. This is why there is not a <CODE>set</CODE> method for
-     * the vlans property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * 
-     * <pre>
-     * getVlans().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list {@link Integer }
-     * 
-     * 
-     */
-    public List<Integer> getVlans() {
-        if (vlans == null) {
-            vlans = new ArrayList<>();
-        }
-        return this.vlans;
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkStatus.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkStatus.java
deleted file mode 100644
index 36641477c0..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/NetworkStatus.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for networkStatus.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * 
- * <pre>
- * &lt;simpleType name="networkStatus">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="NOTFOUND"/>
- *     &lt;enumeration value="ACTIVE"/>
- *     &lt;enumeration value="DOWN"/>
- *     &lt;enumeration value="BUILD"/>
- *     &lt;enumeration value="ERROR"/>
- *     &lt;enumeration value="UNKNOWN"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "networkStatus")
-@XmlEnum
-public enum NetworkStatus {
-
-    NOTFOUND, ACTIVE, DOWN, BUILD, ERROR, UNKNOWN;
-
-    public String value() {
-        return name();
-    }
-
-    public static NetworkStatus fromValue(String v) {
-        return valueOf(v);
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/ObjectFactory.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/ObjectFactory.java
deleted file mode 100644
index a7a2974660..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/ObjectFactory.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each Java content interface and Java element interface generated in the
- * org.onap.so.adapters.network.async.client package.
- * <p>
- * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content.
- * The Java representation of XML content can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in
- * this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private static final String URL = "http://org.onap.so/networkNotify";
-    private static final QName _RollbackNetworkNotification_QNAME = new QName(URL, "rollbackNetworkNotification");
-    private static final QName _UpdateNetworkNotification_QNAME = new QName(URL, "updateNetworkNotification");
-    private static final QName _QueryNetworkNotificationResponse_QNAME =
-            new QName(URL, "queryNetworkNotificationResponse");
-    private static final QName _UpdateNetworkNotificationResponse_QNAME =
-            new QName(URL, "updateNetworkNotificationResponse");
-    private static final QName _CreateNetworkNotificationResponse_QNAME =
-            new QName(URL, "createNetworkNotificationResponse");
-    private static final QName _DeleteNetworkNotification_QNAME = new QName(URL, "deleteNetworkNotification");
-    private static final QName _DeleteNetworkNotificationResponse_QNAME =
-            new QName(URL, "deleteNetworkNotificationResponse");
-    private static final QName _CreateNetworkNotification_QNAME = new QName(URL, "createNetworkNotification");
-    private static final QName _QueryNetworkNotification_QNAME = new QName(URL, "queryNetworkNotification");
-    private static final QName _RollbackNetworkNotificationResponse_QNAME =
-            new QName(URL, "rollbackNetworkNotificationResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package:
-     * org.onap.so.adapters.network.async.client
-     * 
-     */
-    public ObjectFactory() {}
-
-    /**
-     * Create an instance of {@link QueryNetworkNotification }
-     * 
-     */
-    public QueryNetworkNotification createQueryNetworkNotification() {
-        return new QueryNetworkNotification();
-    }
-
-    /**
-     * Create an instance of {@link QueryNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public QueryNetworkNotification.SubnetIdMap createQueryNetworkNotificationSubnetIdMap() {
-        return new QueryNetworkNotification.SubnetIdMap();
-    }
-
-    /**
-     * Create an instance of {@link CreateNetworkNotification }
-     * 
-     */
-    public CreateNetworkNotification createCreateNetworkNotification() {
-        return new CreateNetworkNotification();
-    }
-
-    /**
-     * Create an instance of {@link CreateNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public CreateNetworkNotification.SubnetIdMap createCreateNetworkNotificationSubnetIdMap() {
-        return new CreateNetworkNotification.SubnetIdMap();
-    }
-
-    /**
-     * Create an instance of {@link UpdateNetworkNotification }
-     * 
-     */
-    public UpdateNetworkNotification createUpdateNetworkNotification() {
-        return new UpdateNetworkNotification();
-    }
-
-    /**
-     * Create an instance of {@link UpdateNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public UpdateNetworkNotification.SubnetIdMap createUpdateNetworkNotificationSubnetIdMap() {
-        return new UpdateNetworkNotification.SubnetIdMap();
-    }
-
-    /**
-     * Create an instance of {@link UpdateNetworkNotificationResponse }
-     * 
-     */
-    public UpdateNetworkNotificationResponse createUpdateNetworkNotificationResponse() {
-        return new UpdateNetworkNotificationResponse();
-    }
-
-    /**
-     * Create an instance of {@link CreateNetworkNotificationResponse }
-     * 
-     */
-    public CreateNetworkNotificationResponse createCreateNetworkNotificationResponse() {
-        return new CreateNetworkNotificationResponse();
-    }
-
-    /**
-     * Create an instance of {@link RollbackNetworkNotification }
-     * 
-     */
-    public RollbackNetworkNotification createRollbackNetworkNotification() {
-        return new RollbackNetworkNotification();
-    }
-
-    /**
-     * Create an instance of {@link QueryNetworkNotificationResponse }
-     * 
-     */
-    public QueryNetworkNotificationResponse createQueryNetworkNotificationResponse() {
-        return new QueryNetworkNotificationResponse();
-    }
-
-    /**
-     * Create an instance of {@link RollbackNetworkNotificationResponse }
-     * 
-     */
-    public RollbackNetworkNotificationResponse createRollbackNetworkNotificationResponse() {
-        return new RollbackNetworkNotificationResponse();
-    }
-
-    /**
-     * Create an instance of {@link DeleteNetworkNotification }
-     * 
-     */
-    public DeleteNetworkNotification createDeleteNetworkNotification() {
-        return new DeleteNetworkNotification();
-    }
-
-    /**
-     * Create an instance of {@link DeleteNetworkNotificationResponse }
-     * 
-     */
-    public DeleteNetworkNotificationResponse createDeleteNetworkNotificationResponse() {
-        return new DeleteNetworkNotificationResponse();
-    }
-
-    /**
-     * Create an instance of {@link NetworkRollback }
-     * 
-     */
-    public NetworkRollback createNetworkRollback() {
-        return new NetworkRollback();
-    }
-
-    /**
-     * Create an instance of {@link MsoRequest }
-     * 
-     */
-    public MsoRequest createMsoRequest() {
-        return new MsoRequest();
-    }
-
-    /**
-     * Create an instance of {@link QueryNetworkNotification.SubnetIdMap.Entry }
-     * 
-     */
-    public QueryNetworkNotification.SubnetIdMap.Entry createQueryNetworkNotificationSubnetIdMapEntry() {
-        return new QueryNetworkNotification.SubnetIdMap.Entry();
-    }
-
-    /**
-     * Create an instance of {@link CreateNetworkNotification.SubnetIdMap.Entry }
-     * 
-     */
-    public CreateNetworkNotification.SubnetIdMap.Entry createCreateNetworkNotificationSubnetIdMapEntry() {
-        return new CreateNetworkNotification.SubnetIdMap.Entry();
-    }
-
-    /**
-     * Create an instance of {@link UpdateNetworkNotification.SubnetIdMap.Entry }
-     * 
-     */
-    public UpdateNetworkNotification.SubnetIdMap.Entry createUpdateNetworkNotificationSubnetIdMapEntry() {
-        return new UpdateNetworkNotification.SubnetIdMap.Entry();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RollbackNetworkNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "rollbackNetworkNotification")
-    public JAXBElement<RollbackNetworkNotification> createRollbackNetworkNotification(
-            RollbackNetworkNotification value) {
-        return new JAXBElement<>(_RollbackNetworkNotification_QNAME, RollbackNetworkNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UpdateNetworkNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "updateNetworkNotification")
-    public JAXBElement<UpdateNetworkNotification> createUpdateNetworkNotification(UpdateNetworkNotification value) {
-        return new JAXBElement<>(_UpdateNetworkNotification_QNAME, UpdateNetworkNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QueryNetworkNotificationResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "queryNetworkNotificationResponse")
-    public JAXBElement<QueryNetworkNotificationResponse> createQueryNetworkNotificationResponse(
-            QueryNetworkNotificationResponse value) {
-        return new JAXBElement<>(_QueryNetworkNotificationResponse_QNAME, QueryNetworkNotificationResponse.class, null,
-                value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UpdateNetworkNotificationResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "updateNetworkNotificationResponse")
-    public JAXBElement<UpdateNetworkNotificationResponse> createUpdateNetworkNotificationResponse(
-            UpdateNetworkNotificationResponse value) {
-        return new JAXBElement<>(_UpdateNetworkNotificationResponse_QNAME, UpdateNetworkNotificationResponse.class,
-                null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateNetworkNotificationResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "createNetworkNotificationResponse")
-    public JAXBElement<CreateNetworkNotificationResponse> createCreateNetworkNotificationResponse(
-            CreateNetworkNotificationResponse value) {
-        return new JAXBElement<>(_CreateNetworkNotificationResponse_QNAME, CreateNetworkNotificationResponse.class,
-                null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteNetworkNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "deleteNetworkNotification")
-    public JAXBElement<DeleteNetworkNotification> createDeleteNetworkNotification(DeleteNetworkNotification value) {
-        return new JAXBElement<>(_DeleteNetworkNotification_QNAME, DeleteNetworkNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteNetworkNotificationResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "deleteNetworkNotificationResponse")
-    public JAXBElement<DeleteNetworkNotificationResponse> createDeleteNetworkNotificationResponse(
-            DeleteNetworkNotificationResponse value) {
-        return new JAXBElement<>(_DeleteNetworkNotificationResponse_QNAME, DeleteNetworkNotificationResponse.class,
-                null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateNetworkNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "createNetworkNotification")
-    public JAXBElement<CreateNetworkNotification> createCreateNetworkNotification(CreateNetworkNotification value) {
-        return new JAXBElement<>(_CreateNetworkNotification_QNAME, CreateNetworkNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QueryNetworkNotification }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "queryNetworkNotification")
-    public JAXBElement<QueryNetworkNotification> createQueryNetworkNotification(QueryNetworkNotification value) {
-        return new JAXBElement<>(_QueryNetworkNotification_QNAME, QueryNetworkNotification.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RollbackNetworkNotificationResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = URL, name = "rollbackNetworkNotificationResponse")
-    public JAXBElement<RollbackNetworkNotificationResponse> createRollbackNetworkNotificationResponse(
-            RollbackNetworkNotificationResponse value) {
-        return new JAXBElement<>(_RollbackNetworkNotificationResponse_QNAME, RollbackNetworkNotificationResponse.class,
-                null, value);
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/QueryNetworkNotification.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/QueryNetworkNotification.java
deleted file mode 100644
index d9adbf2ad2..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/QueryNetworkNotification.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018 IBM.
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for queryNetworkNotification complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="queryNetworkNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.onap.so/networkNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="networkExists" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         &lt;element name="networkId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="neutronNetworkId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="status" type="{http://org.onap.so/networkNotify}networkStatus" minOccurs="0"/>
- *         &lt;element name="vlans" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="subnetIdMap" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           &lt;sequence>
- *                             &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                             &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "queryNetworkNotification", propOrder = {"messageId", "completed", "exception", "errorMessage",
-        "networkExists", "networkId", "neutronNetworkId", "status", "vlans", "subnetIdMap"})
-public class QueryNetworkNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-    protected Boolean networkExists;
-    protected String networkId;
-    protected String neutronNetworkId;
-    protected NetworkStatus status;
-    @XmlElement(type = Integer.class)
-    protected List<Integer> vlans;
-    protected QueryNetworkNotification.SubnetIdMap subnetIdMap;
-
-    /**
-     * Gets the value of the messageId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     * 
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     * 
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     * 
-     * @return possible object is {@link MsoExceptionCategory }
-     * 
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     * 
-     * @param value allowed object is {@link MsoExceptionCategory }
-     * 
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-
-    /**
-     * Gets the value of the networkExists property.
-     * 
-     * @return possible object is {@link Boolean }
-     * 
-     */
-    public Boolean isNetworkExists() {
-        return networkExists;
-    }
-
-    /**
-     * Sets the value of the networkExists property.
-     * 
-     * @param value allowed object is {@link Boolean }
-     * 
-     */
-    public void setNetworkExists(Boolean value) {
-        this.networkExists = value;
-    }
-
-    /**
-     * Gets the value of the networkId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNetworkId() {
-        return networkId;
-    }
-
-    /**
-     * Sets the value of the networkId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNetworkId(String value) {
-        this.networkId = value;
-    }
-
-    /**
-     * Gets the value of the neutronNetworkId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getNeutronNetworkId() {
-        return neutronNetworkId;
-    }
-
-    /**
-     * Sets the value of the neutronNetworkId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setNeutronNetworkId(String value) {
-        this.neutronNetworkId = value;
-    }
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return possible object is {@link NetworkStatus }
-     * 
-     */
-    public NetworkStatus getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value allowed object is {@link NetworkStatus }
-     * 
-     */
-    public void setStatus(NetworkStatus value) {
-        this.status = value;
-    }
-
-    /**
-     * Gets the value of the vlans property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to
-     * the returned list will be present inside the JAXB object. This is why there is not a <CODE>set</CODE> method for
-     * the vlans property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * 
-     * <pre>
-     * getVlans().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list {@link Integer }
-     * 
-     * 
-     */
-    public List<Integer> getVlans() {
-        if (vlans == null) {
-            vlans = new ArrayList<>();
-        }
-        return this.vlans;
-    }
-
-    /**
-     * Gets the value of the subnetIdMap property.
-     * 
-     * @return possible object is {@link QueryNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public QueryNetworkNotification.SubnetIdMap getSubnetIdMap() {
-        return subnetIdMap;
-    }
-
-    /**
-     * Sets the value of the subnetIdMap property.
-     * 
-     * @param value allowed object is {@link QueryNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public void setSubnetIdMap(QueryNetworkNotification.SubnetIdMap value) {
-        this.subnetIdMap = value;
-    }
-
-
-    /**
-     * <p>
-     * Java class for anonymous complex type.
-     * 
-     * <p>
-     * The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                   &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {"entry"})
-    public static class SubnetIdMap {
-
-        protected List<QueryNetworkNotification.SubnetIdMap.Entry> entry;
-
-        /**
-         * Gets the value of the entry property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you
-         * make to the returned list will be present inside the JAXB object. This is why there is not a <CODE>set</CODE>
-         * method for the entry property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * 
-         * <pre>
-         * getEntry().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list {@link QueryNetworkNotification.SubnetIdMap.Entry }
-         * 
-         * 
-         */
-        public List<QueryNetworkNotification.SubnetIdMap.Entry> getEntry() {
-            if (entry == null) {
-                entry = new ArrayList<>();
-            }
-            return this.entry;
-        }
-
-
-        /**
-         * <p>
-         * Java class for anonymous complex type.
-         * 
-         * <p>
-         * The following schema fragment specifies the expected content contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       &lt;sequence>
-         *         &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {"key", "value"})
-        public static class Entry {
-
-            protected String key;
-            protected String value;
-
-            /**
-             * Gets the value of the key property.
-             * 
-             * @return possible object is {@link String }
-             * 
-             */
-            public String getKey() {
-                return key;
-            }
-
-            /**
-             * Sets the value of the key property.
-             * 
-             * @param value allowed object is {@link String }
-             * 
-             */
-            public void setKey(String value) {
-                this.key = value;
-            }
-
-            /**
-             * Gets the value of the value property.
-             * 
-             * @return possible object is {@link String }
-             * 
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value allowed object is {@link String }
-             * 
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-        }
-
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/QueryNetworkNotificationResponse.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/QueryNetworkNotificationResponse.java
deleted file mode 100644
index 2e18e05860..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/QueryNetworkNotificationResponse.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for queryNetworkNotificationResponse complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="queryNetworkNotificationResponse">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "queryNetworkNotificationResponse")
-public class QueryNetworkNotificationResponse {
-
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/RollbackNetworkNotification.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/RollbackNetworkNotification.java
deleted file mode 100644
index 7b5d0f0f2a..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/RollbackNetworkNotification.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for rollbackNetworkNotification complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="rollbackNetworkNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.onap.so/networkNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "rollbackNetworkNotification", propOrder = {"messageId", "completed", "exception", "errorMessage"})
-public class RollbackNetworkNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-
-    /**
-     * Gets the value of the messageId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     * 
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     * 
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     * 
-     * @return possible object is {@link MsoExceptionCategory }
-     * 
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     * 
-     * @param value allowed object is {@link MsoExceptionCategory }
-     * 
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/RollbackNetworkNotificationResponse.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/RollbackNetworkNotificationResponse.java
deleted file mode 100644
index 7ddc8d75de..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/RollbackNetworkNotificationResponse.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for rollbackNetworkNotificationResponse complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="rollbackNetworkNotificationResponse">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "rollbackNetworkNotificationResponse")
-public class RollbackNetworkNotificationResponse {
-
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/UpdateNetworkNotification.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/UpdateNetworkNotification.java
deleted file mode 100644
index 1a464d3250..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/UpdateNetworkNotification.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (C) 2018 IBM.
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for updateNetworkNotification complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="updateNetworkNotification">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="messageId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         &lt;element name="exception" type="{http://org.onap.so/networkNotify}msoExceptionCategory" minOccurs="0"/>
- *         &lt;element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="subnetIdMap" minOccurs="0">
- *           &lt;complexType>
- *             &lt;complexContent>
- *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 &lt;sequence>
- *                   &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
- *                     &lt;complexType>
- *                       &lt;complexContent>
- *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           &lt;sequence>
- *                             &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                             &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                           &lt;/sequence>
- *                         &lt;/restriction>
- *                       &lt;/complexContent>
- *                     &lt;/complexType>
- *                   &lt;/element>
- *                 &lt;/sequence>
- *               &lt;/restriction>
- *             &lt;/complexContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *         &lt;element name="rollback" type="{http://org.onap.so/networkNotify}networkRollback" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "updateNetworkNotification",
-        propOrder = {"messageId", "completed", "exception", "errorMessage", "subnetIdMap", "rollback"})
-public class UpdateNetworkNotification {
-
-    @XmlElement(required = true)
-    protected String messageId;
-    protected boolean completed;
-    protected MsoExceptionCategory exception;
-    protected String errorMessage;
-    protected UpdateNetworkNotification.SubnetIdMap subnetIdMap;
-    protected NetworkRollback rollback;
-
-    /**
-     * Gets the value of the messageId property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * Sets the value of the messageId property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setMessageId(String value) {
-        this.messageId = value;
-    }
-
-    /**
-     * Gets the value of the completed property.
-     * 
-     */
-    public boolean isCompleted() {
-        return completed;
-    }
-
-    /**
-     * Sets the value of the completed property.
-     * 
-     */
-    public void setCompleted(boolean value) {
-        this.completed = value;
-    }
-
-    /**
-     * Gets the value of the exception property.
-     * 
-     * @return possible object is {@link MsoExceptionCategory }
-     * 
-     */
-    public MsoExceptionCategory getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the value of the exception property.
-     * 
-     * @param value allowed object is {@link MsoExceptionCategory }
-     * 
-     */
-    public void setException(MsoExceptionCategory value) {
-        this.exception = value;
-    }
-
-    /**
-     * Gets the value of the errorMessage property.
-     * 
-     * @return possible object is {@link String }
-     * 
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Sets the value of the errorMessage property.
-     * 
-     * @param value allowed object is {@link String }
-     * 
-     */
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-
-    /**
-     * Gets the value of the subnetIdMap property.
-     * 
-     * @return possible object is {@link UpdateNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public UpdateNetworkNotification.SubnetIdMap getSubnetIdMap() {
-        return subnetIdMap;
-    }
-
-    /**
-     * Sets the value of the subnetIdMap property.
-     * 
-     * @param value allowed object is {@link UpdateNetworkNotification.SubnetIdMap }
-     * 
-     */
-    public void setSubnetIdMap(UpdateNetworkNotification.SubnetIdMap value) {
-        this.subnetIdMap = value;
-    }
-
-    /**
-     * Gets the value of the rollback property.
-     * 
-     * @return possible object is {@link NetworkRollback }
-     * 
-     */
-    public NetworkRollback getRollback() {
-        return rollback;
-    }
-
-    /**
-     * Sets the value of the rollback property.
-     * 
-     * @param value allowed object is {@link NetworkRollback }
-     * 
-     */
-    public void setRollback(NetworkRollback value) {
-        this.rollback = value;
-    }
-
-
-    /**
-     * <p>
-     * Java class for anonymous complex type.
-     * 
-     * <p>
-     * The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="entry" maxOccurs="unbounded" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                   &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {"entry"})
-    public static class SubnetIdMap {
-
-        protected List<UpdateNetworkNotification.SubnetIdMap.Entry> entry;
-
-        /**
-         * Gets the value of the entry property.
-         * 
-         * <p>
-         * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you
-         * make to the returned list will be present inside the JAXB object. This is why there is not a <CODE>set</CODE>
-         * method for the entry property.
-         * 
-         * <p>
-         * For example, to add a new item, do as follows:
-         * 
-         * <pre>
-         * getEntry().add(newItem);
-         * </pre>
-         * 
-         * 
-         * <p>
-         * Objects of the following type(s) are allowed in the list {@link UpdateNetworkNotification.SubnetIdMap.Entry }
-         * 
-         * 
-         */
-        public List<UpdateNetworkNotification.SubnetIdMap.Entry> getEntry() {
-            if (entry == null) {
-                entry = new ArrayList<>();
-            }
-            return this.entry;
-        }
-
-
-        /**
-         * <p>
-         * Java class for anonymous complex type.
-         * 
-         * <p>
-         * The following schema fragment specifies the expected content contained within this class.
-         * 
-         * <pre>
-         * &lt;complexType>
-         *   &lt;complexContent>
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       &lt;sequence>
-         *         &lt;element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {"key", "value"})
-        public static class Entry {
-
-            protected String key;
-            protected String value;
-
-            /**
-             * Gets the value of the key property.
-             * 
-             * @return possible object is {@link String }
-             * 
-             */
-            public String getKey() {
-                return key;
-            }
-
-            /**
-             * Sets the value of the key property.
-             * 
-             * @param value allowed object is {@link String }
-             * 
-             */
-            public void setKey(String value) {
-                this.key = value;
-            }
-
-            /**
-             * Gets the value of the value property.
-             * 
-             * @return possible object is {@link String }
-             * 
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value allowed object is {@link String }
-             * 
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-        }
-
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/UpdateNetworkNotificationResponse.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/UpdateNetworkNotificationResponse.java
deleted file mode 100644
index 0ffcb5e9e6..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/UpdateNetworkNotificationResponse.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network.async.client;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>
- * Java class for updateNetworkNotificationResponse complex type.
- * 
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="updateNetworkNotificationResponse">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "updateNetworkNotificationResponse")
-public class UpdateNetworkNotificationResponse {
-
-
-}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/package-info.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/package-info.java
deleted file mode 100644
index fdd8711170..0000000000
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/async/client/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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=========================================================
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://org.onap.so/networkNotify")
-package org.onap.so.adapters.network.async.client;
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java
index 8f815f1827..a7bca73fdd 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/openstack/CXFConfiguration.java
@@ -33,9 +33,7 @@ import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.transport.servlet.CXFServlet;
 import org.onap.so.adapters.cloudregion.CloudRegionRestV1;
-import org.onap.so.adapters.network.MsoNetworkAdapterAsyncImpl;
 import org.onap.so.adapters.network.MsoNetworkAdapterImpl;
-import org.onap.so.adapters.network.NetworkAdapterRest;
 import org.onap.so.adapters.tenant.MsoTenantAdapterImpl;
 import org.onap.so.adapters.tenant.TenantAdapterRest;
 import org.onap.so.adapters.vnf.MsoVnfAdapterAsyncImpl;
@@ -55,14 +53,10 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 @Configuration
 public class CXFConfiguration {
     @Autowired
-    private NetworkAdapterRest networkAdapterRest;
-    @Autowired
     private TenantAdapterRest tenantAdapterRest;
     @Autowired
     private MsoNetworkAdapterImpl networkAdapterImpl;
     @Autowired
-    private MsoNetworkAdapterAsyncImpl networkAdapterAsyncImpl;
-    @Autowired
     private MsoTenantAdapterImpl tenantAdapterImpl;
     @Autowired
     private MsoVnfAdapterImpl vnfAdapterImpl;
@@ -104,17 +98,6 @@ public class CXFConfiguration {
         return endpoint;
     }
 
-    @Bean
-    public Endpoint networkAdapterAsyncEndpoint() {
-        EndpointImpl endpoint = new EndpointImpl(springBus(), networkAdapterAsyncImpl);
-        endpoint.publish("/NetworkAdapterAsync");
-        endpoint.setWsdlLocation("NetworkAdapterAsync.wsdl");
-        endpoint.getInInterceptors().add(new SOAPLoggingInInterceptor());
-        endpoint.getOutInterceptors().add(new SOAPLoggingOutInterceptor());
-        endpoint.getOutFaultInterceptors().add(new SOAPLoggingOutInterceptor());
-        return endpoint;
-    }
-
     /*
      * tenant adapter endpoint
      */
@@ -159,7 +142,7 @@ public class CXFConfiguration {
     public Server rsServer() {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
         endpoint.setBus(springBus());
-        endpoint.setServiceBeans(Arrays.<Object>asList(networkAdapterRest, tenantAdapterRest));
+        endpoint.setServiceBeans(Arrays.<Object>asList(tenantAdapterRest));
         endpoint.setAddress("/rest");
         endpoint.setFeatures(Arrays.asList(createSwaggerFeature(), new LoggingFeature()));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(jettisonStyleObjectMapper.getMapper()),
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/PollService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/PollService.java
index 6e181c4696..9ff50e8644 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/PollService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/PollService.java
@@ -33,10 +33,13 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
+import org.onap.so.adapters.nwrest.CreateNetworkRequest;
 import org.onap.so.adapters.vnfrest.CreateVfModuleRequest;
 import org.onap.so.adapters.vnfrest.CreateVolumeGroupRequest;
 import org.onap.so.adapters.vnfrest.DeleteVfModuleRequest;
 import org.onap.so.adapters.vnfrest.DeleteVolumeGroupRequest;
+import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
+import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
 import org.onap.so.logging.tasks.AuditMDCSetup;
 import org.onap.so.openstack.exceptions.MsoException;
 import org.onap.so.openstack.utils.MsoHeatUtils;
@@ -70,7 +73,7 @@ public class PollService extends ExternalTaskUtils {
         MutableBoolean success = new MutableBoolean();
         String errorMessage = null;
         try {
-            String xmlRequest = externalTask.getVariable("vnfAdapterTaskRequest");
+            String xmlRequest = externalTask.getVariable("openstackAdapterTaskRequest");
             if (xmlRequest != null) {
                 Optional<String> requestType = findRequestType(xmlRequest);
                 if ("createVolumeGroupRequest".equals(requestType.get())) {
@@ -87,6 +90,15 @@ public class PollService extends ExternalTaskUtils {
                     DeleteVolumeGroupRequest req =
                             JAXB.unmarshal(new StringReader(xmlRequest), DeleteVolumeGroupRequest.class);
                     pollDeleteResource(req.getCloudSiteId(), req.getTenantId(), externalTask, success);
+                } else if ("createNetworkRequest".equals(requestType.get())) {
+                    determineCreateNetworkStatus(xmlRequest, externalTask, success);
+                } else if ("deleteNetworkRequest".equals(requestType.get())) {
+                    logger.debug("Executing External Task Poll Service for Delete Network");
+                    DeleteNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), DeleteNetworkRequest.class);
+                    pollDeleteResource(req.getCloudSiteId(), req.getTenantId(), externalTask, success);
+                } else if ("updateNetworkRequest".equals(requestType.get())) {
+                    UpdateNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), UpdateNetworkRequest.class);
+                    pollUpdateResource(req.getCloudSiteId(), req.getTenantId(), externalTask, success);
                 }
             }
         } catch (Exception e) {
@@ -143,6 +155,19 @@ public class PollService extends ExternalTaskUtils {
         }
     }
 
+    private void determineCreateNetworkStatus(String xmlRequest, ExternalTask externalTask, MutableBoolean success)
+            throws MsoException {
+        CreateNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), CreateNetworkRequest.class);
+        boolean pollRollbackStatus = externalTask.getVariable("PollRollbackStatus");
+        if (pollRollbackStatus) {
+            logger.debug("Executing External Task Poll Service for Rollback Create Network");
+            pollDeleteResource(req.getCloudSiteId(), req.getTenantId(), externalTask, success);
+        } else {
+            logger.debug("Executing External Task Poll Service for Create Network");
+            pollCreateResource(req.getCloudSiteId(), req.getTenantId(), externalTask, success);
+        }
+    }
+
     private void pollCreateResource(String cloudSiteId, String tenantId, ExternalTask externalTask,
             MutableBoolean success) throws MsoException {
         Stack currentStack = createCurrentStack(externalTask.getVariable("stackId"));
@@ -163,6 +188,15 @@ public class PollService extends ExternalTaskUtils {
         success.setTrue();
     }
 
+    private void pollUpdateResource(String cloudSiteId, String tenantId, ExternalTask externalTask,
+            MutableBoolean success) throws MsoException {
+        Stack currentStack = createCurrentStack(externalTask.getVariable("stackId"));
+        Stack stack =
+                msoHeatUtils.pollStackForStatus(1, currentStack, "UPDATE_IN_PROGRESS", cloudSiteId, tenantId, false);
+        msoHeatUtils.postProcessStackUpdate(stack);
+        success.setTrue();
+    }
+
     protected Optional<String> findRequestType(String xmlString) {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/RollbackService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/RollbackService.java
index c302293169..15e6ff581d 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/RollbackService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/RollbackService.java
@@ -11,6 +11,8 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.ws.Holder;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
+import org.onap.so.adapters.network.MsoNetworkAdapterImpl;
+import org.onap.so.adapters.nwrest.CreateNetworkRequest;
 import org.onap.so.adapters.vnf.MsoVnfAdapterImpl;
 import org.onap.so.adapters.vnfrest.CreateVfModuleRequest;
 import org.onap.so.adapters.vnfrest.CreateVolumeGroupRequest;
@@ -30,6 +32,9 @@ public class RollbackService extends ExternalTaskUtils {
     private MsoVnfAdapterImpl vnfAdapterImpl;
 
     @Autowired
+    private MsoNetworkAdapterImpl networkAdapterImpl;
+
+    @Autowired
     private AuditMDCSetup mdcSetup;
 
     public void executeExternalTask(ExternalTask externalTask, ExternalTaskService externalTaskService) {
@@ -39,7 +44,7 @@ public class RollbackService extends ExternalTaskUtils {
         boolean success = false;
         boolean pollRollbackStatus = false;
         try {
-            String xmlRequest = externalTask.getVariable("vnfAdapterTaskRequest");
+            String xmlRequest = externalTask.getVariable("openstackAdapterTaskRequest");
             if (xmlRequest != null) {
                 Optional<String> requestType = findRequestType(xmlRequest);
                 if ("createVolumeGroupRequest".equals(requestType.get())) {
@@ -59,6 +64,15 @@ public class RollbackService extends ExternalTaskUtils {
                             req.getMsoRequest(), new Holder<>());
                     pollRollbackStatus = true;
                     success = true;
+                } else if ("createNetworkRequest".equals(requestType.get())) {
+                    logger.debug("Executing External Task Rollback Service for Create Network");
+                    Holder<Boolean> networkDeleted = new Holder<>();
+                    CreateNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), CreateNetworkRequest.class);
+                    networkAdapterImpl.deleteNetwork(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
+                            req.getModelCustomizationUuid(), req.getNetworkName(), req.getMsoRequest(), networkDeleted,
+                            false);
+                    pollRollbackStatus = true;
+                    success = true;
                 }
             }
         } catch (Exception e) {
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/StackService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/StackService.java
index 34952a056b..6b7ceedbb8 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/StackService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/StackService.java
@@ -25,6 +25,7 @@ package org.onap.so.adapters.tasks.orchestration;
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import javax.xml.bind.JAXB;
@@ -34,6 +35,18 @@ import javax.xml.ws.Holder;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
+import org.onap.so.adapters.network.MsoNetworkAdapterImpl;
+import org.onap.so.adapters.network.exceptions.NetworkException;
+import org.onap.so.adapters.nwrest.ContrailNetwork;
+import org.onap.so.adapters.nwrest.CreateNetworkRequest;
+import org.onap.so.adapters.nwrest.CreateNetworkResponse;
+import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
+import org.onap.so.adapters.nwrest.DeleteNetworkResponse;
+import org.onap.so.adapters.nwrest.ProviderVlanNetwork;
+import org.onap.so.adapters.nwrest.RollbackNetworkRequest;
+import org.onap.so.adapters.nwrest.RollbackNetworkResponse;
+import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
+import org.onap.so.adapters.nwrest.UpdateNetworkResponse;
 import org.onap.so.adapters.vnf.MsoVnfAdapterImpl;
 import org.onap.so.adapters.vnf.exceptions.VnfException;
 import org.onap.so.adapters.vnfrest.CreateVfModuleRequest;
@@ -47,6 +60,8 @@ import org.onap.so.adapters.vnfrest.DeleteVolumeGroupResponse;
 import org.onap.so.adapters.vnfrest.VfModuleRollback;
 import org.onap.so.adapters.vnfrest.VolumeGroupRollback;
 import org.onap.so.logging.tasks.AuditMDCSetup;
+import org.onap.so.openstack.beans.NetworkRollback;
+import org.onap.so.openstack.beans.RouteTarget;
 import org.onap.so.openstack.beans.VnfRollback;
 import org.onap.so.utils.ExternalTaskUtils;
 import org.slf4j.Logger;
@@ -63,12 +78,19 @@ public class StackService extends ExternalTaskUtils {
     private MsoVnfAdapterImpl vnfAdapterImpl;
 
     @Autowired
+    private MsoNetworkAdapterImpl networkAdapterImpl;
+
+    @Autowired
     private AuditMDCSetup mdcSetup;
 
+    private static final String SHARED = "shared";
+    private static final String EXTERNAL = "external";
+
+    // TODO set backout earlier in case of exception??
     public void executeExternalTask(ExternalTask externalTask, ExternalTaskService externalTaskService) {
         Map<String, Object> variables = new HashMap<>();
         mdcSetup.setupMDC(externalTask);
-        String xmlRequest = externalTask.getVariable("vnfAdapterTaskRequest");
+        String xmlRequest = externalTask.getVariable("openstackAdapterTaskRequest");
         logger.debug("Executing External Task Stack Service. {}", xmlRequest);
         MutableBoolean success = new MutableBoolean();
         MutableBoolean backout = new MutableBoolean();
@@ -80,6 +102,11 @@ public class StackService extends ExternalTaskUtils {
                 Holder<Map<String, String>> outputs = new Holder<>();
                 Holder<VnfRollback> vnfRollback = new Holder<>();
                 Optional<String> requestType = findRequestType(xmlRequest);
+                Holder<String> networkId = new Holder<>();
+                Holder<String> neutronNetworkId = new Holder<>();
+                Holder<String> networkFqdn = new Holder<>();
+                Holder<Map<String, String>> subnetIdMap = new Holder<>();
+                Holder<NetworkRollback> networkRollback = new Holder<>();
                 if ("createVolumeGroupRequest".equals(requestType.get())) {
                     logger.debug("Executing External Task Stack Service For Create Volume Group");
                     response = createVolumeGroup(xmlRequest, outputs, vnfRollback, canonicalStackId, backout, success);
@@ -92,6 +119,16 @@ public class StackService extends ExternalTaskUtils {
                 } else if ("deleteVolumeGroupRequest".equals(requestType.get())) {
                     logger.debug("Executing External Task Stack Service For Delete Volume Group");
                     response = deleteVolumeGroup(xmlRequest, outputs, vnfRollback, canonicalStackId, backout, success);
+                } else if ("createNetworkRequest".equals(requestType.get())) {
+                    response = createNetwork(xmlRequest, networkId, neutronNetworkId, networkFqdn, subnetIdMap,
+                            networkRollback, canonicalStackId, backout, success);
+                } else if ("deleteNetworkRequest".equals(requestType.get())) {
+                    response = deleteNetwork(xmlRequest, canonicalStackId, backout, success);
+                } else if ("updateNetworkRequest".equals(requestType.get())) {
+                    response =
+                            updateNetwork(xmlRequest, subnetIdMap, networkRollback, canonicalStackId, backout, success);
+                } else if ("rollbackNetworkRequest".equals(requestType.get())) {
+                    response = rollbackNetwork(xmlRequest, canonicalStackId, backout, success);
                 }
             }
         } catch (Exception e) {
@@ -192,6 +229,156 @@ public class StackService extends ExternalTaskUtils {
         return deleteResponse.toXmlString();
     }
 
+    private String createNetwork(String xmlRequest, Holder<String> networkId, Holder<String> neutronNetworkId,
+            Holder<String> networkFqdn, Holder<Map<String, String>> subnetIdMap,
+            Holder<NetworkRollback> networkRollback, Holder<String> canonicalStackId, MutableBoolean backout,
+            MutableBoolean success) throws NetworkException {
+        CreateNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), CreateNetworkRequest.class);
+        HashMap<String, String> params = (HashMap<String, String>) req.getNetworkParams();
+        if (params == null) {
+            params = new HashMap<>();
+        }
+        String shared = null;
+        String external = null;
+        String physicalNetworkName = null;
+        List<Integer> vlans = null;
+        List<RouteTarget> routeTargets = null;
+        List<String> fqdns = null;
+        List<String> routeTable = null;
+        if (params.containsKey(SHARED))
+            shared = params.get(SHARED);
+        if (params.containsKey(EXTERNAL))
+            external = params.get(EXTERNAL);
+        if (req.isContrailRequest()) {
+            ContrailNetwork ctn = req.getContrailNetwork();
+            if (ctn == null) {
+                ctn = new ContrailNetwork();
+                req.setContrailNetwork(ctn);
+            }
+            if (shared == null && ctn.getShared() != null) {
+                shared = ctn.getShared();
+            }
+            if (shared == null && ctn.getExternal() != null) {
+                external = ctn.getExternal();
+            }
+            routeTargets = req.getContrailNetwork().getRouteTargets();
+            fqdns = req.getContrailNetwork().getPolicyFqdns();
+            routeTable = req.getContrailNetwork().getRouteTableFqdns();
+        } else {
+            ProviderVlanNetwork pvn = req.getProviderVlanNetwork();
+            if (pvn == null) {
+                pvn = new ProviderVlanNetwork();
+                req.setProviderVlanNetwork(pvn);
+            }
+            physicalNetworkName = req.getProviderVlanNetwork().getPhysicalNetworkName();
+            vlans = req.getProviderVlanNetwork().getVlans();
+        }
+        networkAdapterImpl.createNetwork(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
+                req.getModelCustomizationUuid(), req.getNetworkName(), physicalNetworkName, vlans, routeTargets, shared,
+                external, req.getFailIfExists(), false, req.getSubnets(), fqdns, routeTable, req.getMsoRequest(),
+                networkId, neutronNetworkId, networkFqdn, subnetIdMap, networkRollback, false);
+        success.setTrue();
+        backout.setValue(req.getBackout());
+        canonicalStackId.value = networkRollback.value.getNetworkStackId();
+
+        CreateNetworkResponse response = new CreateNetworkResponse(req.getNetworkId(), neutronNetworkId.value,
+                networkRollback.value.getNetworkStackId(), networkFqdn.value, networkRollback.value.getNetworkCreated(),
+                subnetIdMap.value, networkRollback.value, req.getMessageId());
+        return response.toXmlString();
+    }
+
+    private String deleteNetwork(String xmlRequest, Holder<String> canonicalStackId, MutableBoolean backout,
+            MutableBoolean success) throws NetworkException {
+        backout.setFalse();
+        DeleteNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), DeleteNetworkRequest.class);
+        Holder<Boolean> networkDeleted = new Holder<>();
+
+        networkAdapterImpl.deleteNetwork(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
+                req.getModelCustomizationUuid(), req.getNetworkStackId(), req.getMsoRequest(), networkDeleted, false);
+
+        canonicalStackId.value = req.getNetworkStackId();
+        success.setTrue();
+
+        DeleteNetworkResponse response =
+                new DeleteNetworkResponse(req.getNetworkId(), networkDeleted.value, req.getMessageId());
+        return response.toXmlString();
+    }
+
+    private String rollbackNetwork(String xmlRequest, Holder<String> canonicalStackId, MutableBoolean backout,
+            MutableBoolean success) throws NetworkException {
+        backout.setFalse();
+        RollbackNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), RollbackNetworkRequest.class);
+
+        NetworkRollback rollback = req.getNetworkRollback();
+        networkAdapterImpl.rollbackNetwork(rollback, false);
+
+        canonicalStackId.value = rollback.getNetworkStackId();
+        success.setTrue();
+
+        RollbackNetworkResponse response = new RollbackNetworkResponse(true, req.getMessageId());
+        return response.toXmlString();
+    }
+
+    private String updateNetwork(String xmlRequest, Holder<Map<String, String>> subnetIdMap,
+            Holder<NetworkRollback> networkRollback, Holder<String> canonicalStackId, MutableBoolean backout,
+            MutableBoolean success) throws NetworkException {
+        backout.setFalse();
+        UpdateNetworkRequest req = JAXB.unmarshal(new StringReader(xmlRequest), UpdateNetworkRequest.class);
+        HashMap<String, String> params = (HashMap<String, String>) req.getNetworkParams();
+        if (params == null) {
+            params = new HashMap<>();
+        }
+        String shared = null;
+        String external = null;
+        String physicalNetworkName = null;
+        List<Integer> vlans = null;
+        List<RouteTarget> routeTargets = null;
+        List<String> fqdns = null;
+        List<String> routeTable = null;
+        if (params.containsKey(SHARED))
+            shared = params.get(SHARED);
+        if (params.containsKey(EXTERNAL))
+            external = params.get(EXTERNAL);
+        if (req.isContrailRequest()) {
+            ContrailNetwork ctn = req.getContrailNetwork();
+            if (ctn == null) {
+                ctn = new ContrailNetwork();
+                req.setContrailNetwork(ctn);
+            }
+            if (shared == null && ctn.getShared() != null) {
+                shared = ctn.getShared();
+            }
+            if (shared == null && ctn.getExternal() != null) {
+                external = ctn.getExternal();
+            }
+            routeTargets = req.getContrailNetwork().getRouteTargets();
+            fqdns = req.getContrailNetwork().getPolicyFqdns();
+            routeTable = req.getContrailNetwork().getRouteTableFqdns();
+        } else {
+            ProviderVlanNetwork pvn = req.getProviderVlanNetwork();
+            if (pvn == null) {
+                pvn = new ProviderVlanNetwork();
+                req.setProviderVlanNetwork(pvn);
+            }
+            physicalNetworkName = req.getProviderVlanNetwork().getPhysicalNetworkName();
+            vlans = req.getProviderVlanNetwork().getVlans();
+        }
+
+        networkAdapterImpl.updateNetwork(req.getCloudSiteId(), req.getTenantId(), req.getNetworkType(),
+                req.getModelCustomizationUuid(), req.getNetworkStackId(), req.getNetworkName(), physicalNetworkName,
+                vlans, routeTargets, shared, external, req.getSubnets(), fqdns, routeTable, req.getMsoRequest(),
+                subnetIdMap, networkRollback);
+
+        success.setTrue();
+        canonicalStackId.value = req.getNetworkStackId();
+
+        UpdateNetworkResponse response =
+                new UpdateNetworkResponse(req.getNetworkId(), null, subnetIdMap.value, req.getMessageId());
+        return response.toXmlString();
+    }
+
+
+
     protected Optional<String> findRequestType(String xmlString) {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/BeansTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/BeansTest.java
index 5bafe2b1d6..d8e1e2a9a9 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/BeansTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/BeansTest.java
@@ -49,7 +49,6 @@ public class BeansTest {
 
     @Test
     public void pojoStructure() {
-        test("org.onap.so.adapters.network.async.client");
         test("org.onap.so.adapters.vnf.async.client");
         test("org.onap.so.adapters.network");
         test("org.onap.so.adapters.vnf");
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImplTest.java
deleted file mode 100644
index 00961a16b9..0000000000
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImplTest.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.onap.so.adapters.network;
-
-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.patch;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static org.onap.so.bpmn.mock.StubOpenStack.getBodyFromFile;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackCreatedVUSP_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackCreated_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackDeleteOrUpdateComplete_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPostStacks_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccessQueryNetwork;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.apache.http.HttpStatus;
-import org.junit.Test;
-import org.onap.so.adapters.vnf.BaseRestTestUtils;
-import org.onap.so.entity.MsoRequest;
-import org.onap.so.openstack.beans.NetworkRollback;
-import org.onap.so.openstack.beans.Subnet;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.github.tomakehurst.wiremock.WireMockServer;
-
-public class MsoNetworkAdapterAsyncImplTest extends BaseRestTestUtils {
-    @Autowired
-    MsoNetworkAdapterAsyncImpl impl;
-
-    @Test
-    public void healthCheckATest() {
-        MsoNetworkAdapterAsyncImpl mNAAimpl = new MsoNetworkAdapterAsyncImpl();
-        mNAAimpl.healthCheckA();
-    }
-
-    @Test
-    public void rollbackNetworkATest() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
-                .withRequestBody(containing("<completed>true</completed>"))
-                .willReturn(aResponse().withBody(
-                        "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n"
-                                + "   <soapenv:Header/>\n" + "   <soapenv:Body>\n"
-                                + "      <net:rollbackNetworkNotificationResponse>\n"
-                                + "      </net:rollbackNetworkNotificationResponse>\n" + "   </soapenv:Body>\n"
-                                + "</soapenv:Envelope>")
-                        .withStatus(HttpStatus.SC_OK)));
-        NetworkRollback nrb = getNetworkRollback("mtn13");
-        impl.rollbackNetworkA(nrb, "messageId", "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void rollbackNetworkATest_NotifyException() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        wireMockServer.stubFor(
-                post(urlPathEqualTo("/notificationUrl")).withRequestBody(containing("<completed>true</completed>"))
-                        .willReturn(aResponse().withStatus(HttpStatus.SC_NOT_FOUND)));
-        NetworkRollback nrb = getNetworkRollback("mtn13");
-        impl.rollbackNetworkA(nrb, "messageId", "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    private NetworkRollback getNetworkRollback(String cloudId) {
-        NetworkRollback nrb = new NetworkRollback();
-        nrb.setCloudId(cloudId);
-        nrb.setMsoRequest(new MsoRequest());
-        nrb.setModelCustomizationUuid("3bdbb104-476c-483e-9f8b-c095b3d3068c");
-        nrb.setNetworkCreated(true);
-        nrb.setNetworkId("networkId");
-        nrb.setNetworkName("networkName");
-        nrb.setNetworkStackId("networkStackId");
-        nrb.setNetworkType("networkType");
-        nrb.setNeutronNetworkId("neutronNetworkId");
-        nrb.setPhysicalNetwork("physicalNetwork");
-        nrb.setTenantId("tenantId");
-        nrb.setVlans(new ArrayList<>());
-        return nrb;
-    }
-
-    @Test
-    public void rollbackNetworkATestNetworkException() {
-        NetworkRollback nrb = getNetworkRollback("cloudId");
-
-        impl.rollbackNetworkA(nrb, "messageId", "http://localhost");
-    }
-
-    @Test
-    public void noRollbackNetworkATest() {
-        impl.rollbackNetworkA(null, "messageId", "http://localhost");
-    }
-
-
-    @Test
-    public void deleteNetworkATest() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
-                .withRequestBody(containing("<completed>true</completed>"))
-                .willReturn(aResponse().withBody(
-                        "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n"
-                                + "   <soapenv:Header/>\n" + "   <soapenv:Body>\n"
-                                + "      <net:deleteNetworkNotificationResponse>\n"
-                                + "      </net:deleteNetworkNotificationResponse>\n" + "   </soapenv:Body>\n"
-                                + "</soapenv:Envelope>")
-                        .withStatus(HttpStatus.SC_OK)));
-        impl.deleteNetworkA("mtn13", "tenantId", "networkType", "modelCustomizationUuid", "networkId", "messageId",
-                new MsoRequest(), "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void deleteNetworkATest_NotifyException() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        wireMockServer.stubFor(
-                post(urlPathEqualTo("/notificationUrl")).withRequestBody(containing("<completed>true</completed>"))
-                        .willReturn(aResponse().withStatus(HttpStatus.SC_NOT_FOUND)));
-        impl.deleteNetworkA("mtn13", "tenantId", "networkType", "modelCustomizationUuid", "networkId", "messageId",
-                new MsoRequest(), "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void deleteNetworkATest_NetworkException() {
-        impl.deleteNetworkA("cloudSiteId", "tenantId", "networkType", "modelCustomizationUuid", "networkId",
-                "messageId", new MsoRequest(), "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void updateNetworkATest() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json",
-                "dvspg-VCE_VPE-mtjnj40avbc");
-        mockOpenStackGetStackDeleteOrUpdateComplete_200(wireMockServer, "OpenstackResponse_Stack_UpdateComplete.json");
-        mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200(wireMockServer);
-        wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
-                .withRequestBody(containing("updateNetworkNotification"))
-                .willReturn(aResponse().withBody(
-                        "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n"
-                                + "   <soapenv:Header/>\n" + "   <soapenv:Body>\n"
-                                + "      <net:updateNetworkNotificationResponse>\n"
-                                + "      </net:updateNetworkNotificationResponse>\n" + "   </soapenv:Body>\n"
-                                + "</soapenv:Envelope>")
-                        .withStatus(HttpStatus.SC_OK)));
-        HashMap<String, String> networkParams = new HashMap<String, String>();
-        networkParams.put("shared", "true");
-        networkParams.put("external", "false");
-        impl.updateNetworkA("mtn13", "tenantId", "networkType", "3bdbb104-476c-483e-9f8b-c095b3d3068c",
-                "dvspg-VCE_VPE-mtjnj40avbc", "dvspg-VCE_VPE-mtjnj40avbc", "physicalNetworkName", new ArrayList<>(),
-                new ArrayList<Subnet>(), networkParams, "messageId", new MsoRequest(),
-                "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void updateNetworkATest_NotifyExcpetion() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        mockOpenStackGetStackCreated_200(wireMockServer, "OpenstackResponse_Stack_Created.json",
-                "dvspg-VCE_VPE-mtjnj40avbc");
-        mockOpenStackGetStackDeleteOrUpdateComplete_200(wireMockServer, "OpenstackResponse_Stack_UpdateComplete.json");
-        mockOpenStackPutPublicUrlStackByNameAndID_NETWORK2_200(wireMockServer);
-        HashMap<String, String> networkParams = new HashMap<String, String>();
-        networkParams.put("shared", "true");
-        networkParams.put("external", "false");
-        impl.updateNetworkA("mtn13", "tenantId", "networkType", "3bdbb104-476c-483e-9f8b-c095b3d3068c",
-                "dvspg-VCE_VPE-mtjnj40avbc", "dvspg-VCE_VPE-mtjnj40avbc", "physicalNetworkName", new ArrayList<>(),
-                new ArrayList<>(), networkParams, "messageId", new MsoRequest(),
-                "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void updateNetworkATest_NetworkException() {
-        impl.updateNetworkA("cloudSiteId", "tenantId", "networkType", "3bdbb104-476c-483e-9f8b-c095b3d3068c",
-                "networkId", "dvspg-VCE_VPE-mtjnj40avbc", "physicalNetworkName", new ArrayList<>(), new ArrayList<>(),
-                new HashMap<String, String>(), "messageId", new MsoRequest(),
-                "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void queryNetworkATest() throws IOException {
-        mockOpenStackResponseAccessQueryNetwork(wireMockServer, wireMockPort);
-        impl.queryNetworkA("mtn13", "tenantId", "networkId", "messageId", new MsoRequest(),
-                "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void createNetworkATest() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        wireMockServer.stubFor(post(urlPathEqualTo("/notificationUrl"))
-                .withRequestBody(containing("createNetworkNotification"))
-                .willReturn(aResponse().withBody(
-                        "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:net=\"http://org.onap.so/networkNotify\">\n"
-                                + "   <soapenv:Header/>\n" + "   <soapenv:Body>\n"
-                                + "      <net:createNetworkNotificationResponse>\n"
-                                + "      </net:createNetworkNotificationResponse>\n" + "   </soapenv:Body>\n"
-                                + "</soapenv:Envelope>")
-                        .withStatus(HttpStatus.SC_OK)));
-        mockOpenStackGetStackCreatedVUSP_200(wireMockServer);
-        mockOpenStackPostStacks_200(wireMockServer);
-        mockOpenStackPostStacks_200(wireMockServer);
-        HashMap<String, String> networkParams = new HashMap<String, String>();
-        impl.createNetworkA("mtn13", "tenantId", "networkType", "3bdbb104-476c-483e-9f8b-c095b3d3068c",
-                "vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0", "physicalNetworkName", new ArrayList<>(), false,
-                false, new ArrayList<>(), networkParams, "messageId", new MsoRequest(),
-                "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void createNetworkATest_NotifyException() throws IOException {
-        wireMockServer.stubFor(post(urlPathEqualTo("/v2.0/tokens")).withRequestBody(containing("tenantId"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json")
-                        .withBody(getBodyFromFile("OpenstackResponse_Access.json", wireMockPort, "/mockPublicUrl"))
-                        .withStatus(HttpStatus.SC_OK)));
-        mockOpenStackGetStackCreatedVUSP_200(wireMockServer);
-        mockOpenStackPostStacks_200(wireMockServer);
-        HashMap<String, String> networkParams = new HashMap<String, String>();
-        networkParams.put("shared", "true");
-        networkParams.put("external", "false");
-        impl.createNetworkA("mtn13", "tenantId", "networkType", "3bdbb104-476c-483e-9f8b-c095b3d3068c",
-                "vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0", "physicalNetworkName", new ArrayList<>(), false,
-                false, new ArrayList<>(), networkParams, "messageId", new MsoRequest(),
-                "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-    @Test
-    public void createNetworkATest_NetworkException() {
-        impl.createNetworkA("mtn13", "tenantId", "networkType", "3bdbb104-476c-483e-9f8b-c095b3d3068c",
-                "vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0", "physicalNetworkName", new ArrayList<>(), false,
-                false, new ArrayList<>(), new HashMap<String, String>(), "messageId", new MsoRequest(),
-                "http://localhost:" + wireMockPort + "/notificationUrl");
-    }
-
-}
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/NetworkAdapterRestTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/NetworkAdapterRestTest.java
deleted file mode 100644
index 412abeab3b..0000000000
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/NetworkAdapterRestTest.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.adapters.network;
-
-import static com.shazam.shazamcrest.MatcherAssert.assertThat;
-import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
-import static org.junit.Assert.assertEquals;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackDeletePublicUrlStackByNameAndID_204;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetPublicUrlStackByNameAndID_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetPublicUrlStackByNameAndID_204;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackAppC_404;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackCreatedAppC_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackCreatedVUSP_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVUSP_404;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackGetStackVfModule_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPostPublicUrlWithBodyFile_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPublicUrlStackByID_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPublicUrlStackByName_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackPutPublicUrlStackByNameAndID_200;
-import static org.onap.so.bpmn.mock.StubOpenStack.mockOpenStackResponseAccess;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.json.JSONException;
-import org.junit.Test;
-import org.onap.so.adapters.nwrest.CreateNetworkRequest;
-import org.onap.so.adapters.nwrest.CreateNetworkResponse;
-import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
-import org.onap.so.adapters.nwrest.DeleteNetworkResponse;
-import org.onap.so.adapters.nwrest.QueryNetworkError;
-import org.onap.so.adapters.nwrest.QueryNetworkResponse;
-import org.onap.so.adapters.nwrest.RollbackNetworkRequest;
-import org.onap.so.adapters.nwrest.RollbackNetworkResponse;
-import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
-import org.onap.so.adapters.nwrest.UpdateNetworkResponse;
-import org.onap.so.adapters.vnf.BaseRestTestUtils;
-import org.onap.so.client.policy.JettisonStyleMapperProvider;
-import org.onap.so.entity.MsoRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
-public class NetworkAdapterRestTest extends BaseRestTestUtils {
-
-    @Autowired
-    private JettisonStyleMapperProvider jettisonTypeObjectMapper;
-    private static final String CLOUDSITE_ID = "mtn13";
-    private static final String TENANT_ID = "ba38bc24a2ef4fb2ad2810c894f1938f";
-    private static final String NETWORK_ID = "da886914-efb2-4917-b335-c8381528d90b";
-    private static final String NETWORK_TYPE = "CONTRAIL30_BASIC";
-    private static final String MODEL_CUSTOMIZATION_UUID = "3bdbb104-476c-483e-9f8b-c095b3d308ac";
-    private static final String MSO_SERVICE_INSTANCE_ID = "05869d5f-47df-4b45-bbfc-4f03ce0a50bf";
-    private static final String MSO_REQUEST_ID = "requestId";
-    private static final String NETWORK_NAME = "vUSP-23804-T-01-dpa2b_EVUSP-CORE-VIF-TSIG0_net_0";
-
-    @Test
-    public void testCreateNetwork() throws JSONException, JsonParseException, JsonMappingException, IOException {
-
-        CreateNetworkRequest request = new CreateNetworkRequest();
-        request.setBackout(true);
-        request.setSkipAAI(true);
-        request.setFailIfExists(false);
-        MsoRequest msoReq = new MsoRequest();
-        String networkTechnology = "CONTRAIL";
-
-        msoReq.setRequestId(MSO_REQUEST_ID);
-        msoReq.setServiceInstanceId(MSO_SERVICE_INSTANCE_ID);
-        request.setMsoRequest(msoReq);
-        request.setCloudSiteId(CLOUDSITE_ID);
-        request.setTenantId(TENANT_ID);
-        request.setNetworkId(NETWORK_ID);
-        request.setNetworkName(NETWORK_NAME);
-        request.setNetworkType(NETWORK_TYPE);
-        request.setModelCustomizationUuid(MODEL_CUSTOMIZATION_UUID);
-        request.setNetworkTechnology(networkTechnology);
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-
-        mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
-
-        mockOpenStackGetStackCreatedVUSP_200(wireMockServer);
-
-        mockOpenStackGetStackVUSP_404(wireMockServer);
-
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-        HttpEntity<CreateNetworkRequest> entity = new HttpEntity<CreateNetworkRequest>(request, headers);
-        ResponseEntity<CreateNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks"), HttpMethod.POST, entity, CreateNetworkResponse.class);
-
-        CreateNetworkResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
-                new File("src/test/resources/__files/CreateNetworkResponse.json"), CreateNetworkResponse.class);
-
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
-        assertThat(response.getBody(), sameBeanAs(expectedResponse));
-    }
-
-    @Test
-    public void testCreateNetwork_JSON() throws JSONException, JsonParseException, JsonMappingException, IOException {
-
-
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-
-        mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
-
-        mockOpenStackGetStackCreatedAppC_200(wireMockServer);
-
-        mockOpenStackGetStackAppC_404(wireMockServer);
-
-        headers.add("Content-Type", MediaType.APPLICATION_JSON);
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-
-        String request = readJsonFileAsString("src/test/resources/CreateNetwork.json");
-        HttpEntity<String> entity = new HttpEntity<String>(request, headers);
-
-        ResponseEntity<CreateNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks"), HttpMethod.POST, entity, CreateNetworkResponse.class);
-
-        CreateNetworkResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
-                new File("src/test/resources/__files/CreateNetworkResponse2.json"), CreateNetworkResponse.class);
-
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
-        assertThat(response.getBody(), sameBeanAs(expectedResponse));
-    }
-
-
-
-    @Test
-    public void testDeleteNetwork() throws IOException {
-
-        DeleteNetworkRequest request = new DeleteNetworkRequest();
-
-        MsoRequest msoReq = new MsoRequest();
-
-        msoReq.setRequestId(MSO_REQUEST_ID);
-        msoReq.setServiceInstanceId(MSO_SERVICE_INSTANCE_ID);
-        request.setMsoRequest(msoReq);
-        request.setCloudSiteId(CLOUDSITE_ID);
-        request.setTenantId(TENANT_ID);
-        request.setNetworkId(NETWORK_ID);
-        request.setNetworkType(NETWORK_TYPE);
-        request.setModelCustomizationUuid(MODEL_CUSTOMIZATION_UUID);
-        request.setNetworkStackId(NETWORK_ID);
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-
-        mockOpenStackPublicUrlStackByID_200(wireMockServer, wireMockPort);
-
-        mockOpenStackGetPublicUrlStackByNameAndID_204(wireMockServer, wireMockPort);
-
-        mockOpenStackDeletePublicUrlStackByNameAndID_204(wireMockServer);
-
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-
-        HttpEntity<DeleteNetworkRequest> entity = new HttpEntity<DeleteNetworkRequest>(request, headers);
-
-        ResponseEntity<DeleteNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks/da886914-efb2-4917-b335-c8381528d90b"), HttpMethod.DELETE,
-                entity, DeleteNetworkResponse.class);
-
-        DeleteNetworkResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
-                new File("src/test/resources/__files/DeleteNetworkResponse.json"), DeleteNetworkResponse.class);
-
-        assertThat(response.getBody(), sameBeanAs(expectedResponse));
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
-
-    }
-
-    @Test
-    public void testRollbackNetwork() throws IOException {
-
-        RollbackNetworkRequest request = new RollbackNetworkRequest();
-        MsoRequest msoReq = new MsoRequest();
-        msoReq.setRequestId(MSO_REQUEST_ID);
-        msoReq.setServiceInstanceId(MSO_SERVICE_INSTANCE_ID);
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-
-        mockOpenStackPublicUrlStackByID_200(wireMockServer, wireMockPort);
-
-        mockOpenStackGetPublicUrlStackByNameAndID_204(wireMockServer, wireMockPort);
-
-        mockOpenStackDeletePublicUrlStackByNameAndID_204(wireMockServer);
-
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-
-        HttpEntity<RollbackNetworkRequest> entity = new HttpEntity<>(request, headers);
-
-        ResponseEntity<RollbackNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks/da886914-efb2-4917-b335-c8381528d90b/rollback"),
-                HttpMethod.DELETE, entity, RollbackNetworkResponse.class);
-
-        RollbackNetworkResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
-                new File("src/test/resources/__files/RollbackNetworkResponse.json"), RollbackNetworkResponse.class);
-
-        assertThat(response.getBody(), sameBeanAs(expectedResponse));
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
-
-    }
-
-    @Test
-    public void testQueryNetwork_Exception() throws IOException {
-        MsoRequest msoReq = new MsoRequest();
-        msoReq.setRequestId(MSO_REQUEST_ID);
-        msoReq.setServiceInstanceId(MSO_SERVICE_INSTANCE_ID);
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-
-        HttpEntity<DeleteNetworkRequest> entity = new HttpEntity<DeleteNetworkRequest>(headers);
-
-        ResponseEntity<QueryNetworkError> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks/da886914-efb2-4917-b335-c8381528d90b"), HttpMethod.GET,
-                entity, QueryNetworkError.class);
-
-        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value());
-
-    }
-
-    @Test
-    public void testQueryNetwork() throws IOException {
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-        mockOpenStackGetStackVfModule_200(wireMockServer);
-
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-        HttpEntity<DeleteNetworkRequest> entity = new HttpEntity<DeleteNetworkRequest>(headers);
-
-        ResponseEntity<QueryNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks/da886914-efb2-4917-b335-c8381528d90b" + "?cloudSiteId="
-                        + CLOUDSITE_ID + "&tenantId=" + TENANT_ID + "&aaiNetworkId=aaiNetworkId"),
-                HttpMethod.GET, entity, QueryNetworkResponse.class);
-
-        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatusCode().value());
-
-    }
-
-    @Test
-    public void testUpdateNetwork() throws IOException {
-
-        UpdateNetworkRequest request = new UpdateNetworkRequest();
-
-        MsoRequest msoReq = new MsoRequest();
-
-        msoReq.setRequestId(MSO_REQUEST_ID);
-        msoReq.setServiceInstanceId(MSO_SERVICE_INSTANCE_ID);
-        request.setMsoRequest(msoReq);
-        request.setCloudSiteId(CLOUDSITE_ID);
-        request.setTenantId(TENANT_ID);
-        request.setNetworkId(NETWORK_ID);
-        request.setNetworkName(NETWORK_NAME);
-        request.setNetworkType(NETWORK_TYPE);
-        request.setModelCustomizationUuid(MODEL_CUSTOMIZATION_UUID);
-        request.setNetworkStackId(NETWORK_ID);
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-
-        mockOpenStackPublicUrlStackByName_200(wireMockServer, wireMockPort);
-
-        mockOpenStackPublicUrlStackByID_200(wireMockServer, wireMockPort);
-
-        mockOpenStackGetPublicUrlStackByNameAndID_200(wireMockServer, wireMockPort);
-
-        mockOpenStackPutPublicUrlStackByNameAndID_200(wireMockServer);
-
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-
-        HttpEntity<UpdateNetworkRequest> entity = new HttpEntity<UpdateNetworkRequest>(request, headers);
-
-        ResponseEntity<UpdateNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks/da886914-efb2-4917-b335-c8381528d90b"), HttpMethod.PUT,
-                entity, UpdateNetworkResponse.class);
-
-        UpdateNetworkResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
-                new File("src/test/resources/__files/UpdateNetworkResponse.json"), UpdateNetworkResponse.class);
-
-        assertThat(response.getBody(), sameBeanAs(expectedResponse));
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
-    }
-
-    @Test
-    public void testCreateNetworkCNRC_JSON()
-            throws JSONException, JsonParseException, JsonMappingException, IOException {
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-
-        mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
-
-        mockOpenStackGetStackCreatedAppC_200(wireMockServer);
-
-        mockOpenStackGetStackAppC_404(wireMockServer);
-
-        headers.add("Content-Type", MediaType.APPLICATION_JSON);
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-
-        String request = readJsonFileAsString("src/test/resources/CreateNetwork3.json");
-        HttpEntity<String> entity = new HttpEntity<String>(request, headers);
-
-        ResponseEntity<CreateNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks"), HttpMethod.POST, entity, CreateNetworkResponse.class);
-
-        CreateNetworkResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
-                new File("src/test/resources/__files/CreateNetworkResponse3.json"), CreateNetworkResponse.class);
-
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
-        assertThat(response.getBody(), sameBeanAs(expectedResponse));
-    }
-
-    @Test
-    public void testCreateNetworkNC_Shared_JSON()
-            throws JSONException, JsonParseException, JsonMappingException, IOException {
-
-        mockOpenStackResponseAccess(wireMockServer, wireMockPort);
-
-        mockOpenStackPostPublicUrlWithBodyFile_200(wireMockServer);
-
-        mockOpenStackGetStackCreatedAppC_200(wireMockServer);
-
-        mockOpenStackGetStackAppC_404(wireMockServer);
-
-        headers.add("Content-Type", MediaType.APPLICATION_JSON);
-        headers.add("Accept", MediaType.APPLICATION_JSON);
-
-        String request = readJsonFileAsString("src/test/resources/CreateNetwork4.json");
-        HttpEntity<String> entity = new HttpEntity<String>(request, headers);
-
-        ResponseEntity<CreateNetworkResponse> response = restTemplate.exchange(
-                createURLWithPort("/services/rest/v1/networks"), HttpMethod.POST, entity, CreateNetworkResponse.class);
-
-        CreateNetworkResponse expectedResponse = jettisonTypeObjectMapper.getMapper().readValue(
-                new File("src/test/resources/__files/CreateNetworkResponse4.json"), CreateNetworkResponse.class);
-
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value());
-        assertThat(response.getBody(), sameBeanAs(expectedResponse));
-    }
-
-    @Override
-    protected String readJsonFileAsString(String fileLocation)
-            throws JsonParseException, JsonMappingException, IOException {
-        return new String(Files.readAllBytes(Paths.get(fileLocation)));
-    }
-}
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/PollServiceTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/PollServiceTest.java
index b5b0f5a8ef..8d5ab8234e 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/PollServiceTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/PollServiceTest.java
@@ -44,7 +44,7 @@ public class PollServiceTest {
         String xmlString =
                 new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "/vnfAdapterTaskRequestCreate.xml")));
 
-        Mockito.when(mockExternalTask.getVariable("vnfAdapterTaskRequest")).thenReturn(xmlString);
+        Mockito.when(mockExternalTask.getVariable("openstackAdapterTaskRequest")).thenReturn(xmlString);
         Mockito.when(mockExternalTask.getVariable("PollRollbackStatus")).thenReturn(false);
         Mockito.when(mockExternalTask.getVariable("stackId")).thenReturn("stackId/stack123");
         Mockito.when(msoHeatUtils.pollStackForStatus(eq(1), any(Stack.class), eq("CREATE_IN_PROGRESS"), eq("regionOne"),
@@ -64,7 +64,7 @@ public class PollServiceTest {
         String xmlString =
                 new String(Files.readAllBytes(Paths.get(RESOURCE_PATH + "/vnfAdapterTaskRequestCreate.xml")));
 
-        Mockito.when(mockExternalTask.getVariable("vnfAdapterTaskRequest")).thenReturn(xmlString);
+        Mockito.when(mockExternalTask.getVariable("openstackAdapterTaskRequest")).thenReturn(xmlString);
         Mockito.when(mockExternalTask.getVariable("PollRollbackStatus")).thenReturn(true);
         Mockito.when(mockExternalTask.getVariable("stackId")).thenReturn("stackId/stack123");
         Mockito.when(msoHeatUtils.pollStackForStatus(eq(1), any(), eq("DELETE_IN_PROGRESS"), eq("regionOne"),
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/RollbackServiceTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/RollbackServiceTest.java
index f7613909ec..1f68106f78 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/RollbackServiceTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/RollbackServiceTest.java
@@ -65,7 +65,7 @@ public class RollbackServiceTest {
 
         Stack stack = new Stack();
         stack.setId("heatId");
-        Mockito.when(mockExternalTask.getVariable("vnfAdapterTaskRequest")).thenReturn(payload);
+        Mockito.when(mockExternalTask.getVariable("openstackAdapterTaskRequest")).thenReturn(payload);
         Mockito.doNothing().when(vnfAdapterImpl).deleteVfModule(Mockito.any(), Mockito.any(), Mockito.any(),
                 Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
         Mockito.doNothing().when(mockExternalTaskService).complete(Mockito.any(), Mockito.any());
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/StackServiceTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/StackServiceTest.java
index 2f583b30a2..cc2dfa213e 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/StackServiceTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/tasks/orchestration/StackServiceTest.java
@@ -64,7 +64,7 @@ public class StackServiceTest {
 
         Stack stack = new Stack();
         stack.setId("heatId");
-        Mockito.when(mockExternalTask.getVariable("vnfAdapterTaskRequest")).thenReturn(payload);
+        Mockito.when(mockExternalTask.getVariable("openstackAdapterTaskRequest")).thenReturn(payload);
         Mockito.doNothing().when(vnfAdapterImpl).createVfModule(Mockito.any(), Mockito.any(), Mockito.any(),
                 Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
                 Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java
index 30fd2c8770..4455c9fe9d 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java
@@ -329,7 +329,7 @@ public class ExceptionBuilder {
         }
     }
 
-    public void processVnfAdapterException(DelegateExecution execution) {
+    public void processOpenstackAdapterException(DelegateExecution execution) {
         StringBuilder workflowExceptionMessage = new StringBuilder();
         logger.debug("Processing Vnf Adapter Exception");
         try {
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterTask.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/OpenstackAdapterTask.bpmn
index 69b68e534e..e437f13d7b 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterTask.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/OpenstackAdapterTask.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="_GraPIIyxEeWmdMDkx6Uftw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="vnfAdapterTask" name="vnfAdapterTask" isExecutable="true">
+<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="_GraPIIyxEeWmdMDkx6Uftw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="openstackAdapterTask" name="openstackAdapterTask" isExecutable="true">
     <bpmn2:endEvent id="EndEvent_6">
       <bpmn2:incoming>SequenceFlow_13uy51h</bpmn2:incoming>
     </bpmn2:endEvent>
@@ -24,10 +24,10 @@
       <bpmn2:outgoing>SequenceFlow_0o8wnkx</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_13uy51h" name="Yes" sourceRef="ExclusiveGateway_1fn953y" targetRef="EndEvent_6">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("OpenstackPollSuccess") == true }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("OpenstackPollSuccess") == true }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_0o8wnkx" name="No" sourceRef="ExclusiveGateway_1fn953y" targetRef="EndEvent_1dt01ez">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("OpenstackPollSuccess") == false }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("OpenstackPollSuccess") == false }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_08a6you" name="Success?">
       <bpmn2:incoming>SequenceFlow_1ff2y8j</bpmn2:incoming>
@@ -35,10 +35,10 @@
       <bpmn2:outgoing>SequenceFlow_007m32h</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_1p39f4r" name="Yes" sourceRef="ExclusiveGateway_08a6you" targetRef="ServiceTask_11iuzx9">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("OpenstackInvokeSuccess") == true }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("OpenstackInvokeSuccess") == true }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_007m32h" name="No" sourceRef="ExclusiveGateway_08a6you" targetRef="EndEvent_0rxprkw">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("OpenstackInvokeSuccess") == false }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("OpenstackInvokeSuccess") == false }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:subProcess id="SubProcess_0y17e8j" name="Error Handling" triggeredByEvent="true">
       <bpmn2:startEvent id="StartEvent_17oglfe">
@@ -48,7 +48,7 @@
       <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_040yoan">
         <bpmn2:incoming>SequenceFlow_0y1by9x</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_006myq9</bpmn2:outgoing>
-        <bpmn2:compensateEventDefinition waitForCompletion="true" activityRef="executeOpenstackAction" />
+        <bpmn2:compensateEventDefinition activityRef="executeOpenstackAction" />
       </bpmn2:intermediateThrowEvent>
       <bpmn2:exclusiveGateway id="ExclusiveGateway_0qlnby0" name="Poll Rollback Status?" default="SequenceFlow_1piwh1c">
         <bpmn2:incoming>SequenceFlow_006myq9</bpmn2:incoming>
@@ -66,13 +66,13 @@
         <bpmn2:incoming>SequenceFlow_1nku4uk</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1yx80cq</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
-      <bpmn2:serviceTask id="buildError" name="&#10;Process&#10;Exception&#10;" camunda:expression="${ExceptionBuilder.processVnfAdapterException(execution)}">
+      <bpmn2:serviceTask id="buildError" name="&#10;Process&#10;Exception&#10;" camunda:expression="${ExceptionBuilder.processOpenstackAdapterException(execution)}">
         <bpmn2:incoming>SequenceFlow_1yx80cq</bpmn2:incoming>
         <bpmn2:incoming>SequenceFlow_1az3a2q</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0bnzfqb</bpmn2:outgoing>
       </bpmn2:serviceTask>
       <bpmn2:sequenceFlow id="SequenceFlow_1ubla93" name="Yes" sourceRef="ExclusiveGateway_0qlnby0" targetRef="ServiceTask_120p27h">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("PollRollbackStatus") == true}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("PollRollbackStatus") == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_1piwh1c" name="No" sourceRef="ExclusiveGateway_0qlnby0" targetRef="ExclusiveGateway_0tuxj9l" />
       <bpmn2:sequenceFlow id="SequenceFlow_1nku4uk" sourceRef="ServiceTask_120p27h" targetRef="ExclusiveGateway_0tuxj9l" />
@@ -88,7 +88,7 @@
         <bpmn2:outgoing>SequenceFlow_1az3a2q</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_0y1by9x" name="Yes" sourceRef="ExclusiveGateway_18ndby1" targetRef="IntermediateThrowEvent_040yoan">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("backout") == true }]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("backout") == true }</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_1az3a2q" name="No" sourceRef="ExclusiveGateway_18ndby1" targetRef="buildError" />
     </bpmn2:subProcess>
@@ -109,226 +109,226 @@
   <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
   <bpmn2:message id="Message_1" name="WorkflowMessage" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="vnfAdapterTask">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="openstackAdapterTask">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_54" bpmnElement="StartEvent_1">
-        <dc:Bounds x="110" y="146" width="36" height="36" />
+        <dc:Bounds x="160" y="146" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="116" y="187" width="24" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_54" targetElement="ServiceTask_0rcy900_di">
-        <di:waypoint xsi:type="dc:Point" x="146" y="164" />
-        <di:waypoint xsi:type="dc:Point" x="253" y="163" />
+        <di:waypoint x="196" y="164" />
+        <di:waypoint x="303" y="163" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="154.5" y="145.5" width="90" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_158" bpmnElement="EndEvent_6">
-        <dc:Bounds x="929" y="146" width="36" height="36" />
+        <dc:Bounds x="979" y="146" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="924" y="187" width="46" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0rcy900_di" bpmnElement="executeOpenstackAction">
-        <dc:Bounds x="253" y="124" width="100" height="80" />
+        <dc:Bounds x="303" y="124" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ff2y8j_di" bpmnElement="SequenceFlow_1ff2y8j">
-        <di:waypoint xsi:type="dc:Point" x="353" y="164" />
-        <di:waypoint xsi:type="dc:Point" x="404" y="164" />
+        <di:waypoint x="403" y="164" />
+        <di:waypoint x="454" y="164" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="333.5" y="139" width="90" height="20" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_11iuzx9_di" bpmnElement="ServiceTask_11iuzx9">
-        <dc:Bounds x="541" y="124" width="100" height="80" />
+        <dc:Bounds x="591" y="124" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ecut35_di" bpmnElement="SequenceFlow_0ecut35">
-        <di:waypoint xsi:type="dc:Point" x="641" y="164" />
-        <di:waypoint xsi:type="dc:Point" x="676" y="164" />
+        <di:waypoint x="691" y="164" />
+        <di:waypoint x="726" y="164" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="613.5" y="139" width="90" height="20" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1fn953y_di" bpmnElement="ExclusiveGateway_1fn953y" isMarkerVisible="true">
-        <dc:Bounds x="676" y="139" width="50" height="50" />
+        <dc:Bounds x="726" y="139" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="676" y="119" width="49" height="12" />
+          <dc:Bounds x="727" y="119" width="48" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_13uy51h_di" bpmnElement="SequenceFlow_13uy51h">
-        <di:waypoint xsi:type="dc:Point" x="726" y="164" />
-        <di:waypoint xsi:type="dc:Point" x="929" y="164" />
+        <di:waypoint x="776" y="164" />
+        <di:waypoint x="979" y="164" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="746.6875" y="166" width="19" height="12" />
+          <dc:Bounds x="797" y="166" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0o8wnkx_di" bpmnElement="SequenceFlow_0o8wnkx">
-        <di:waypoint xsi:type="dc:Point" x="701" y="189" />
-        <di:waypoint xsi:type="dc:Point" x="701" y="249" />
+        <di:waypoint x="751" y="189" />
+        <di:waypoint x="751" y="249" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="706" y="198" width="14" height="12" />
+          <dc:Bounds x="756" y="198" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_120p27h_di" bpmnElement="ServiceTask_120p27h">
-        <dc:Bounds x="496" y="443" width="100" height="80" />
+        <dc:Bounds x="546" y="443" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_08a6you_di" bpmnElement="ExclusiveGateway_08a6you" isMarkerVisible="true">
-        <dc:Bounds x="404" y="139" width="50" height="50" />
+        <dc:Bounds x="454" y="139" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="409" y="117" width="49" height="12" />
+          <dc:Bounds x="460" y="117" width="48" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1p39f4r_di" bpmnElement="SequenceFlow_1p39f4r">
-        <di:waypoint xsi:type="dc:Point" x="454" y="164" />
-        <di:waypoint xsi:type="dc:Point" x="541" y="164" />
+        <di:waypoint x="504" y="164" />
+        <di:waypoint x="591" y="164" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="472" y="168" width="19" height="12" />
+          <dc:Bounds x="523" y="168" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_007m32h_di" bpmnElement="SequenceFlow_007m32h">
-        <di:waypoint xsi:type="dc:Point" x="429" y="189" />
-        <di:waypoint xsi:type="dc:Point" x="429" y="249" />
+        <di:waypoint x="479" y="189" />
+        <di:waypoint x="479" y="249" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="435" y="198" width="14" height="12" />
+          <dc:Bounds x="485" y="198" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_09bkjg0_di" bpmnElement="SubProcess_0y17e8j" isExpanded="true">
-        <dc:Bounds x="151" y="404" width="787" height="344" />
+        <dc:Bounds x="201" y="404" width="787" height="344" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BoundaryEvent_04c5efr_di" bpmnElement="BoundaryEvent_1ysr7mk">
-        <dc:Bounds x="335" y="186" width="36" height="36" />
+        <dc:Bounds x="385" y="186" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="353" y="226" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Association_1cnlu6p_di" bpmnElement="Association_1cnlu6p">
-        <di:waypoint xsi:type="dc:Point" x="353" y="222" />
-        <di:waypoint xsi:type="dc:Point" x="353" y="267" />
-        <di:waypoint xsi:type="dc:Point" x="321" y="267" />
+        <di:waypoint x="403" y="222" />
+        <di:waypoint x="403" y="267" />
+        <di:waypoint x="371" y="267" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0vacscp_di" bpmnElement="Task_0zbd85n">
-        <dc:Bounds x="221" y="227" width="100" height="80" />
+        <dc:Bounds x="271" y="227" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0lzcn0v_di" bpmnElement="EndEvent_0rxprkw">
-        <dc:Bounds x="411" y="249" width="36" height="36" />
+        <dc:Bounds x="461" y="249" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="429" y="288.658" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_14424k5_di" bpmnElement="EndEvent_1dt01ez">
-        <dc:Bounds x="683" y="249" width="36" height="36" />
+        <dc:Bounds x="733" y="249" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="701" y="288.658" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1wrpebh_di" bpmnElement="StartEvent_17oglfe">
-        <dc:Bounds x="181" y="599" width="36" height="36" />
+        <dc:Bounds x="231" y="599" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="198.35199999999998" y="638.658" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0gltuh4_di" bpmnElement="IntermediateThrowEvent_040yoan">
-        <dc:Bounds x="365" y="529" width="36" height="36" />
+        <dc:Bounds x="415" y="529" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="382.352" y="569" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0qlnby0_di" bpmnElement="ExclusiveGateway_0qlnby0" isMarkerVisible="true">
-        <dc:Bounds x="429.352" y="522" width="50" height="50" />
+        <dc:Bounds x="479" y="522" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="484" y="535" width="62" height="24" />
+          <dc:Bounds x="533" y="535" width="65" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_02rhau9_di" bpmnElement="SequenceFlow_02rhau9">
-        <di:waypoint xsi:type="dc:Point" x="217" y="617" />
-        <di:waypoint xsi:type="dc:Point" x="284" y="617" />
+        <di:waypoint x="267" y="617" />
+        <di:waypoint x="334" y="617" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="250.5" y="596" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_006myq9_di" bpmnElement="SequenceFlow_006myq9">
-        <di:waypoint xsi:type="dc:Point" x="401" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="429" y="547" />
+        <di:waypoint x="451" y="547" />
+        <di:waypoint x="479" y="547" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="415" y="526" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0tuxj9l_di" bpmnElement="ExclusiveGateway_0tuxj9l" isMarkerVisible="true">
-        <dc:Bounds x="608.352" y="522" width="50" height="50" />
+        <dc:Bounds x="658" y="522" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="633.352" y="576" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_108cgfw_di" bpmnElement="buildError">
-        <dc:Bounds x="695" y="577" width="100" height="80" />
+        <dc:Bounds x="745" y="577" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ubla93_di" bpmnElement="SequenceFlow_1ubla93">
-        <di:waypoint xsi:type="dc:Point" x="454" y="522" />
-        <di:waypoint xsi:type="dc:Point" x="454" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="496" y="483" />
+        <di:waypoint x="504" y="522" />
+        <di:waypoint x="504" y="483" />
+        <di:waypoint x="546" y="483" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="461" y="489" width="19" height="12" />
+          <dc:Bounds x="512" y="489" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1piwh1c_di" bpmnElement="SequenceFlow_1piwh1c">
-        <di:waypoint xsi:type="dc:Point" x="454" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="454" y="603" />
-        <di:waypoint xsi:type="dc:Point" x="633" y="603" />
-        <di:waypoint xsi:type="dc:Point" x="633" y="572" />
+        <di:waypoint x="504" y="572" />
+        <di:waypoint x="504" y="603" />
+        <di:waypoint x="683" y="603" />
+        <di:waypoint x="683" y="572" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="460" y="576.85" width="14" height="12" />
+          <dc:Bounds x="510" y="577" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1nku4uk_di" bpmnElement="SequenceFlow_1nku4uk">
-        <di:waypoint xsi:type="dc:Point" x="596" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="633" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="633" y="522" />
+        <di:waypoint x="646" y="483" />
+        <di:waypoint x="683" y="483" />
+        <di:waypoint x="683" y="522" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="614.5" y="462" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yx80cq_di" bpmnElement="SequenceFlow_1yx80cq">
-        <di:waypoint xsi:type="dc:Point" x="658" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="745" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="745" y="577" />
+        <di:waypoint x="708" y="547" />
+        <di:waypoint x="795" y="547" />
+        <di:waypoint x="795" y="577" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="656.5" y="526" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0bnzfqb_di" bpmnElement="SequenceFlow_0bnzfqb">
-        <di:waypoint xsi:type="dc:Point" x="795" y="617" />
-        <di:waypoint xsi:type="dc:Point" x="870" y="617" />
+        <di:waypoint x="845" y="617" />
+        <di:waypoint x="920" y="617" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="787.5" y="596" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_1l1f6zj_di" bpmnElement="EndEvent_1yiy2fi">
-        <dc:Bounds x="870" y="599" width="36" height="36" />
+        <dc:Bounds x="920" y="599" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="887.352" y="639" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_18ndby1_di" bpmnElement="ExclusiveGateway_18ndby1" isMarkerVisible="true">
-        <dc:Bounds x="284.352" y="592" width="50" height="50" />
+        <dc:Bounds x="334" y="592" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="338" y="605" width="54" height="24" />
+          <dc:Bounds x="388" y="605" width="54" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0y1by9x_di" bpmnElement="SequenceFlow_0y1by9x">
-        <di:waypoint xsi:type="dc:Point" x="309" y="592" />
-        <di:waypoint xsi:type="dc:Point" x="309" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="365" y="547" />
+        <di:waypoint x="359" y="592" />
+        <di:waypoint x="359" y="547" />
+        <di:waypoint x="415" y="547" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="315" y="558" width="19" height="12" />
+          <dc:Bounds x="366" y="558" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1az3a2q_di" bpmnElement="SequenceFlow_1az3a2q">
-        <di:waypoint xsi:type="dc:Point" x="309" y="642" />
-        <di:waypoint xsi:type="dc:Point" x="309" y="686" />
-        <di:waypoint xsi:type="dc:Point" x="745" y="686" />
-        <di:waypoint xsi:type="dc:Point" x="745" y="657" />
+        <di:waypoint x="359" y="642" />
+        <di:waypoint x="359" y="686" />
+        <di:waypoint x="795" y="686" />
+        <di:waypoint x="795" y="657" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="318" y="657" width="14" height="12" />
+          <dc:Bounds x="368" y="657" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn
index 1ea311549c..12b038e738 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.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: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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="CreateNetworkBB" name="CreateNetworkBB" isExecutable="true">
     <bpmn2:startEvent id="createNetwork_startEvent">
       <bpmn2:outgoing>SequenceFlow_1maepy7</bpmn2:outgoing>
@@ -11,7 +11,7 @@
       <bpmn2:incoming>SequenceFlow_1oc7wcr</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0n42zi5</bpmn2:outgoing>
     </bpmn2:serviceTask>
-    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="&#10;AIC&#10;Create&#10;(network)&#10;" camunda:expression="${NetworkAdapterCreateTasks.createNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="Prepare Request" camunda:expression="${NetworkAdapterCreateTasks.createNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn2:incoming>SequenceFlow_1eqfh23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1fm99t6</bpmn2:outgoing>
     </bpmn2:serviceTask>
@@ -31,19 +31,19 @@
     <bpmn2:sequenceFlow id="SequenceFlow_1yy4aik" sourceRef="QueryNetworkPolicy_ServiceTask" targetRef="QueryNetworkTableRef_ServiceTask" />
     <bpmn2:sequenceFlow id="SequenceFlow_0sissul" sourceRef="Update_Network_AAI_ServiceTask" targetRef="createNetwork_EndEvent" />
     <bpmn2:sequenceFlow id="SequenceFlow_1maepy7" sourceRef="createNetwork_startEvent" targetRef="ServiceTask_get_cloud_region" />
-    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCollectAAIData" name="ThrowEvent_ToCollectAAIData">
+    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCollectAAIData" name="Query&#10;AAI">
       <bpmn2:incoming>SequenceFlow_03ebe6c</bpmn2:incoming>
       <bpmn2:linkEventDefinition name="CatchEvent_Collect_AAI_Data" />
     </bpmn2:intermediateThrowEvent>
-    <bpmn2:intermediateCatchEvent id="CatchEvent_Collect_AAI_Data" name="CatchEvent_Collect_AAI_Data">
+    <bpmn2:intermediateCatchEvent id="CatchEvent_Collect_AAI_Data" name="Query&#10;AAI">
       <bpmn2:outgoing>SequenceFlow_1oc7wcr</bpmn2:outgoing>
       <bpmn2:linkEventDefinition name="CatchEvent_Collect_AAI_Data" />
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:intermediateCatchEvent id="CatchEvent_Create_Network" name="CatchEvent_Create_Network">
+    <bpmn2:intermediateCatchEvent id="CatchEvent_Create_Network" name="Create&#10;Network">
       <bpmn2:outgoing>SequenceFlow_1eqfh23</bpmn2:outgoing>
       <bpmn2:linkEventDefinition name="CatchEvent_Create_Network" />
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCreateNetwork" name="ThrowEvent_ToCreateNetwork">
+    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCreateNetwork" name="Create&#10;Network">
       <bpmn2:incoming>SequenceFlow_0y0w60u</bpmn2:incoming>
       <bpmn2:linkEventDefinition name="CatchEvent_Create_Network" />
     </bpmn2:intermediateThrowEvent>
@@ -55,12 +55,12 @@
       <bpmn2:outgoing>SequenceFlow_03ebe6c</bpmn2:outgoing>
     </bpmn2:serviceTask>
     <bpmn2:sequenceFlow id="SequenceFlow_03ebe6c" sourceRef="ServiceTask_get_cloud_region" targetRef="ThrowEvent_ToCollectAAIData" />
-    <bpmn2:callActivity id="CallActivity_0aj19il" name="Call NetworkAdapterRestV1" calledElement="NetworkAdapterRestV1">
+    <bpmn2:callActivity id="CallActivity_0aj19il" name="Network Adapter" calledElement="NetworkAdapter">
       <bpmn2:extensionElements>
         <camunda:in source="networkAdapterRequest" target="networkAdapterRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="createNetworkResponse" target="createNetworkResponse" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1fm99t6</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0qpu80i</bpmn2:outgoing>
@@ -83,148 +83,148 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateNetworkBB">
       <bpmndi:BPMNShape id="StartEvent_0lbwmd1_di" bpmnElement="createNetwork_startEvent">
-        <dc:Bounds x="236" y="-55" width="36" height="36" />
+        <dc:Bounds x="176" y="105" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="229" y="-14" width="50" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_10l9a3s_di" bpmnElement="createNetwork_EndEvent">
-        <dc:Bounds x="997" y="326" width="36" height="36" />
+        <dc:Bounds x="937" y="486" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="971" y="362" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1k7d8ih_di" bpmnElement="QueryVpnBinding_ServiceTask">
-        <dc:Bounds x="340" y="91" width="100" height="80" />
+        <dc:Bounds x="280" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1911vum_di" bpmnElement="Create_Network_ServiceTask">
-        <dc:Bounds x="346" y="304" width="100" height="80" />
+        <dc:Bounds x="286" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1glneas_di" bpmnElement="QueryNetworkPolicy_ServiceTask">
-        <dc:Bounds x="503" y="91" width="100" height="80" />
+        <dc:Bounds x="443" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_00rw5co_di" bpmnElement="QueryNetworkTableRef_ServiceTask">
-        <dc:Bounds x="663" y="91" width="100" height="80" />
+        <dc:Bounds x="603" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0q51h0f_di" bpmnElement="Update_Network_AAI_ServiceTask">
-        <dc:Bounds x="836" y="304" width="100" height="80" />
+        <dc:Bounds x="776" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0n42zi5_di" bpmnElement="SequenceFlow_0n42zi5">
-        <di:waypoint xsi:type="dc:Point" x="440" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="503" y="131" />
+        <di:waypoint x="380" y="291" />
+        <di:waypoint x="443" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="472" y="106" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yy4aik_di" bpmnElement="SequenceFlow_1yy4aik">
-        <di:waypoint xsi:type="dc:Point" x="603" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="663" y="131" />
+        <di:waypoint x="543" y="291" />
+        <di:waypoint x="603" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="633" y="106" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0sissul_di" bpmnElement="SequenceFlow_0sissul">
-        <di:waypoint xsi:type="dc:Point" x="936" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="997" y="344" />
+        <di:waypoint x="876" y="504" />
+        <di:waypoint x="937" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="921.5" y="329" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1maepy7_di" bpmnElement="SequenceFlow_1maepy7">
-        <di:waypoint xsi:type="dc:Point" x="272" y="-37" />
-        <di:waypoint xsi:type="dc:Point" x="426" y="-37" />
+        <di:waypoint x="212" y="123" />
+        <di:waypoint x="366" y="123" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="304" y="-52" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0fexg2g_di" bpmnElement="ThrowEvent_ToCollectAAIData">
-        <dc:Bounds x="666" y="-55" width="36" height="36" />
+        <dc:Bounds x="606" y="105" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="709" y="-43" width="85" height="24" />
+          <dc:Bounds x="608" y="146" width="31" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_1plrukk_di" bpmnElement="CatchEvent_Collect_AAI_Data">
-        <dc:Bounds x="236" y="113" width="36" height="36" />
+        <dc:Bounds x="176" y="273" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="216" y="154" width="81" height="24" />
+          <dc:Bounds x="181" y="314" width="31" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_1n0vun1_di" bpmnElement="CatchEvent_Create_Network">
-        <dc:Bounds x="236" y="326" width="36" height="36" />
+        <dc:Bounds x="176" y="486" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="213" y="367" width="87" height="24" />
+          <dc:Bounds x="173" y="527" width="41" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_04qwhex_di" bpmnElement="ThrowEvent_ToCreateNetwork">
-        <dc:Bounds x="962" y="113" width="36" height="36" />
+        <dc:Bounds x="902" y="273" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1005" y="125" width="86" height="24" />
+          <dc:Bounds x="899" y="314" width="41" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1h9kkhb_di" bpmnElement="SequenceFlow_1h9kkhb">
-        <di:waypoint xsi:type="dc:Point" x="763" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="817" y="131" />
+        <di:waypoint x="703" y="291" />
+        <di:waypoint x="757" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="745" y="116" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1oc7wcr_di" bpmnElement="SequenceFlow_1oc7wcr">
-        <di:waypoint xsi:type="dc:Point" x="272" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="340" y="131" />
+        <di:waypoint x="212" y="291" />
+        <di:waypoint x="280" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="306" y="106" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1eqfh23_di" bpmnElement="SequenceFlow_1eqfh23">
-        <di:waypoint xsi:type="dc:Point" x="272" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="346" y="344" />
+        <di:waypoint x="212" y="504" />
+        <di:waypoint x="286" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="309" y="319" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_02qnccl_di" bpmnElement="ServiceTask_get_cloud_region">
-        <dc:Bounds x="426" y="-77" width="100" height="80" />
+        <dc:Bounds x="366" y="83" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_03ebe6c_di" bpmnElement="SequenceFlow_03ebe6c">
-        <di:waypoint xsi:type="dc:Point" x="526" y="-37" />
-        <di:waypoint xsi:type="dc:Point" x="666" y="-37" />
+        <di:waypoint x="466" y="123" />
+        <di:waypoint x="606" y="123" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="551" y="-52" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0aj19il_di" bpmnElement="CallActivity_0aj19il">
-        <dc:Bounds x="503" y="304" width="100" height="80" />
+        <dc:Bounds x="443" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1k8gsz5_di" bpmnElement="ServiceTask_1k8gsz5">
-        <dc:Bounds x="663" y="304" width="100" height="80" />
+        <dc:Bounds x="603" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qpu80i_di" bpmnElement="SequenceFlow_0qpu80i">
-        <di:waypoint xsi:type="dc:Point" x="603" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="663" y="344" />
+        <di:waypoint x="543" y="504" />
+        <di:waypoint x="603" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="633" y="323" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_16152be_di" bpmnElement="SequenceFlow_16152be">
-        <di:waypoint xsi:type="dc:Point" x="763" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="344" />
+        <di:waypoint x="703" y="504" />
+        <di:waypoint x="776" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="799.5" y="323" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1fm99t6_di" bpmnElement="SequenceFlow_1fm99t6">
-        <di:waypoint xsi:type="dc:Point" x="446" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="503" y="344" />
+        <di:waypoint x="386" y="504" />
+        <di:waypoint x="443" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="474.5" y="323" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0u4ie2q_di" bpmnElement="QueryNetworkSubnet_ServiceTask">
-        <dc:Bounds x="817" y="91" width="100" height="80" />
+        <dc:Bounds x="757" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0y0w60u_di" bpmnElement="SequenceFlow_0y0w60u">
-        <di:waypoint xsi:type="dc:Point" x="917" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="962" y="131" />
+        <di:waypoint x="857" y="291" />
+        <di:waypoint x="902" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="939.5" y="110" width="0" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn
index 97fad57e7d..d77e141364 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
   <bpmn:process id="CreateVfModuleBB" name="CreateVfModuleBB" isExecutable="true">
     <bpmn:startEvent id="CreateVfModuleBB_Start">
       <bpmn:outgoing>SequenceFlow_1xr6chl</bpmn:outgoing>
@@ -12,7 +12,7 @@
     <bpmn:endEvent id="CreateVfModuleBB_End">
       <bpmn:incoming>SequenceFlow_1vbwdaw</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:serviceTask id="CreateVfModule" name="Create VF Module (VNF)" camunda:expression="${VnfAdapterCreateTasks.createVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="CreateVfModule" name="Prepare Request" camunda:expression="${VnfAdapterCreateTasks.createVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_15hn8si</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_16g4dz0</bpmn:outgoing>
     </bpmn:serviceTask>
@@ -83,148 +83,148 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateVfModuleBB">
       <bpmndi:BPMNShape id="StartEvent_0kxwniy_di" bpmnElement="CreateVfModuleBB_Start">
-        <dc:Bounds x="59" y="88" width="36" height="36" />
+        <dc:Bounds x="159" y="88" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="77" y="124" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_13t22km_di" bpmnElement="QueryVfModule">
-        <dc:Bounds x="416" y="66" width="100" height="80" />
+        <dc:Bounds x="516" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1xr6chl_di" bpmnElement="SequenceFlow_1xr6chl">
-        <di:waypoint xsi:type="dc:Point" x="95" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="216" y="106" />
+        <di:waypoint x="195" y="106" />
+        <di:waypoint x="316" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="156" y="91" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0qdq7wj_di" bpmnElement="CreateVfModuleBB_End">
-        <dc:Bounds x="1118" y="293" width="36" height="36" />
+        <dc:Bounds x="1218" y="293" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1136" y="333" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1dgenhy_di" bpmnElement="CreateVfModule">
-        <dc:Bounds x="612" y="66" width="100" height="80" />
+        <dc:Bounds x="712" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_15hn8si_di" bpmnElement="SequenceFlow_15hn8si">
-        <di:waypoint xsi:type="dc:Point" x="516" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="612" y="106" />
+        <di:waypoint x="616" y="106" />
+        <di:waypoint x="712" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="519" y="91" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1s4rpyp_di" bpmnElement="SequenceFlow_1s4rpyp">
-        <di:waypoint xsi:type="dc:Point" x="316" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="416" y="106" />
+        <di:waypoint x="416" y="106" />
+        <di:waypoint x="516" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="321" y="91" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1frb5h2_di" bpmnElement="QueryVnf">
-        <dc:Bounds x="216" y="66" width="100" height="80" />
+        <dc:Bounds x="316" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_16g4dz0_di" bpmnElement="SequenceFlow_16g4dz0">
-        <di:waypoint xsi:type="dc:Point" x="712" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="790" y="106" />
+        <di:waypoint x="812" y="106" />
+        <di:waypoint x="890" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="751" y="91" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ecr393_di" bpmnElement="SequenceFlow_0ecr393">
-        <di:waypoint xsi:type="dc:Point" x="890" y="107" />
-        <di:waypoint xsi:type="dc:Point" x="994" y="107" />
-        <di:waypoint xsi:type="dc:Point" x="994" y="209" />
-        <di:waypoint xsi:type="dc:Point" x="73" y="209" />
-        <di:waypoint xsi:type="dc:Point" x="73" y="306" />
-        <di:waypoint xsi:type="dc:Point" x="142" y="306" />
+        <di:waypoint x="990" y="107" />
+        <di:waypoint x="1094" y="107" />
+        <di:waypoint x="1094" y="209" />
+        <di:waypoint x="173" y="209" />
+        <di:waypoint x="173" y="306" />
+        <di:waypoint x="242" y="306" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="534" y="194" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1i1pfzb_di" bpmnElement="VnfAdapter">
-        <dc:Bounds x="790" y="66" width="100" height="80" />
+        <dc:Bounds x="890" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0fpfn71_di" bpmnElement="UpdateVfModuleStatus">
-        <dc:Bounds x="942" y="271" width="100" height="80" />
+        <dc:Bounds x="1042" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_04k1b85_di" bpmnElement="UpdateVfModuleHeatStackId">
-        <dc:Bounds x="777" y="271" width="100" height="80" />
+        <dc:Bounds x="877" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_1getwnf_di" bpmnElement="SubProcess_1getwnf" isExpanded="true">
-        <dc:Bounds x="136" y="439" width="231" height="135" />
+        <dc:Bounds x="236" y="439" width="231" height="135" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1c8o652_di" bpmnElement="StartEvent_1c8o652">
-        <dc:Bounds x="175" y="497" width="36" height="36" />
+        <dc:Bounds x="275" y="497" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="148" y="533" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1emam1w_di" bpmnElement="EndEvent_1emam1w">
-        <dc:Bounds x="312" y="497" width="36" height="36" />
+        <dc:Bounds x="412" y="497" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="285" y="533" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0gcots6_di" bpmnElement="SequenceFlow_0gcots6">
-        <di:waypoint xsi:type="dc:Point" x="211" y="515" />
-        <di:waypoint xsi:type="dc:Point" x="312" y="515" />
+        <di:waypoint x="311" y="515" />
+        <di:waypoint x="412" y="515" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="262" y="494" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0rds4rj_di" bpmnElement="SequenceFlow_0rds4rj">
-        <di:waypoint xsi:type="dc:Point" x="877" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="942" y="311" />
+        <di:waypoint x="977" y="311" />
+        <di:waypoint x="1042" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="910" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1vbwdaw_di" bpmnElement="SequenceFlow_1vbwdaw">
-        <di:waypoint xsi:type="dc:Point" x="1042" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="1083" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="1083" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="1118" y="311" />
+        <di:waypoint x="1142" y="311" />
+        <di:waypoint x="1183" y="311" />
+        <di:waypoint x="1183" y="311" />
+        <di:waypoint x="1218" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1098" y="311" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1v8zx4s_di" bpmnElement="CreateNetworkPolicies">
-        <dc:Bounds x="142" y="271" width="100" height="80" />
+        <dc:Bounds x="242" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0xqhep5_di" bpmnElement="SequenceFlow_0xqhep5">
-        <di:waypoint xsi:type="dc:Point" x="242" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="311" />
+        <di:waypoint x="342" y="311" />
+        <di:waypoint x="395" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="269" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_015ayw5_di" bpmnElement="UpdateVnfIpv4OamAddress">
-        <dc:Bounds x="295" y="271" width="100" height="80" />
+        <dc:Bounds x="395" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1yo6mvv_di" bpmnElement="SequenceFlow_1yo6mvv">
-        <di:waypoint xsi:type="dc:Point" x="395" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="464" y="311" />
+        <di:waypoint x="495" y="311" />
+        <di:waypoint x="564" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="430" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0mlfsc9_di" bpmnElement="UpdateVnfManagementV6Address">
-        <dc:Bounds x="464" y="271" width="100" height="80" />
+        <dc:Bounds x="564" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1i03uy2_di" bpmnElement="SequenceFlow_1i03uy2">
-        <di:waypoint xsi:type="dc:Point" x="564" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="612" y="311" />
+        <di:waypoint x="664" y="311" />
+        <di:waypoint x="712" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="588" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0wctnhw_di" bpmnElement="UpdateVfModuleContrailServiceInstanceFqdn">
-        <dc:Bounds x="612" y="271" width="100" height="80" />
+        <dc:Bounds x="712" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_15do1tu_di" bpmnElement="SequenceFlow_15do1tu">
-        <di:waypoint xsi:type="dc:Point" x="712" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="777" y="311" />
+        <di:waypoint x="812" y="311" />
+        <di:waypoint x="877" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="745" y="286" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn
index 7a05163b0f..37459cdc7e 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
   <bpmn:process id="DeleteNetworkBB" name="DeleteNetworkBB" isExecutable="true">
     <bpmn:startEvent id="deleteNetwork_startEvent">
       <bpmn:outgoing>SequenceFlow_1mc3d3f</bpmn:outgoing>
@@ -17,12 +17,12 @@
       <bpmn:incoming>SequenceFlow_0nhd7b7</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="SequenceFlow_0nhd7b7" sourceRef="updateNetworkAAI" targetRef="deleteNetwork_endEvent" />
-    <bpmn:callActivity id="CallActivity_1a77pxk" name="AIC &#10;Delete&#10;(network)&#10;" calledElement="NetworkAdapterRestV1">
+    <bpmn:callActivity id="CallActivity_1a77pxk" name="Network Adapter" calledElement="NetworkAdapter">
       <bpmn:extensionElements>
         <camunda:in source="networkAdapterRequest" target="networkAdapterRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="deleteNetworkResponse" target="deleteNetworkResponse" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_16ti327</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0gnafn2</bpmn:outgoing>
@@ -52,8 +52,8 @@
         <dc:Bounds x="626" y="103" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1mc3d3f_di" bpmnElement="SequenceFlow_1mc3d3f">
-        <di:waypoint xsi:type="dc:Point" x="192" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="312" y="143" />
+        <di:waypoint x="192" y="143" />
+        <di:waypoint x="312" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="207" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
@@ -68,8 +68,8 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0nhd7b7_di" bpmnElement="SequenceFlow_0nhd7b7">
-        <di:waypoint xsi:type="dc:Point" x="726" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="862" y="143" />
+        <di:waypoint x="726" y="143" />
+        <di:waypoint x="862" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="749" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
@@ -78,15 +78,15 @@
         <dc:Bounds x="470" y="103" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_16ti327_di" bpmnElement="SequenceFlow_16ti327">
-        <di:waypoint xsi:type="dc:Point" x="412" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="470" y="143" />
+        <di:waypoint x="412" y="143" />
+        <di:waypoint x="470" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="396" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0gnafn2_di" bpmnElement="SequenceFlow_0gnafn2">
-        <di:waypoint xsi:type="dc:Point" x="570" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="626" y="143" />
+        <di:waypoint x="570" y="143" />
+        <di:waypoint x="626" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="553" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/NetworkAdapter.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/NetworkAdapter.bpmn
new file mode 100644
index 0000000000..fe071a25ba
--- /dev/null
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/NetworkAdapter.bpmn
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0gecuy2" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+  <bpmn:process id="NetworkAdapter" name="NetworkAdapter" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_1te2q0o</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_1te2q0o" sourceRef="StartEvent_1" targetRef="Activity_045o7mr" />
+    <bpmn:sequenceFlow id="Flow_16y1hyp" sourceRef="Activity_045o7mr" targetRef="Activity_1ml9k96" />
+    <bpmn:sequenceFlow id="Flow_03mucze" sourceRef="Activity_1ml9k96" targetRef="Activity_124f192" />
+    <bpmn:endEvent id="Event_0mfsd2x">
+      <bpmn:incoming>Flow_0dcm3bq</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_0dcm3bq" sourceRef="Activity_124f192" targetRef="Event_0mfsd2x" />
+    <bpmn:serviceTask id="Activity_045o7mr" name="Pre Process Request" camunda:expression="${NetworkAdapterImpl.preProcessNetworkAdapter(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:incoming>Flow_1te2q0o</bpmn:incoming>
+      <bpmn:outgoing>Flow_16y1hyp</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="Activity_124f192" name="Post Process Response" camunda:expression="${NetworkAdapterImpl.postProcessNetworkAdapter(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:incoming>Flow_03mucze</bpmn:incoming>
+      <bpmn:outgoing>Flow_0dcm3bq</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:callActivity id="Activity_1ml9k96" name="Openstack&#10;Adapter" calledElement="openstackAdapterTask">
+      <bpmn:extensionElements>
+        <camunda:in source="networkAdapterRequest" target="openstackAdapterTaskRequest" />
+        <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="WorkflowResponse" target="WorkflowResponse" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_16y1hyp</bpmn:incoming>
+      <bpmn:outgoing>Flow_03mucze</bpmn:outgoing>
+    </bpmn:callActivity>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="NetworkAdapter">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="179" y="82" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1te2q0o_di" bpmnElement="Flow_1te2q0o">
+        <di:waypoint x="215" y="100" />
+        <di:waypoint x="300" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_16y1hyp_di" bpmnElement="Flow_16y1hyp">
+        <di:waypoint x="400" y="100" />
+        <di:waypoint x="490" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_03mucze_di" bpmnElement="Flow_03mucze">
+        <di:waypoint x="590" y="100" />
+        <di:waypoint x="680" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Event_0mfsd2x_di" bpmnElement="Event_0mfsd2x">
+        <dc:Bounds x="872" y="82" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0dcm3bq_di" bpmnElement="Flow_0dcm3bq">
+        <di:waypoint x="780" y="100" />
+        <di:waypoint x="872" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Activity_1gfh44k_di" bpmnElement="Activity_045o7mr">
+        <dc:Bounds x="300" y="60" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1m5d1dj_di" bpmnElement="Activity_124f192">
+        <dc:Bounds x="680" y="60" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_037d53l_di" bpmnElement="Activity_1ml9k96">
+        <dc:Bounds x="490" y="60" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn
index 1235469b42..f4ffa18267 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.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: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.7.2" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="UpdateNetworkBB" name="UpdateNetworkBB" isExecutable="true">
     <bpmn2:startEvent id="UpdateNetworkBB_Start" name="Start">
       <bpmn2:outgoing>SequenceFlow_074w2et</bpmn2:outgoing>
@@ -48,11 +48,12 @@
     <bpmn2:endEvent id="UpdateNetworkBB_End" name="End">
       <bpmn2:incoming>SequenceFlow_06ei0em</bpmn2:incoming>
     </bpmn2:endEvent>
-    <bpmn2:callActivity id="CallActivity_NetworkAdapterRestV1" name="Call NetworkAdapterRestV1" calledElement="NetworkAdapterRestV1">
+    <bpmn2:callActivity id="CallActivity_NetworkAdapterRestV1" name="Network Adapter" calledElement="NetworkAdapter">
       <bpmn2:extensionElements>
         <camunda:in source="networkAdapterRequest" target="networkAdapterRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="updateNetworkResponse" target="updateNetworkResponse" />
+        <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_07hq1eg</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_183ph5i</bpmn2:outgoing>
@@ -61,7 +62,7 @@
       <bpmn2:incoming>SequenceFlow_183ph5i</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_001ursg</bpmn2:outgoing>
     </bpmn2:serviceTask>
-    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="&#10;AIC&#10;Update&#10;(network)&#10;" camunda:expression="${NetworkAdapterUpdateTasks.updateNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="Prepare Request" camunda:expression="${NetworkAdapterUpdateTasks.updateNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn2:incoming>SequenceFlow_0qrtpcy</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_07hq1eg</bpmn2:outgoing>
     </bpmn2:serviceTask>
@@ -98,8 +99,8 @@
         <dc:Bounds x="278" y="55" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_074w2et_di" bpmnElement="SequenceFlow_074w2et">
-        <di:waypoint xsi:type="dc:Point" x="180" y="95" />
-        <di:waypoint xsi:type="dc:Point" x="278" y="95" />
+        <di:waypoint x="180" y="95" />
+        <di:waypoint x="278" y="95" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="229" y="74" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -117,8 +118,8 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1trqq6d_di" bpmnElement="SequenceFlow_1trqq6d">
-        <di:waypoint xsi:type="dc:Point" x="180" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="280" y="233" />
+        <di:waypoint x="180" y="233" />
+        <di:waypoint x="280" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="185" y="212" width="90" height="12" />
         </bpmndi:BPMNLabel>
@@ -130,15 +131,15 @@
         <dc:Bounds x="455" y="193" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1io4cl7_di" bpmnElement="SequenceFlow_1io4cl7">
-        <di:waypoint xsi:type="dc:Point" x="380" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="455" y="233" />
+        <di:waypoint x="380" y="233" />
+        <di:waypoint x="455" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="417.5" y="212" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_16fm47t_di" bpmnElement="SequenceFlow_16fm47t">
-        <di:waypoint xsi:type="dc:Point" x="555" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="625" y="233" />
+        <di:waypoint x="555" y="233" />
+        <di:waypoint x="625" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="590" y="212" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -153,8 +154,8 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_00xbxe7_di" bpmnElement="SequenceFlow_00xbxe7">
-        <di:waypoint xsi:type="dc:Point" x="725" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="785" y="233" />
+        <di:waypoint x="725" y="233" />
+        <di:waypoint x="785" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="755" y="212" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -184,38 +185,38 @@
         <dc:Bounds x="278" y="362" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qrtpcy_di" bpmnElement="SequenceFlow_0qrtpcy">
-        <di:waypoint xsi:type="dc:Point" x="180" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="229" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="229" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="278" y="402" />
+        <di:waypoint x="180" y="402" />
+        <di:waypoint x="229" y="402" />
+        <di:waypoint x="229" y="402" />
+        <di:waypoint x="278" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="199" y="396" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_001ursg_di" bpmnElement="SequenceFlow_001ursg">
-        <di:waypoint xsi:type="dc:Point" x="725" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="806" y="402" />
+        <di:waypoint x="725" y="402" />
+        <di:waypoint x="806" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="720.5" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_06ei0em_di" bpmnElement="SequenceFlow_06ei0em">
-        <di:waypoint xsi:type="dc:Point" x="906" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="983" y="402" />
+        <di:waypoint x="906" y="402" />
+        <di:waypoint x="983" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="899.5" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_07hq1eg_di" bpmnElement="SequenceFlow_07hq1eg">
-        <di:waypoint xsi:type="dc:Point" x="378" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="445" y="402" />
+        <di:waypoint x="378" y="402" />
+        <di:waypoint x="445" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="411.5" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_183ph5i_di" bpmnElement="SequenceFlow_183ph5i">
-        <di:waypoint xsi:type="dc:Point" x="545" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="625" y="402" />
+        <di:waypoint x="545" y="402" />
+        <di:waypoint x="625" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="585" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -224,15 +225,15 @@
         <dc:Bounds x="455" y="55" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0rvstwt_di" bpmnElement="SequenceFlow_0rvstwt">
-        <di:waypoint xsi:type="dc:Point" x="378" y="95" />
-        <di:waypoint xsi:type="dc:Point" x="455" y="95" />
+        <di:waypoint x="378" y="95" />
+        <di:waypoint x="455" y="95" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="416.5" y="74" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1eacnem_di" bpmnElement="SequenceFlow_1eacnem">
-        <di:waypoint xsi:type="dc:Point" x="555" y="95" />
-        <di:waypoint xsi:type="dc:Point" x="665" y="95" />
+        <di:waypoint x="555" y="95" />
+        <di:waypoint x="665" y="95" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="610" y="74" width="0" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn
index e139e94660..3448e8d577 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
   <bpmn:process id="VnfAdapter" name="Vnf Adapter" isExecutable="true">
     <bpmn:startEvent id="VnfAdapter_Start">
       <bpmn:outgoing>SequenceFlow_1xr6chl</bpmn:outgoing>
@@ -27,10 +27,10 @@
       <bpmn:outgoing>SequenceFlow_1ivhukd</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_1ivhukd" sourceRef="PostProcessResponse" targetRef="VnfAdapter_End" />
-    <bpmn:callActivity id="Call_vnfAdapterTask" name="&#10;Cloud&#10;Create&#10;(vnf)&#10;" calledElement="vnfAdapterTask">
+    <bpmn:callActivity id="Call_openstackAdapterTask" name="Openstack&#10;Adapter" calledElement="openstackAdapterTask">
       <bpmn:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:in source="VNFREST_Request" target="vnfAdapterTaskRequest" />
+        <camunda:in source="VNFREST_Request" target="openstackAdapterTaskRequest" />
         <camunda:out source="WorkflowResponse" target="WorkflowResponse" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -38,8 +38,8 @@
       <bpmn:incoming>SequenceFlow_0qaaf5k</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0j1zvis</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:sequenceFlow id="SequenceFlow_0qaaf5k" sourceRef="PreProcessRequest" targetRef="Call_vnfAdapterTask" />
-    <bpmn:sequenceFlow id="SequenceFlow_0j1zvis" sourceRef="Call_vnfAdapterTask" targetRef="PostProcessResponse" />
+    <bpmn:sequenceFlow id="SequenceFlow_0qaaf5k" sourceRef="PreProcessRequest" targetRef="Call_openstackAdapterTask" />
+    <bpmn:sequenceFlow id="SequenceFlow_0j1zvis" sourceRef="Call_openstackAdapterTask" targetRef="PostProcessResponse" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="VnfAdapter">
@@ -53,8 +53,8 @@
         <dc:Bounds x="396" y="275" width="233" height="135" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1xr6chl_di" bpmnElement="SequenceFlow_1xr6chl">
-        <di:waypoint xsi:type="dc:Point" x="192" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="272" y="121" />
+        <di:waypoint x="192" y="121" />
+        <di:waypoint x="272" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="244" y="360" width="90" height="0" />
         </bpmndi:BPMNLabel>
@@ -72,10 +72,10 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1abat8l_di" bpmnElement="SequenceFlow_1abat8l">
-        <di:waypoint xsi:type="dc:Point" x="470" y="337" />
-        <di:waypoint xsi:type="dc:Point" x="509" y="337" />
-        <di:waypoint xsi:type="dc:Point" x="509" y="337" />
-        <di:waypoint xsi:type="dc:Point" x="549" y="337" />
+        <di:waypoint x="470" y="337" />
+        <di:waypoint x="509" y="337" />
+        <di:waypoint x="509" y="337" />
+        <di:waypoint x="549" y="337" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="536" y="591" width="90" height="0" />
         </bpmndi:BPMNLabel>
@@ -93,25 +93,25 @@
         <dc:Bounds x="657" y="81" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ivhukd_di" bpmnElement="SequenceFlow_1ivhukd">
-        <di:waypoint xsi:type="dc:Point" x="757" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="837" y="121" />
+        <di:waypoint x="757" y="121" />
+        <di:waypoint x="837" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="809" y="354" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_0n6wnin_di" bpmnElement="Call_vnfAdapterTask">
+      <bpmndi:BPMNShape id="CallActivity_0n6wnin_di" bpmnElement="Call_openstackAdapterTask">
         <dc:Bounds x="463" y="81" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qaaf5k_di" bpmnElement="SequenceFlow_0qaaf5k">
-        <di:waypoint xsi:type="dc:Point" x="372" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="463" y="121" />
+        <di:waypoint x="372" y="121" />
+        <di:waypoint x="463" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="429.5" y="354" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0j1zvis_di" bpmnElement="SequenceFlow_0j1zvis">
-        <di:waypoint xsi:type="dc:Point" x="563" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="657" y="121" />
+        <di:waypoint x="563" y="121" />
+        <di:waypoint x="657" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="622" y="354" width="90" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java
index 4dbf4d46ff..51384c6a87 100644
--- a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java
+++ b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java
@@ -32,12 +32,12 @@ import org.onap.so.bpmn.common.BuildingBlockExecution;
 public class VnfAdapterTest extends BaseBPMNTest {
     @Test
     public void vnfAdapterCreatedTest() {
-        mockSubprocess("vnfAdapterTask", "Mocked vnfAdapterTask", "GenericStub");
+        mockSubprocess("openstackAdapterTask", "Mocked openstackAdapterTask", "GenericStub");
 
         ProcessInstance pi = runtimeService.startProcessInstanceByKey("VnfAdapter", variables);
         assertThat(pi).isNotNull();
-        assertThat(pi).isStarted().hasPassedInOrder("VnfAdapter_Start", "PreProcessRequest", "Call_vnfAdapterTask",
-                "PostProcessResponse", "VnfAdapter_End");
+        assertThat(pi).isStarted().hasPassedInOrder("VnfAdapter_Start", "PreProcessRequest",
+                "Call_openstackAdapterTask", "PostProcessResponse", "VnfAdapter_End");
         assertThat(pi).isEnded();
     }
 
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
index 5c8ece88fe..4d1807b796 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstance.groovy
@@ -78,1355 +78,1323 @@ import groovy.xml.XmlUtil
 public class DoCreateNetworkInstance extends AbstractServiceTaskProcessor {
     private static final Logger logger = LoggerFactory.getLogger( DoCreateNetworkInstance.class);
 
-	String Prefix="CRENWKI_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	def className = getClass().getSimpleName()
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstance.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(DelegateExecution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable(Prefix + "networkRequest", "")
-		execution.setVariable(Prefix + "rollbackEnabled", null)
-		execution.setVariable(Prefix + "networkInputs", "")
-		//execution.setVariable(Prefix + "requestId", "")
-		execution.setVariable(Prefix + "messageId", "")
-		execution.setVariable(Prefix + "source", "")
-		execution.setVariable("BasicAuthHeaderValuePO", "")
-		execution.setVariable("BasicAuthHeaderValueSDNC", "")
-		execution.setVariable(Prefix + "serviceInstanceId","")
-		execution.setVariable("GENGS_type", "")
-		execution.setVariable(Prefix + "rsrc_endpoint", null)
-		execution.setVariable(Prefix + "networkOutputs", "")
-		execution.setVariable(Prefix + "networkId","")
-		execution.setVariable(Prefix + "networkName","")
-
-		// AAI query Name
-		execution.setVariable(Prefix + "queryNameAAIRequest","")
-		execution.setVariable(Prefix + "queryNameAAIResponse", "")
-		execution.setVariable(Prefix + "aaiNameReturnCode", "")
-		execution.setVariable(Prefix + "isAAIqueryNameGood", false)
-
-		// AAI query Cloud Region
-		execution.setVariable(Prefix + "queryCloudRegionRequest","")
-		execution.setVariable(Prefix + "queryCloudRegionReturnCode","")
-		execution.setVariable(Prefix + "queryCloudRegionResponse","")
-		execution.setVariable(Prefix + "cloudRegionPo","")
-		execution.setVariable(Prefix + "cloudRegionSdnc","")
-		execution.setVariable(Prefix + "isCloudRegionGood", false)
-
-		// AAI query Id
-		execution.setVariable(Prefix + "queryIdAAIRequest","")
-		execution.setVariable(Prefix + "queryIdAAIResponse", "")
-		execution.setVariable(Prefix + "aaiIdReturnCode", "")
-
-		// AAI query vpn binding
-		execution.setVariable(Prefix + "queryVpnBindingAAIRequest","")
-		execution.setVariable(Prefix + "queryVpnBindingAAIResponse", "")
-		execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "")
-		execution.setVariable(Prefix + "vpnBindings", null)
-		execution.setVariable(Prefix + "vpnCount", 0)
-		execution.setVariable(Prefix + "routeCollection", "")
-
-		// AAI query network policy
-		execution.setVariable(Prefix + "queryNetworkPolicyAAIRequest","")
-		execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", "")
-		execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "")
-		execution.setVariable(Prefix + "networkPolicyUriList", null)
-		execution.setVariable(Prefix + "networkPolicyCount", 0)
-		execution.setVariable(Prefix + "networkCollection", "")
-
-		// AAI query route table reference
-		execution.setVariable(Prefix + "queryNetworkTableRefAAIRequest","")
-		execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", "")
-		execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "")
-		execution.setVariable(Prefix + "networkTableRefUriList", null)
-		execution.setVariable(Prefix + "networkTableRefCount", 0)
-		execution.setVariable(Prefix + "tableRefCollection", "")
-
-		// AAI requery Id
-		execution.setVariable(Prefix + "requeryIdAAIRequest","")
-		execution.setVariable(Prefix + "requeryIdAAIResponse", "")
-		execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "")
-
-		// AAI update contrail
-		execution.setVariable(Prefix + "updateContrailAAIUrlRequest","")
-		execution.setVariable(Prefix + "updateContrailAAIPayloadRequest","")
-		execution.setVariable(Prefix + "updateContrailAAIResponse", "")
-		execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", "")
-
-		execution.setVariable(Prefix + "createNetworkRequest", "")
-		execution.setVariable(Prefix + "createNetworkResponse", "")
-		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
-		//execution.setVariable(Prefix + "rollbackNetworkResponse", "")
-		execution.setVariable(Prefix + "networkReturnCode", "")
-		//execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
-		execution.setVariable(Prefix + "isNetworkRollbackNeeded", false)
-
-		execution.setVariable(Prefix + "assignSDNCRequest", "")
-		execution.setVariable(Prefix + "assignSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
-		//execution.setVariable(Prefix + "rollbackSDNCResponse", "")
-		execution.setVariable(Prefix + "sdncReturnCode", "")
-		//execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
-		execution.setVariable(Prefix + "isSdncRollbackNeeded", false)
-		execution.setVariable(Prefix + "sdncResponseSuccess", false)
-
-		execution.setVariable(Prefix + "activateSDNCRequest", "")
-		execution.setVariable(Prefix + "activateSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackActivateSDNCRequest", "")
-		//execution.setVariable(Prefix + "rollbackActivateSDNCResponse", "")
-		execution.setVariable(Prefix + "sdncActivateReturnCode", "")
-		//execution.setVariable(Prefix + "rollbackActivateSDNCReturnCode", "")
-		execution.setVariable(Prefix + "isSdncActivateRollbackNeeded", false)
-		execution.setVariable(Prefix + "sdncActivateResponseSuccess", false)
-
-		execution.setVariable(Prefix + "orchestrationStatus", "")
-		execution.setVariable(Prefix + "isVnfBindingPresent", false)
-		execution.setVariable(Prefix + "Success", false)
-
-		execution.setVariable(Prefix + "isException", false)
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstance.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-		logger.trace("Inside preProcessRequest() of " + className + ".groovy")
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			// GET Incoming request & validate 3 kinds of format.
-			execution.setVariable("action", "CREATE")
-			String networkRequest = execution.getVariable("bpmnRequest")
-			if (networkRequest != null) {
-				if (networkRequest.contains("requestDetails")) {
-					// JSON format request is sent, create xml
-					try {
-						def prettyJson = JsonOutput.prettyPrint(networkRequest.toString())
-						logger.debug(" Incoming message formatted . . . : " + '\n' + prettyJson)
-						networkRequest =  vidUtils.createXmlNetworkRequestInfra(execution, networkRequest)
-
-					} catch (Exception ex) {
-						String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
-						logger.debug(dataErrorMessage)
-						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-					}
-				} else {
-  				   // XML format request is sent
-
-				}
-			} else {
-				// vIPR format request is sent, create xml from individual variables
-				networkRequest = vidUtils.createXmlNetworkRequestInstance(execution)
-			}
-
-			networkRequest = utils.formatXml(networkRequest)
-			execution.setVariable(Prefix + "networkRequest", networkRequest)
-			logger.debug(Prefix + "networkRequest - " + '\n' + networkRequest)
-
-			// validate 'backout-on-failure' to override 'mso.rollback'
-			boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, networkRequest)
-			execution.setVariable(Prefix + "rollbackEnabled", rollbackEnabled)
-			logger.debug(Prefix + "rollbackEnabled - " + rollbackEnabled)
-
-			String networkInputs = utils.getNodeXml(networkRequest, "network-inputs", false).replace("tag0:","").replace(":tag0","")
-			execution.setVariable(Prefix + "networkInputs", networkInputs)
-			logger.debug(Prefix + "networkInputs - " + '\n' + networkInputs)
-
-			// prepare messageId
-			String messageId = execution.getVariable("testMessageId")  // for testing
-			if (messageId == null || messageId == "") {
-				messageId = UUID.randomUUID()
-				logger.debug(Prefix + "messageId, random generated: " + messageId)
-			} else {
-				logger.debug(Prefix + "messageId, pre-assigned: " + messageId)
-			}
-			execution.setVariable(Prefix + "messageId", messageId)
-
-			String source = utils.getNodeText(networkRequest, "source")
-			execution.setVariable(Prefix + "source", source)
-			logger.debug(Prefix + "source - " + source)
-
-			// validate cloud region
-			String lcpCloudRegionId = utils.getNodeText(networkRequest, "aic-cloud-region")
-			if ((lcpCloudRegionId == null) || (lcpCloudRegionId == "") || (lcpCloudRegionId == "null")) {
-				String dataErrorMessage = "Missing value/element: 'lcpCloudRegionId' or 'cloudConfiguration' or 'aic-cloud-region'."
-				logger.debug(" Invalid Request - " + dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			// validate service instance id
-			String serviceInstanceId = utils.getNodeText(networkRequest, "service-instance-id")
-			if ((serviceInstanceId == null) || (serviceInstanceId == "") || (serviceInstanceId == "null")) {
-				String dataErrorMessage = "Missing value/element: 'serviceInstanceId'."
-				logger.debug(" Invalid Request - " + dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
-
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey",execution))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-
-			} catch (IOException ex) {
-				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
-				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				logger.debug(dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			// Set variables for Generic Get Sub Flow use
-			execution.setVariable(Prefix + "serviceInstanceId", serviceInstanceId)
-			logger.debug(Prefix + "serviceInstanceId - " + serviceInstanceId)
-
-			execution.setVariable("GENGS_type", "service-instance")
-			logger.debug("GENGS_type - " + "service-instance")
-			logger.debug(" Url for SDNC adapter: " + UrnPropertiesReader.getVariable("mso.adapters.sdnc.endpoint",execution))
-
-			String sdncVersion = execution.getVariable("sdncVersion")
-			logger.debug("sdncVersion? : " + sdncVersion)
-
-			// build 'networkOutputs'
-			String networkId = utils.getNodeText(networkRequest, "network-id")
-			if ((networkId == null) || (networkId == "null")) {
-				networkId = ""
-			}
-			String networkName = utils.getNodeText(networkRequest, "network-name")
-			if ((networkName == null) || (networkName == "null")) {
-				networkName = ""
-			}
-			String networkOutputs =
-			   """<network-outputs>
+    String Prefix="CRENWKI_"
+    ExceptionUtil exceptionUtil = new ExceptionUtil()
+    JsonUtils jsonUtil = new JsonUtils()
+    VidUtils vidUtils = new VidUtils(this)
+    NetworkUtils networkUtils = new NetworkUtils()
+    SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+
+    def className = getClass().getSimpleName()
+
+    /**
+     * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstance.bpmn</class> process.
+     * @param execution
+     */
+    public InitializeProcessVariables(DelegateExecution execution){
+        /* Initialize all the process variables in this block */
+
+        execution.setVariable(Prefix + "networkRequest", "")
+        execution.setVariable(Prefix + "rollbackEnabled", null)
+        execution.setVariable(Prefix + "networkInputs", "")
+        //execution.setVariable(Prefix + "requestId", "")
+        execution.setVariable(Prefix + "messageId", "")
+        execution.setVariable(Prefix + "source", "")
+        execution.setVariable("BasicAuthHeaderValuePO", "")
+        execution.setVariable("BasicAuthHeaderValueSDNC", "")
+        execution.setVariable(Prefix + "serviceInstanceId","")
+        execution.setVariable("GENGS_type", "")
+        execution.setVariable(Prefix + "rsrc_endpoint", null)
+        execution.setVariable(Prefix + "networkOutputs", "")
+        execution.setVariable(Prefix + "networkId","")
+        execution.setVariable(Prefix + "networkName","")
+
+        // AAI query Name
+        execution.setVariable(Prefix + "queryNameAAIRequest","")
+        execution.setVariable(Prefix + "queryNameAAIResponse", "")
+        execution.setVariable(Prefix + "aaiNameReturnCode", "")
+        execution.setVariable(Prefix + "isAAIqueryNameGood", false)
+
+        // AAI query Cloud Region
+        execution.setVariable(Prefix + "queryCloudRegionRequest","")
+        execution.setVariable(Prefix + "queryCloudRegionReturnCode","")
+        execution.setVariable(Prefix + "queryCloudRegionResponse","")
+        execution.setVariable(Prefix + "cloudRegionPo","")
+        execution.setVariable(Prefix + "cloudRegionSdnc","")
+        execution.setVariable(Prefix + "isCloudRegionGood", false)
+
+        // AAI query Id
+        execution.setVariable(Prefix + "queryIdAAIRequest","")
+        execution.setVariable(Prefix + "queryIdAAIResponse", "")
+        execution.setVariable(Prefix + "aaiIdReturnCode", "")
+
+        // AAI query vpn binding
+        execution.setVariable(Prefix + "queryVpnBindingAAIRequest","")
+        execution.setVariable(Prefix + "queryVpnBindingAAIResponse", "")
+        execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "")
+        execution.setVariable(Prefix + "vpnBindings", null)
+        execution.setVariable(Prefix + "vpnCount", 0)
+        execution.setVariable(Prefix + "routeCollection", "")
+
+        // AAI query network policy
+        execution.setVariable(Prefix + "queryNetworkPolicyAAIRequest","")
+        execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", "")
+        execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "")
+        execution.setVariable(Prefix + "networkPolicyUriList", null)
+        execution.setVariable(Prefix + "networkPolicyCount", 0)
+        execution.setVariable(Prefix + "networkCollection", "")
+
+        // AAI query route table reference
+        execution.setVariable(Prefix + "queryNetworkTableRefAAIRequest","")
+        execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", "")
+        execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "")
+        execution.setVariable(Prefix + "networkTableRefUriList", null)
+        execution.setVariable(Prefix + "networkTableRefCount", 0)
+        execution.setVariable(Prefix + "tableRefCollection", "")
+
+        // AAI requery Id
+        execution.setVariable(Prefix + "requeryIdAAIRequest","")
+        execution.setVariable(Prefix + "requeryIdAAIResponse", "")
+        execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "")
+
+        // AAI update contrail
+        execution.setVariable(Prefix + "updateContrailAAIUrlRequest","")
+        execution.setVariable(Prefix + "updateContrailAAIPayloadRequest","")
+        execution.setVariable(Prefix + "updateContrailAAIResponse", "")
+        execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", "")
+
+        execution.setVariable(Prefix + "createNetworkRequest", "")
+        execution.setVariable(Prefix + "createNetworkResponse", "")
+        execution.setVariable(Prefix + "rollbackNetworkRequest", "")
+        //execution.setVariable(Prefix + "rollbackNetworkResponse", "")
+        execution.setVariable(Prefix + "networkReturnCode", "")
+        //execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
+        execution.setVariable(Prefix + "isNetworkRollbackNeeded", false)
+
+        execution.setVariable(Prefix + "assignSDNCRequest", "")
+        execution.setVariable(Prefix + "assignSDNCResponse", "")
+        execution.setVariable(Prefix + "rollbackSDNCRequest", "")
+        //execution.setVariable(Prefix + "rollbackSDNCResponse", "")
+        execution.setVariable(Prefix + "sdncReturnCode", "")
+        //execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
+        execution.setVariable(Prefix + "isSdncRollbackNeeded", false)
+        execution.setVariable(Prefix + "sdncResponseSuccess", false)
+
+        execution.setVariable(Prefix + "activateSDNCRequest", "")
+        execution.setVariable(Prefix + "activateSDNCResponse", "")
+        execution.setVariable(Prefix + "rollbackActivateSDNCRequest", "")
+        //execution.setVariable(Prefix + "rollbackActivateSDNCResponse", "")
+        execution.setVariable(Prefix + "sdncActivateReturnCode", "")
+        //execution.setVariable(Prefix + "rollbackActivateSDNCReturnCode", "")
+        execution.setVariable(Prefix + "isSdncActivateRollbackNeeded", false)
+        execution.setVariable(Prefix + "sdncActivateResponseSuccess", false)
+
+        execution.setVariable(Prefix + "orchestrationStatus", "")
+        execution.setVariable(Prefix + "isVnfBindingPresent", false)
+        execution.setVariable(Prefix + "Success", false)
+
+        execution.setVariable(Prefix + "isException", false)
+
+    }
+
+    // **************************************************
+    //     Pre or Prepare Request Section
+    // **************************************************
+    /**
+     * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstance.bpmn</class> process.
+     * @param execution
+     */
+    public void preProcessRequest (DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+        logger.trace("Inside preProcessRequest() of " + className + ".groovy")
+
+        try {
+            // initialize flow variables
+            InitializeProcessVariables(execution)
+
+            // GET Incoming request & validate 3 kinds of format.
+            execution.setVariable("action", "CREATE")
+            String networkRequest = execution.getVariable("bpmnRequest")
+            if (networkRequest != null) {
+                if (networkRequest.contains("requestDetails")) {
+                    // JSON format request is sent, create xml
+                    try {
+                        def prettyJson = JsonOutput.prettyPrint(networkRequest.toString())
+                        logger.debug(" Incoming message formatted . . . : " + '\n' + prettyJson)
+                        networkRequest =  vidUtils.createXmlNetworkRequestInfra(execution, networkRequest)
+
+                    } catch (Exception ex) {
+                        String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
+                        logger.debug(dataErrorMessage)
+                        exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                    }
+                } else {
+                    // XML format request is sent
+
+                }
+            } else {
+                // vIPR format request is sent, create xml from individual variables
+                networkRequest = vidUtils.createXmlNetworkRequestInstance(execution)
+            }
+
+            networkRequest = utils.formatXml(networkRequest)
+            execution.setVariable(Prefix + "networkRequest", networkRequest)
+            logger.debug(Prefix + "networkRequest - " + '\n' + networkRequest)
+
+            // validate 'backout-on-failure' to override 'mso.rollback'
+            boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, networkRequest)
+            execution.setVariable(Prefix + "rollbackEnabled", rollbackEnabled)
+            logger.debug(Prefix + "rollbackEnabled - " + rollbackEnabled)
+
+            String networkInputs = utils.getNodeXml(networkRequest, "network-inputs", false).replace("tag0:","").replace(":tag0","")
+            execution.setVariable(Prefix + "networkInputs", networkInputs)
+            logger.debug(Prefix + "networkInputs - " + '\n' + networkInputs)
+
+            // prepare messageId
+            String messageId = execution.getVariable("testMessageId")  // for testing
+            if (messageId == null || messageId == "") {
+                messageId = UUID.randomUUID()
+                logger.debug(Prefix + "messageId, random generated: " + messageId)
+            } else {
+                logger.debug(Prefix + "messageId, pre-assigned: " + messageId)
+            }
+            execution.setVariable(Prefix + "messageId", messageId)
+
+            String source = utils.getNodeText(networkRequest, "source")
+            execution.setVariable(Prefix + "source", source)
+            logger.debug(Prefix + "source - " + source)
+
+            // validate cloud region
+            String lcpCloudRegionId = utils.getNodeText(networkRequest, "aic-cloud-region")
+            if ((lcpCloudRegionId == null) || (lcpCloudRegionId == "") || (lcpCloudRegionId == "null")) {
+                String dataErrorMessage = "Missing value/element: 'lcpCloudRegionId' or 'cloudConfiguration' or 'aic-cloud-region'."
+                logger.debug(" Invalid Request - " + dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            }
+
+            // validate service instance id
+            String serviceInstanceId = utils.getNodeText(networkRequest, "service-instance-id")
+            if ((serviceInstanceId == null) || (serviceInstanceId == "") || (serviceInstanceId == "null")) {
+                String dataErrorMessage = "Missing value/element: 'serviceInstanceId'."
+                logger.debug(" Invalid Request - " + dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            }
+
+            // PO Authorization Info / headers Authorization=
+            String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
+
+            try {
+                def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey",execution))
+                execution.setVariable("BasicAuthHeaderValuePO",encodedString)
+                execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
+
+            } catch (IOException ex) {
+                String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
+                String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
+                logger.debug(dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            }
+
+            // Set variables for Generic Get Sub Flow use
+            execution.setVariable(Prefix + "serviceInstanceId", serviceInstanceId)
+            logger.debug(Prefix + "serviceInstanceId - " + serviceInstanceId)
+
+            execution.setVariable("GENGS_type", "service-instance")
+            logger.debug("GENGS_type - " + "service-instance")
+            logger.debug(" Url for SDNC adapter: " + UrnPropertiesReader.getVariable("mso.adapters.sdnc.endpoint",execution))
+
+            String sdncVersion = execution.getVariable("sdncVersion")
+            logger.debug("sdncVersion? : " + sdncVersion)
+
+            // build 'networkOutputs'
+            String networkId = utils.getNodeText(networkRequest, "network-id")
+            if ((networkId == null) || (networkId == "null")) {
+                networkId = ""
+            }
+            String networkName = utils.getNodeText(networkRequest, "network-name")
+            if ((networkName == null) || (networkName == "null")) {
+                networkName = ""
+            }
+            String networkOutputs =
+                    """<network-outputs>
 	                   <network-id>${MsoUtils.xmlEscape(networkId)}</network-id>
 	                   <network-name>${MsoUtils.xmlEscape(networkName)}</network-name>
 	                 </network-outputs>"""
-			execution.setVariable(Prefix + "networkOutputs", networkOutputs)
-			logger.debug(Prefix + "networkOutputs - " + '\n' + networkOutputs)
-			execution.setVariable(Prefix + "networkId", networkId)
-			execution.setVariable(Prefix + "networkName", networkName)
+            execution.setVariable(Prefix + "networkOutputs", networkOutputs)
+            logger.debug(Prefix + "networkOutputs - " + '\n' + networkOutputs)
+            execution.setVariable(Prefix + "networkId", networkId)
+            execution.setVariable(Prefix + "networkName", networkName)
 
-		} catch (BpmnError e) {
-		throw e;
+        } catch (BpmnError e) {
+            throw e;
 
-		} catch (Exception ex) {
-			sendSyncError(execution)
-			// caught exception
-			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            sendSyncError(execution)
+            // caught exception
+            String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Gets the service instance uri from aai
-	 */
-	public void getServiceInstance(DelegateExecution execution) {
-		try {
-			String serviceInstanceId = execution.getVariable('CRENWKI_serviceInstanceId')
+    /**
+     * Gets the service instance uri from aai
+     */
+    public void getServiceInstance(DelegateExecution execution) {
+        try {
+            String serviceInstanceId = execution.getVariable('CRENWKI_serviceInstanceId')
 
-			AAIResourcesClient resourceClient = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId)
+            AAIResourcesClient resourceClient = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId)
 
-			if(!resourceClient.exists(uri)){
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Service instance was not found in aai")
-			}else{
-				Map<String, String> keys = uri.getURIKeys()
-				execution.setVariable("serviceType", keys.get("service-type"))
-				execution.setVariable("subscriberName", keys.get("global-customer-id"))
-			}
+            if(!resourceClient.exists(uri)){
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Service instance was not found in aai")
+            }else{
+                Map<String, String> keys = uri.getURIKeys()
+                execution.setVariable("serviceType", keys.get("service-type"))
+                execution.setVariable("subscriberName", keys.get("global-customer-id"))
+            }
 
-		}catch(BpmnError e) {
-			throw e;
-		}catch (Exception ex){
-			String msg = "Exception in getServiceInstance. " + ex.getMessage()
-			logger.debug(msg)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-	}
+        }catch(BpmnError e) {
+            throw e;
+        }catch (Exception ex){
+            String msg = "Exception in getServiceInstance. " + ex.getMessage()
+            logger.debug(msg)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+        }
+    }
 
 
-	public void callRESTQueryAAINetworkName (DelegateExecution execution) {
+    public void callRESTQueryAAINetworkName (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkName() of DoCreateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAINetworkName() of DoCreateNetworkInstance ***** " )
 
-		try{
-			// get variables
-			String networkInputs  = execution.getVariable(Prefix + "networkInputs")
-			String networkName   = utils.getNodeText(networkInputs, "network-name")
+        try{
+            // get variables
+            String networkInputs  = execution.getVariable(Prefix + "networkInputs")
+            String networkName   = utils.getNodeText(networkInputs, "network-name")
 
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIPluralResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectPlurals.L3_NETWORK).queryParam("network-name", networkName)
-			L3Networks networks = client.get(uri, NotFoundException.class).asBean(L3Networks.class).get()
-			L3Network network = networks.getL3Network().get(0)
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIPluralResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectPlurals.L3_NETWORK).queryParam("network-name", networkName)
+            L3Networks networks = client.get(uri, NotFoundException.class).asBean(L3Networks.class).get()
+            L3Network network = networks.getL3Network().get(0)
 
-			execution.setVariable(Prefix + "isAAIqueryNameGood", true)
-			String orchestrationStatus = network.getOrchestrationStatus()
-			execution.setVariable(Prefix + "orchestrationStatus", orchestrationStatus.toUpperCase())
-			logger.debug(Prefix + "orchestrationStatus - " + orchestrationStatus.toUpperCase())
-			execution.setVariable("orchestrationStatus", orchestrationStatus)
+            execution.setVariable(Prefix + "isAAIqueryNameGood", true)
+            String orchestrationStatus = network.getOrchestrationStatus()
+            execution.setVariable(Prefix + "orchestrationStatus", orchestrationStatus.toUpperCase())
+            logger.debug(Prefix + "orchestrationStatus - " + orchestrationStatus.toUpperCase())
+            execution.setVariable("orchestrationStatus", orchestrationStatus)
 
-			logger.debug(Prefix + "isAAIqueryNameGood? : " + execution.getVariable(Prefix + "isAAIqueryNameGood"))
+            logger.debug(Prefix + "isAAIqueryNameGood? : " + execution.getVariable(Prefix + "isAAIqueryNameGood"))
 
-		} catch (NotFoundException e) {
-			logger.debug(" QueryAAINetworkName return code = '404' (Not Found).  Proceed with the Create !!! ")
+        } catch (NotFoundException e) {
+            logger.debug(" QueryAAINetworkName return code = '404' (Not Found).  Proceed with the Create !!! ")
 
-		} catch (Exception ex) {
-			// try error
-			String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow - callRESTQueryAAINetworkName() -  " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            // try error
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow - callRESTQueryAAINetworkName() -  " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void callRESTQueryAAICloudRegion (DelegateExecution execution) {
+    public void callRESTQueryAAICloudRegion (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAICloudRegion() of DoCreateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAICloudRegion() of DoCreateNetworkInstance ***** " )
 
-		try {
-			String networkInputs  = execution.getVariable(Prefix + "networkInputs")
-			String cloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
+        try {
+            String networkInputs  = execution.getVariable(Prefix + "networkInputs")
+            String cloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
 
-			// Prepare AA&I url
-			AaiUtil aaiUtil = new AaiUtil(this)
+            // Prepare AA&I url
+            AaiUtil aaiUtil = new AaiUtil(this)
 
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, Defaults.CLOUD_OWNER.toString(), cloudRegion)
-			def queryCloudRegionRequest = aaiUtil.createAaiUri(uri)
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, Defaults.CLOUD_OWNER.toString(), cloudRegion)
+            def queryCloudRegionRequest = aaiUtil.createAaiUri(uri)
 
-			execution.setVariable(Prefix + "queryCloudRegionRequest", queryCloudRegionRequest)
+            execution.setVariable(Prefix + "queryCloudRegionRequest", queryCloudRegionRequest)
 
-			String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
-			String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
+            String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
+            String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
 
-			if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
-				execution.setVariable(Prefix + "cloudRegionPo", cloudRegionPo)
-				execution.setVariable(Prefix + "cloudRegionSdnc", cloudRegionSdnc)
-				execution.setVariable(Prefix + "isCloudRegionGood", true)
+            if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
+                execution.setVariable(Prefix + "cloudRegionPo", cloudRegionPo)
+                execution.setVariable(Prefix + "cloudRegionSdnc", cloudRegionSdnc)
+                execution.setVariable(Prefix + "isCloudRegionGood", true)
 
-			} else {
-			    String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable(Prefix + "queryCloudRegionReturnCode")
-			    logger.debug(dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            } else {
+                String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable(Prefix + "queryCloudRegionReturnCode")
+                logger.debug(dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
 
-			}
+            }
 
-			logger.debug(" is Cloud Region Good: " + execution.getVariable(Prefix + "isCloudRegionGood"))
+            logger.debug(" is Cloud Region Good: " + execution.getVariable(Prefix + "isCloudRegionGood"))
 
-		} catch (BpmnError e) {
-			throw e;
+        } catch (BpmnError e) {
+            throw e;
 
-		} catch (Exception ex) {
-			// try error
-			String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow - callRESTQueryAAICloudRegion() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            // try error
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow - callRESTQueryAAICloudRegion() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void callRESTQueryAAINetworkId(DelegateExecution execution) {
+    public void callRESTQueryAAINetworkId(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkId() of DoCreateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAINetworkId() of DoCreateNetworkInstance ***** " )
 
-		try {
-			// get variables
-			String networkId = ""
-			String assignSDNCResponse = execution.getVariable(Prefix + "assignSDNCResponse")
-			if (execution.getVariable("sdncVersion") != "1610") {
-			   String networkResponseInformation = ""
-			   try {
-			      networkResponseInformation = utils.getNodeXml(assignSDNCResponse, "network-response-information", false).replace("tag0:","").replace(":tag0","")
-				  networkId = utils.getNodeText(networkResponseInformation, "instance-id")
-			   } catch (Exception ex) {
-			      String dataErrorMessage = " SNDC Response network validation for 'instance-id' (network-id) failed: Empty <network-response-information>"
-			      logger.debug(dataErrorMessage)
-				  exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			   }
+        try {
+            // get variables
+            String networkId = ""
+            String assignSDNCResponse = execution.getVariable(Prefix + "assignSDNCResponse")
+            if (execution.getVariable("sdncVersion") != "1610") {
+                String networkResponseInformation = ""
+                try {
+                    networkResponseInformation = utils.getNodeXml(assignSDNCResponse, "network-response-information", false).replace("tag0:","").replace(":tag0","")
+                    networkId = utils.getNodeText(networkResponseInformation, "instance-id")
+                } catch (Exception ex) {
+                    String dataErrorMessage = " SNDC Response network validation for 'instance-id' (network-id) failed: Empty <network-response-information>"
+                    logger.debug(dataErrorMessage)
+                    exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                }
 
-			} else {
-			   networkId = utils.getNodeText(assignSDNCResponse, "network-id")
-			}
-			if (networkId == null || networkId == "null") {
-				String dataErrorMessage = "SNDC Response did not contains 'instance-id' or 'network-id' element, or the value is null."
-				logger.debug(dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			} else {
-			   logger.debug(" SNDC Response network validation for 'instance-id' (network-id)' is good: " + networkId)
-			}
+            } else {
+                networkId = utils.getNodeText(assignSDNCResponse, "network-id")
+            }
+            if (networkId == null || networkId == "null") {
+                String dataErrorMessage = "SNDC Response did not contains 'instance-id' or 'network-id' element, or the value is null."
+                logger.debug(dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            } else {
+                logger.debug(" SNDC Response network validation for 'instance-id' (network-id)' is good: " + networkId)
+            }
 
 
-			execution.setVariable(Prefix + "networkId", networkId)
-			String networkName   = utils.getNodeText(assignSDNCResponse, "network-name")
-			execution.setVariable(Prefix + "networkName", networkName)
+            execution.setVariable(Prefix + "networkId", networkId)
+            String networkName   = utils.getNodeText(assignSDNCResponse, "network-name")
+            execution.setVariable(Prefix + "networkName", networkName)
 
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
-			L3Network network = client.get(uri, NotFoundException.class).asBean(L3Network.class).get()
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
+            L3Network network = client.get(uri, NotFoundException.class).asBean(L3Network.class).get()
 
-			execution.setVariable(Prefix + "queryIdAAIResponse", network)
+            execution.setVariable(Prefix + "queryIdAAIResponse", network)
 
-			String netId   = network.getNetworkId()
-			execution.setVariable(Prefix + "networkId", netId)
-			String netName   = network.getNetworkName()
-			execution.setVariable(Prefix + "networkName", netName)
+            String netId   = network.getNetworkId()
+            execution.setVariable(Prefix + "networkId", netId)
+            String netName   = network.getNetworkName()
+            execution.setVariable(Prefix + "networkName", netName)
 
-		} catch (NotFoundException e) {
-			String dataErrorMessage = "Response Error from QueryAAINetworkId is 404 (Not Found)."
-			logger.debug(" AAI Query Failed. " + dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from QueryAAINetworkId is 404 (Not Found)."
+            logger.debug(" AAI Query Failed. " + dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
 
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkId() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkId() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void callRESTReQueryAAINetworkId(DelegateExecution execution) {
+    public void callRESTReQueryAAINetworkId(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.debug(" ***** Inside callRESTReQueryAAINetworkId() of DoCreateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTReQueryAAINetworkId() of DoCreateNetworkInstance ***** " )
 
-		try {
-			// get variables
-			String networkId   = execution.getVariable(Prefix + "networkId")
-			String netId = networkId
+        try {
+            // get variables
+            String networkId   = execution.getVariable(Prefix + "networkId")
+            String netId = networkId
 
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
-			L3Network network = client.get(uri, NotFoundException.class).asBean(L3Network.class).get()
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
+            L3Network network = client.get(uri, NotFoundException.class).asBean(L3Network.class).get()
 
-			execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "200")
-			execution.setVariable(Prefix + "requeryIdAAIResponse", network)
+            execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "200")
+            execution.setVariable(Prefix + "requeryIdAAIResponse", network)
 
-			String netName = network.getNetworkName()
-			String networkOutputs =
-					"""<network-outputs>
+            String netName = network.getNetworkName()
+            String networkOutputs =
+                    """<network-outputs>
                    <network-id>${MsoUtils.xmlEscape(netId)}</network-id>
                    <network-name>${MsoUtils.xmlEscape(netName)}</network-name>
                  </network-outputs>"""
-			execution.setVariable(Prefix + "networkOutputs", networkOutputs)
-			logger.debug(" networkOutputs - " + '\n' + networkOutputs)
+            execution.setVariable(Prefix + "networkOutputs", networkOutputs)
+            logger.debug(" networkOutputs - " + '\n' + networkOutputs)
 
 
-		} catch (NotFoundException e) {
-			String dataErrorMessage = "Response Error from ReQueryAAINetworkId is 404 (Not Found)."
-			logger.debug(" AAI ReQuery Failed. - " + dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from ReQueryAAINetworkId is 404 (Not Found)."
+            logger.debug(" AAI ReQuery Failed. - " + dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
 
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTReQueryAAINetworkId() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTReQueryAAINetworkId() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void callRESTQueryAAINetworkVpnBinding(DelegateExecution execution) {
+    public void callRESTQueryAAINetworkVpnBinding(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkVpnBinding() of DoCreateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAINetworkVpnBinding() of DoCreateNetworkInstance ***** " )
 
-		try {
+        try {
 
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, execution.getVariable(Prefix + "networkId"))
-			Optional<Relationships> relationships = client.get(uri, NotFoundException.class).getRelationships()
-			if(relationships.isPresent()){
-				List<AAIResourceUri> uris = relationships.get().getRelatedAAIUris(AAIObjectType.VPN_BINDING)
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, execution.getVariable(Prefix + "networkId"))
+            Optional<Relationships> relationships = client.get(uri, NotFoundException.class).getRelationships()
+            if(relationships.isPresent()){
+                List<AAIResourceUri> uris = relationships.get().getRelatedAAIUris(AAIObjectType.VPN_BINDING)
 
-				logger.debug(Prefix + "vpnCount - " + uris.size())
+                logger.debug(Prefix + "vpnCount - " + uris.size())
 
-				if (uris.size() > 0) {
-					String routeTargets = ""
-					for(AAIResourceUri u : uris) {
+                if (uris.size() > 0) {
+                    String routeTargets = ""
+                    for(AAIResourceUri u : uris) {
 
-						AAIResultWrapper wrapper = client.get(u.depth(Depth.TWO), NotFoundException.class)
-						Optional<VpnBinding> binding = wrapper.asBean(VpnBinding.class)
+                        AAIResultWrapper wrapper = client.get(u.depth(Depth.TWO), NotFoundException.class)
+                        Optional<VpnBinding> binding = wrapper.asBean(VpnBinding.class)
 
-						String routeTarget = ""
-						String routeRole = ""
-						if(binding.get().getRouteTargets() != null) {
-							List<RouteTarget> targets = binding.get().getRouteTargets().getRouteTarget()
-							for(RouteTarget target : targets) {
-								routeTarget  = target.getGlobalRouteTarget()
-								routeRole  = target.getRouteTargetRole()
-								routeTargets += "<routeTargets>" + '\n' +
-										" <routeTarget>" + routeTarget + "</routeTarget>" + '\n' +
-										" <routeTargetRole>" + routeRole + "</routeTargetRole>" + '\n' +
-										"</routeTargets>" + '\n'
-							}
-						}
+                        String routeTarget = ""
+                        String routeRole = ""
+                        if(binding.get().getRouteTargets() != null) {
+                            List<RouteTarget> targets = binding.get().getRouteTargets().getRouteTarget()
+                            for(RouteTarget target : targets) {
+                                routeTarget  = target.getGlobalRouteTarget()
+                                routeRole  = target.getRouteTargetRole()
+                                routeTargets += "<routeTargets>" + '\n' +
+                                        " <routeTarget>" + routeTarget + "</routeTarget>" + '\n' +
+                                        " <routeTargetRole>" + routeRole + "</routeTargetRole>" + '\n' +
+                                        "</routeTargets>" + '\n'
+                            }
+                        }
 
-					} // end loop
+                    } // end loop
 
-					execution.setVariable(Prefix + "routeCollection", routeTargets)
-					logger.debug(Prefix + "routeCollection - " + '\n' + routeTargets)
+                    execution.setVariable(Prefix + "routeCollection", routeTargets)
+                    logger.debug(Prefix + "routeCollection - " + '\n' + routeTargets)
 
-				} else {
-					// reset return code to success
-					execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")
-					AaiUtil aaiUriUtil = new AaiUtil(this)
-					String schemaVersion = aaiUriUtil.getNamespace()
-					String aaiStubResponse =
-							"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
+                } else {
+                    // reset return code to success
+                    execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")
+                    AaiUtil aaiUriUtil = new AaiUtil(this)
+                    String schemaVersion = aaiUriUtil.getNamespace()
+                    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(Prefix + "queryVpnBindingAAIResponse", aaiStubResponseAsXml)
-					execution.setVariable(Prefix + "routeCollection", "<routeTargets/>")
-					logger.debug(" No vpnBinding, using this stub as response - " + '\n' + aaiStubResponseAsXml)
+                    String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
+                    execution.setVariable(Prefix + "queryVpnBindingAAIResponse", aaiStubResponseAsXml)
+                    execution.setVariable(Prefix + "routeCollection", "<routeTargets/>")
+                    logger.debug(" No vpnBinding, using this stub as response - " + '\n' + aaiStubResponseAsXml)
 
-				}
-			}
+                }
+            }
 
-		} catch (NotFoundException e) {
-			logger.debug("Response Error from AAINetworkVpnBinding is 404 (Not Found).")
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Response Error from AAINetworkVpnBinding is 404 (Not Found).")
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkVpnBinding() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (NotFoundException e) {
+            logger.debug("Response Error from AAINetworkVpnBinding is 404 (Not Found).")
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Response Error from AAINetworkVpnBinding is 404 (Not Found).")
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkVpnBinding() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void callRESTQueryAAINetworkPolicy(DelegateExecution execution) {
+    public void callRESTQueryAAINetworkPolicy(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkPolicy() of DoCreateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAINetworkPolicy() of DoCreateNetworkInstance ***** " )
 
-		try {
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, execution.getVariable(Prefix + "networkId"))
-			Optional<Relationships> relationships = client.get(uri, NotFoundException.class).getRelationships()
-			if(relationships.isPresent()){
-				List<AAIResourceUri> uris = relationships.get().getRelatedAAIUris(AAIObjectType.NETWORK_POLICY)
+        try {
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, execution.getVariable(Prefix + "networkId"))
+            Optional<Relationships> relationships = client.get(uri, NotFoundException.class).getRelationships()
+            if(relationships.isPresent()){
+                List<AAIResourceUri> uris = relationships.get().getRelatedAAIUris(AAIObjectType.NETWORK_POLICY)
 
-				execution.setVariable(Prefix + "networkPolicyCount", uris.size())
-				logger.debug(Prefix + "networkPolicyCount - " + uris.size())
+                execution.setVariable(Prefix + "networkPolicyCount", uris.size())
+                logger.debug(Prefix + "networkPolicyCount - " + uris.size())
 
-				if (uris.size() > 0) {
+                if (uris.size() > 0) {
 
-					String networkPolicies = ""
-					// AII loop call using list vpnBindings
-					for(AAIResourceUri u : uris) {
+                    String networkPolicies = ""
+                    // AII loop call using list vpnBindings
+                    for(AAIResourceUri u : uris) {
 
-						NetworkPolicy p = client.get(u, NotFoundException.class).asBean(NetworkPolicy.class).get()
+                        NetworkPolicy p = client.get(u, NotFoundException.class).asBean(NetworkPolicy.class).get()
 
-						execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
+                        execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
 
-						String networkPolicy  = p.getNetworkPolicyFqdn()
-						networkPolicies += "<policyFqdns>" + networkPolicy + "</policyFqdns>" + '\n'
+                        String networkPolicy  = p.getNetworkPolicyFqdn()
+                        networkPolicies += "<policyFqdns>" + networkPolicy + "</policyFqdns>" + '\n'
 
-					} // end loop
+                    } // end loop
 
-					execution.setVariable(Prefix + "networkCollection", networkPolicies)
-					logger.debug(Prefix + "networkCollection - " + '\n' + networkPolicies)
+                    execution.setVariable(Prefix + "networkCollection", networkPolicies)
+                    logger.debug(Prefix + "networkCollection - " + '\n' + networkPolicies)
 
-				} else {
-					// reset return code to success
-					execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
-					AaiUtil aaiUriUtil = new AaiUtil(this)
-					String schemaVersion = aaiUriUtil.getNamespace()
-					String aaiStubResponse =
-							"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
+                } else {
+                    // reset return code to success
+                    execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
+                    AaiUtil aaiUriUtil = new AaiUtil(this)
+                    String schemaVersion = aaiUriUtil.getNamespace()
+                    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(Prefix + "queryNetworkPolicyAAIResponse", aaiStubResponseAsXml)
-					execution.setVariable(Prefix + "networkCollection", "<policyFqdns/>")
-					logger.debug(" No net policies, using this stub as response - " + '\n' + aaiStubResponseAsXml)
+                    String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
+                    execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", aaiStubResponseAsXml)
+                    execution.setVariable(Prefix + "networkCollection", "<policyFqdns/>")
+                    logger.debug(" No net policies, using this stub as response - " + '\n' + aaiStubResponseAsXml)
 
-				}
-			}
-	} catch (NotFoundException e) {
-		String dataErrorMessage = "Response Error from QueryAAINetworkPolicy is 404 (Not Found)."
-		logger.debug(dataErrorMessage)
-		exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                }
+            }
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from QueryAAINetworkPolicy is 404 (Not Found)."
+            logger.debug(dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
 
-	} catch (Exception ex) {
-		String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkPolicy() - " + ex.getMessage()
-		logger.debug(exceptionMessage)
-		exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkPolicy() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-	}
+        }
 
-	}
+    }
 
-	public void callRESTQueryAAINetworkTableRef(DelegateExecution execution) {
+    public void callRESTQueryAAINetworkTableRef(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkTableRef() of DoCreateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAINetworkTableRef() of DoCreateNetworkInstance ***** " )
 
-		try {
+        try {
 
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, execution.getVariable(Prefix + "networkId"))
-			Optional<Relationships> relationships = client.get(uri, NotFoundException.class).getRelationships()
-			if(relationships.isPresent()){
-				List<AAIResourceUri> uris = relationships.get().getRelatedAAIUris(AAIObjectType.ROUTE_TABLE_REFERENCE)
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, execution.getVariable(Prefix + "networkId"))
+            Optional<Relationships> relationships = client.get(uri, NotFoundException.class).getRelationships()
+            if(relationships.isPresent()){
+                List<AAIResourceUri> uris = relationships.get().getRelatedAAIUris(AAIObjectType.ROUTE_TABLE_REFERENCE)
 
-				execution.setVariable(Prefix + "networkTableRefCount", uris.size())
-				logger.debug(Prefix + "networkTableRefCount - " + uris.size())
+                execution.setVariable(Prefix + "networkTableRefCount", uris.size())
+                logger.debug(Prefix + "networkTableRefCount - " + uris.size())
 
 
-				if (uris.size() > 0) {
+                if (uris.size() > 0) {
 
-					// AII loop call using list vpnBindings
-					String networkTableRefs = ""
-					for(AAIResourceUri u : uris) {
+                    // AII loop call using list vpnBindings
+                    String networkTableRefs = ""
+                    for(AAIResourceUri u : uris) {
 
-						RouteTableReference rt = client.get(u, NotFoundException.class).asBean(RouteTableReference.class).get()
+                        RouteTableReference rt = client.get(u, NotFoundException.class).asBean(RouteTableReference.class).get()
 
-						String networkTableRef  = rt.getRouteTableReferenceFqdn()
-						networkTableRefs += "<routeTableFqdns>" + networkTableRef + "</routeTableFqdns>" + '\n'
+                        String networkTableRef  = rt.getRouteTableReferenceFqdn()
+                        networkTableRefs += "<routeTableFqdns>" + networkTableRef + "</routeTableFqdns>" + '\n'
 
 
-					} // end loop
+                    } // end loop
 
-					execution.setVariable(Prefix + "tableRefCollection", networkTableRefs)
-					logger.debug(Prefix + "tableRefCollection - " + '\n' + networkTableRefs)
+                    execution.setVariable(Prefix + "tableRefCollection", networkTableRefs)
+                    logger.debug(Prefix + "tableRefCollection - " + '\n' + networkTableRefs)
 
-				} else {
-					// reset return code to success
-					execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
-					AaiUtil aaiUriUtil = new AaiUtil(this)
-					String schemaVersion = aaiUriUtil.getNamespace()
-					String aaiStubResponse =
-							"""	<rest:payload contentType="text/xml" xmlns:rest="http://schemas.activebpel.org/REST/2007/12/01/aeREST.xsd">
+                } else {
+                    // reset return code to success
+                    execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
+                    AaiUtil aaiUriUtil = new AaiUtil(this)
+                    String schemaVersion = aaiUriUtil.getNamespace()
+                    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(Prefix + "queryNetworkTableRefAAIResponse", aaiStubResponseAsXml)
-					execution.setVariable(Prefix + "tableRefCollection", "<routeTableFqdns/>")
-					logger.debug(" No net table references, using this stub as response - " + '\n' + aaiStubResponseAsXml)
-
-				}
-			}
-
-		} catch (NotFoundException e) {
-			String dataErrorMessage = "Response Error from QueryAAINetworkTableRef is 404 (Not Found)."
-			logger.debug(dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkTableRef() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-
-	public void callRESTUpdateContrailAAINetwork(DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace(" ***** Inside callRESTUpdateContrailAAINetwork() of DoCreateNetworkInstance ***** " )
-
-		try {
-			// get variables
-			String networkId   = execution.getVariable(Prefix + "networkId")
-			L3Network requeryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse")
-			String createNetworkResponse   = execution.getVariable(Prefix + "createNetworkResponse")
-
-			L3Network l3Network = new L3Network()
-			if (StringUtils.isBlank(requeryIdAAIResponse.getHeatStackId())) {
-				if (utils.nodeExists(createNetworkResponse, 'networkStackId')) {
-					l3Network.setHeatStackId(utils.getNodeText(createNetworkResponse, 'networkStackId'))
-				}
-			}
-			if (StringUtils.isBlank(requeryIdAAIResponse.getNeutronNetworkId())) {
-				if (utils.nodeExists(createNetworkResponse, 'neutronNetworkId')) {
-					l3Network.setNeutronNetworkId(utils.getNodeText(createNetworkResponse, 'neutronNetworkId'))
-				}
-			}
-			if (StringUtils.isBlank(requeryIdAAIResponse.getContrailNetworkFqdn())) {
-				if (utils.nodeExists(createNetworkResponse, 'networkFqdn')) {
-					l3Network.setContrailNetworkFqdn(utils.getNodeText(createNetworkResponse, 'networkFqdn'))
-				}
-			}
-
-			String status = utils.getNodeText(createNetworkResponse, 'orchestration-status')
-			if(status.equals("pending-create") || status.equals("PendingCreate")){
-				l3Network.setOrchestrationStatus("Created")
-			}else{
-				l3Network.setOrchestrationStatus("Active")
-			}
-
-			logger.debug("Updating l3-network in AAI" )
-
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId)
-			client.update(uri, l3Network)
-
-			if(requeryIdAAIResponse.getSubnets() != null){
-				for(Subnet s:requeryIdAAIResponse.getSubnets().getSubnet()){
-					String subnetOrchStatus = s.getOrchestrationStatus()
-					String subnetId = s.getSubnetId()
-					Subnet subnet = new Subnet()
-					subnet.setNeutronSubnetId(networkUtils.extractNeutSubId(createNetworkResponse, subnetId))
-					if(subnetOrchStatus.equals("pending-create") || subnetOrchStatus.equals("PendingCreate") ){
-						subnet.setOrchestrationStatus("Created")
-					}else{
-						subnet.setOrchestrationStatus("Active")
-					}
-
-					logger.debug("Updating subnet in AAI" )
-					AAIResourceUri subUri = AAIUriFactory.createResourceUri(AAIObjectType.SUBNET, networkId, subnetId)
-					client.update(subUri, subnet)
-
-				}
-			}
-
-			String rollbackEnabled = execution.getVariable(Prefix + "rollbackEnabled")
-			if (rollbackEnabled == "true") {
-				execution.setVariable(Prefix + "isPONR", false)
-			} else {
-				execution.setVariable(Prefix + "isPONR", true)
-			}
-			logger.debug(Prefix + "isPONR" + ": " + execution.getVariable(Prefix + "isPONR"))
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (NotFoundException e) {
-			String dataErrorMessage = " Response Error from UpdateContrailAAINetwork is 404 (Not Found)."
-			logger.debug(dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTUpdateContrailAAINetwork() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-	}
-
-	public void prepareCreateNetworkRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside prepareCreateNetworkRequest() of DoCreateNetworkInstance")
-
-		try {
-
-			// get variables
-			String requestId = execution.getVariable("msoRequestId")
-			if (requestId == null) {
-				requestId = execution.getVariable("mso-request-id")
-			}
-			String messageId = execution.getVariable(Prefix + "messageId")
-			String source    = execution.getVariable(Prefix + "source")
-
-			String requestInput = execution.getVariable(Prefix + "networkRequest")
-			L3Network queryIdResponse = execution.getVariable(Prefix + "queryIdAAIResponse")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionPo")
-			String backoutOnFailure = execution.getVariable(Prefix + "rollbackEnabled")
-
-			// Prepare Network request
-			String routeCollection = execution.getVariable(Prefix + "routeCollection")
-			String policyCollection = execution.getVariable(Prefix + "networkCollection")
-			String tableCollection = execution.getVariable(Prefix + "tableRefCollection")
-			String createNetworkRequest = networkUtils.CreateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyCollection, tableCollection, cloudRegionId, backoutOnFailure, source )
-			// Format Response
-			String buildDeleteNetworkRequestAsString = utils.formatXml(createNetworkRequest)
-			buildDeleteNetworkRequestAsString = buildDeleteNetworkRequestAsString.replace(":w1aac13n0", "").replace("w1aac13n0:", "")
-
-			execution.setVariable(Prefix + "createNetworkRequest", buildDeleteNetworkRequestAsString)
-			logger.debug(Prefix + "createNetworkRequest - " + "\n" +  buildDeleteNetworkRequestAsString)
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareCreateNetworkRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+                    String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
+                    execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", aaiStubResponseAsXml)
+                    execution.setVariable(Prefix + "tableRefCollection", "<routeTableFqdns/>")
+                    logger.debug(" No net table references, using this stub as response - " + '\n' + aaiStubResponseAsXml)
+
+                }
+            }
+
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from QueryAAINetworkTableRef is 404 (Not Found)."
+            logger.debug(dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTQueryAAINetworkTableRef() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+    }
+
+
+    public void callRESTUpdateContrailAAINetwork(DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace(" ***** Inside callRESTUpdateContrailAAINetwork() of DoCreateNetworkInstance ***** " )
+
+        try {
+            // get variables
+            String networkId   = execution.getVariable(Prefix + "networkId")
+            L3Network requeryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse")
+            String createNetworkResponse   = execution.getVariable(Prefix + "createNetworkResponse")
+
+            L3Network l3Network = new L3Network()
+            if (StringUtils.isBlank(requeryIdAAIResponse.getHeatStackId())) {
+                if (utils.nodeExists(createNetworkResponse, 'networkStackId')) {
+                    l3Network.setHeatStackId(utils.getNodeText(createNetworkResponse, 'networkStackId'))
+                }
+            }
+            if (StringUtils.isBlank(requeryIdAAIResponse.getNeutronNetworkId())) {
+                if (utils.nodeExists(createNetworkResponse, 'neutronNetworkId')) {
+                    l3Network.setNeutronNetworkId(utils.getNodeText(createNetworkResponse, 'neutronNetworkId'))
+                }
+            }
+            if (StringUtils.isBlank(requeryIdAAIResponse.getContrailNetworkFqdn())) {
+                if (utils.nodeExists(createNetworkResponse, 'networkFqdn')) {
+                    l3Network.setContrailNetworkFqdn(utils.getNodeText(createNetworkResponse, 'networkFqdn'))
+                }
+            }
+
+            String status = utils.getNodeText(createNetworkResponse, 'orchestration-status')
+            if(status.equals("pending-create") || status.equals("PendingCreate")){
+                l3Network.setOrchestrationStatus("Created")
+            }else{
+                l3Network.setOrchestrationStatus("Active")
+            }
+
+            logger.debug("Updating l3-network in AAI" )
+
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId)
+            client.update(uri, l3Network)
+
+            if(requeryIdAAIResponse.getSubnets() != null){
+                for(Subnet s:requeryIdAAIResponse.getSubnets().getSubnet()){
+                    String subnetOrchStatus = s.getOrchestrationStatus()
+                    String subnetId = s.getSubnetId()
+                    Subnet subnet = new Subnet()
+                    subnet.setNeutronSubnetId(networkUtils.extractNeutSubId(createNetworkResponse, subnetId))
+                    if(subnetOrchStatus.equals("pending-create") || subnetOrchStatus.equals("PendingCreate") ){
+                        subnet.setOrchestrationStatus("Created")
+                    }else{
+                        subnet.setOrchestrationStatus("Active")
+                    }
+
+                    logger.debug("Updating subnet in AAI" )
+                    AAIResourceUri subUri = AAIUriFactory.createResourceUri(AAIObjectType.SUBNET, networkId, subnetId)
+                    client.update(subUri, subnet)
+
+                }
+            }
+
+            String rollbackEnabled = execution.getVariable(Prefix + "rollbackEnabled")
+            if (rollbackEnabled == "true") {
+                execution.setVariable(Prefix + "isPONR", false)
+            } else {
+                execution.setVariable(Prefix + "isPONR", true)
+            }
+            logger.debug(Prefix + "isPONR" + ": " + execution.getVariable(Prefix + "isPONR"))
+
+        } catch (BpmnError e) {
+            throw e;
+        } catch (NotFoundException e) {
+            String dataErrorMessage = " Response Error from UpdateContrailAAINetwork is 404 (Not Found)."
+            logger.debug(dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. callRESTUpdateContrailAAINetwork() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+    }
+
+    public void prepareCreateNetworkRequest (DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside prepareCreateNetworkRequest() of DoCreateNetworkInstance")
+
+        try {
+
+            // get variables
+            String requestId = execution.getVariable("msoRequestId")
+            if (requestId == null) {
+                requestId = execution.getVariable("mso-request-id")
+            }
+            String messageId = execution.getVariable(Prefix + "messageId")
+            String source    = execution.getVariable(Prefix + "source")
+
+            String requestInput = execution.getVariable(Prefix + "networkRequest")
+            L3Network queryIdResponse = execution.getVariable(Prefix + "queryIdAAIResponse")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionPo")
+            String backoutOnFailure = execution.getVariable(Prefix + "rollbackEnabled")
+
+            // Prepare Network request
+            String routeCollection = execution.getVariable(Prefix + "routeCollection")
+            String policyCollection = execution.getVariable(Prefix + "networkCollection")
+            String tableCollection = execution.getVariable(Prefix + "tableRefCollection")
+            String createNetworkRequest = networkUtils.CreateNetworkRequestV2(execution, requestId, messageId, requestInput, queryIdResponse, routeCollection, policyCollection, tableCollection, cloudRegionId, backoutOnFailure, source )
+            // Format Response
+            String buildDeleteNetworkRequestAsString = utils.formatXml(createNetworkRequest)
+            buildDeleteNetworkRequestAsString = buildDeleteNetworkRequestAsString.replace(":w1aac13n0", "").replace("w1aac13n0:", "")
+
+            execution.setVariable(Prefix + "createNetworkRequest", buildDeleteNetworkRequestAsString)
+            logger.debug(Prefix + "createNetworkRequest - " + "\n" +  buildDeleteNetworkRequestAsString)
+
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareCreateNetworkRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void prepareSDNCRequest (DelegateExecution execution) {
+    public void prepareSDNCRequest (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside prepareSDNCRequest() of DoCreateNetworkInstance")
+        logger.trace("Inside prepareSDNCRequest() of DoCreateNetworkInstance")
 
-		try {
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+        try {
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
 
-			String networkId = execution.getVariable(Prefix + "networkId")
-			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
+            String networkId = execution.getVariable(Prefix + "networkId")
+            String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
 
-			// 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 '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)
 
-			// 1. prepare assign topology via SDNC Adapter SUBFLOW call
- 		   	String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, createNetworkInput, serviceInstanceId, sdncCallback, "assign", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
+            // 1. prepare assign topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, createNetworkInput, serviceInstanceId, sdncCallback, "assign", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
 
-			String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
-			execution.setVariable(Prefix + "assignSDNCRequest", sndcTopologyCreateRequesAsString)
-			logger.debug(Prefix + "assignSDNCRequest - " + "\n" +  sndcTopologyCreateRequesAsString)
+            String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
+            execution.setVariable(Prefix + "assignSDNCRequest", sndcTopologyCreateRequesAsString)
+            logger.debug(Prefix + "assignSDNCRequest - " + "\n" +  sndcTopologyCreateRequesAsString)
 
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareSDNCRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareSDNCRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void prepareRpcSDNCRequest (DelegateExecution execution) {
+    public void prepareRpcSDNCRequest (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside prepareRpcSDNCRequest() of DoCreateNetworkInstance")
+        logger.trace("Inside prepareRpcSDNCRequest() of DoCreateNetworkInstance")
 
-		try {
-			// get variables
+        try {
+            // get variables
 
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
 
-			String networkId = execution.getVariable(Prefix + "networkId")
-			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
+            String networkId = execution.getVariable(Prefix + "networkId")
+            String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
 
-			// 1. prepare assign topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "assign", "CreateNetworkInstance", cloudRegionId, networkId, null)
+            // 1. prepare assign topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "assign", "CreateNetworkInstance", cloudRegionId, networkId, null)
 
-			String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
-			execution.setVariable(Prefix + "assignSDNCRequest", sndcTopologyCreateRequesAsString)
-			logger.debug(Prefix + "assignSDNCRequest - " + "\n" +  sndcTopologyCreateRequesAsString)
+            String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
+            execution.setVariable(Prefix + "assignSDNCRequest", sndcTopologyCreateRequesAsString)
+            logger.debug(Prefix + "assignSDNCRequest - " + "\n" +  sndcTopologyCreateRequesAsString)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void prepareRpcSDNCActivateRequest (DelegateExecution execution) {
+    public void prepareRpcSDNCActivateRequest (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside prepareRpcSDNCActivateRequest() of DoCreateNetworkInstance")
+        logger.trace("Inside prepareRpcSDNCActivateRequest() of DoCreateNetworkInstance")
 
-		try {
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			String networkId = execution.getVariable(Prefix + "networkId")
-			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
+        try {
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String networkId = execution.getVariable(Prefix + "networkId")
+            String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
 
-			// 1. prepare assign topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "activate", "CreateNetworkInstance", cloudRegionId, networkId, null)
+            // 1. prepare assign topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "activate", "CreateNetworkInstance", cloudRegionId, networkId, null)
 
-			String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
-			execution.setVariable(Prefix + "activateSDNCRequest", sndcTopologyCreateRequesAsString)
-			logger.debug(Prefix + "activateSDNCRequest - " + "\n" +  sndcTopologyCreateRequesAsString)
+            String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
+            execution.setVariable(Prefix + "activateSDNCRequest", sndcTopologyCreateRequesAsString)
+            logger.debug(Prefix + "activateSDNCRequest - " + "\n" +  sndcTopologyCreateRequesAsString)
 
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCActivateRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCActivateRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
 
 
 
-	// **************************************************
-	//     Post or Validate Response Section
-	// **************************************************
+    // **************************************************
+    //     Post or Validate Response Section
+    // **************************************************
 
-	public void validateCreateNetworkResponse (DelegateExecution execution) {
+    public void validateCreateNetworkResponse (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside validateNetworkResponse() of DoCreateNetworkInstance")
+        logger.trace("Inside validateNetworkResponse() of DoCreateNetworkInstance")
 
-		try {
-			String returnCode = execution.getVariable(Prefix + "networkReturnCode")
-			String networkResponse = execution.getVariable(Prefix + "createNetworkResponse")
-			if (networkResponse==null)	{
-				networkResponse="" // reset
-			}
+        try {
+            String networkResponse = execution.getVariable(Prefix + "createNetworkResponse")
+            if (networkResponse==null)	{
+                networkResponse="" // reset
+            }
 
-			logger.debug(" Network Adapter create responseCode: " + returnCode)
+            execution.setVariable(Prefix + "isNetworkRollbackNeeded", true)
+            execution.setVariable(Prefix + "createNetworkResponse", networkResponse)
+            logger.debug(" Network Adapter create Success Response - " + "\n" + networkResponse)
 
-			String errorMessage = ""
-			if (returnCode == "200") {
-				execution.setVariable(Prefix + "isNetworkRollbackNeeded", true)
-				execution.setVariable(Prefix + "createNetworkResponse", networkResponse)
-				logger.debug(" Network Adapter create Success Response - " + "\n" + networkResponse)
-
-				// prepare rollback data
-				String rollbackData = utils.getNodeXml(networkResponse, "rollback", false).replace("tag0:","").replace(":tag0","")
-				rollbackData = rollbackData.replace("rollback>", "networkRollback>")
-  				String rollbackNetwork =
-					"""<rollbackNetworkRequest>
+            // prepare rollback data
+            String rollbackData = utils.getNodeXml(networkResponse, "rollback", false).replace("tag0:","").replace(":tag0","")
+            rollbackData = rollbackData.replace("rollback>", "networkRollback>")
+            String rollbackNetwork =
+                    """<rollbackNetworkRequest>
 							${rollbackData}
 						</rollbackNetworkRequest>"""
-				String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
-				execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkXml)
-				logger.debug(" Network Adapter rollback data - " + "\n" + rollbackNetworkXml)
-
-			} else { // network error
-			   if (returnCode.toInteger() > 399 && returnCode.toInteger() < 600) {   //4xx, 5xx
-				   if (networkResponse.contains("createNetworkError")) {
-					   networkResponse = networkResponse.replace('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>', '')
-					   errorMessage = utils.getNodeText(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)
-
-			   }
-
-			}
+            String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
+            execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkXml)
+            logger.debug(" Network Adapter rollback data - " + "\n" + rollbackNetworkXml)
 
-		} catch (BpmnError e) {
-			throw e;
+        } catch (BpmnError e) {
+            throw e;
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. validateCreateNetworkResponse() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. validateCreateNetworkResponse() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
 
-	}
+    }
 
-	public void validateSDNCResponse (DelegateExecution execution) {
+    public void validateSDNCResponse (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside validateSDNCResponse() of DoCreateNetworkInstance")
+        logger.trace("Inside validateSDNCResponse() of DoCreateNetworkInstance")
 
-		String response = execution.getVariable(Prefix + "assignSDNCResponse")
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-		WorkflowException workflowException = execution.getVariable("WorkflowException")
+        String response = execution.getVariable(Prefix + "assignSDNCResponse")
+        boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+        WorkflowException workflowException = execution.getVariable("WorkflowException")
 
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-		// reset variable
-		String assignSDNCResponseDecodeXml = execution.getVariable(Prefix + "assignSDNCResponse")
-		assignSDNCResponseDecodeXml = assignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-		execution.setVariable(Prefix + "assignSDNCResponse", assignSDNCResponseDecodeXml)
+        SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+        sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+        // reset variable
+        String assignSDNCResponseDecodeXml = execution.getVariable(Prefix + "assignSDNCResponse")
+        assignSDNCResponseDecodeXml = assignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+        execution.setVariable(Prefix + "assignSDNCResponse", assignSDNCResponseDecodeXml)
 
-		if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, Prefix+'sdncResponseSuccess'
-			execution.setVariable(Prefix + "isSdncRollbackNeeded", true)
-			logger.debug("Successfully Validated SDNC Response")
+        if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, Prefix+'sdncResponseSuccess'
+            execution.setVariable(Prefix + "isSdncRollbackNeeded", true)
+            logger.debug("Successfully Validated SDNC Response")
 
-		} else {
-			logger.debug("Did NOT Successfully Validated SDNC Response")
-			throw new BpmnError("MSOWorkflowException")
-		}
+        } else {
+            logger.debug("Did NOT Successfully Validated SDNC Response")
+            throw new BpmnError("MSOWorkflowException")
+        }
 
-	}
+    }
 
-	public void validateRpcSDNCActivateResponse (DelegateExecution execution) {
+    public void validateRpcSDNCActivateResponse (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside validateRpcSDNCActivateResponse() of DoCreateNetworkInstance")
+        logger.trace("Inside validateRpcSDNCActivateResponse() of DoCreateNetworkInstance")
 
-		String response = execution.getVariable(Prefix + "activateSDNCResponse")
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-		WorkflowException workflowException = execution.getVariable("WorkflowException")
+        String response = execution.getVariable(Prefix + "activateSDNCResponse")
+        boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+        WorkflowException workflowException = execution.getVariable("WorkflowException")
 
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-		// reset variable
-		String assignSDNCResponseDecodeXml = execution.getVariable(Prefix + "activateSDNCResponse")
-		assignSDNCResponseDecodeXml = assignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-		execution.setVariable(Prefix + "activateSDNCResponse", assignSDNCResponseDecodeXml)
+        SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+        sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+        // reset variable
+        String assignSDNCResponseDecodeXml = execution.getVariable(Prefix + "activateSDNCResponse")
+        assignSDNCResponseDecodeXml = assignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+        execution.setVariable(Prefix + "activateSDNCResponse", assignSDNCResponseDecodeXml)
 
-		if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, Prefix+'sdncResponseSuccess'
-			execution.setVariable(Prefix + "isSdncActivateRollbackNeeded", true)
-			logger.debug("Successfully Validated Rpc SDNC Activate Response")
+        if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, Prefix+'sdncResponseSuccess'
+            execution.setVariable(Prefix + "isSdncActivateRollbackNeeded", true)
+            logger.debug("Successfully Validated Rpc SDNC Activate Response")
 
-		} else {
-			logger.debug("Did NOT Successfully Validated Rpc SDNC Activate Response")
-			throw new BpmnError("MSOWorkflowException")
-		}
+        } else {
+            logger.debug("Did NOT Successfully Validated Rpc SDNC Activate Response")
+            throw new BpmnError("MSOWorkflowException")
+        }
 
-	}
+    }
 
 
-	public void prepareSDNCRollbackRequest (DelegateExecution execution) {
+    public void prepareSDNCRollbackRequest (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside prepareSDNCRollbackRequest() of DoCreateNetworkInstance")
+        logger.trace("Inside prepareSDNCRollbackRequest() of DoCreateNetworkInstance")
 
-		try {
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			String assignSDNCResponse = execution.getVariable(Prefix + "assignSDNCResponse")
-			String networkId = execution.getVariable(Prefix + "networkId")
-			if (networkId == 'null') {networkId = ""}
-			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
+        try {
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String assignSDNCResponse = execution.getVariable(Prefix + "assignSDNCResponse")
+            String networkId = execution.getVariable(Prefix + "networkId")
+            if (networkId == 'null') {networkId = ""}
+            String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
 
-			// 2. prepare rollback topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyRollbackRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, createNetworkInput, serviceInstanceId, sdncCallback, "rollback", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
-			String sndcTopologyRollbackRequestAsString = utils.formatXml(sndcTopologyRollbackRequest)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyRollbackRequestAsString)
-			logger.debug(" Preparing request for SDNC Topology 'rollback-NetworkActivateRequest' rollback . . . - " + "\n" +  sndcTopologyRollbackRequestAsString)
+            // 2. prepare rollback topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyRollbackRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, createNetworkInput, serviceInstanceId, sdncCallback, "rollback", "NetworkActivateRequest", cloudRegionId, networkId, null, null)
+            String sndcTopologyRollbackRequestAsString = utils.formatXml(sndcTopologyRollbackRequest)
+            execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyRollbackRequestAsString)
+            logger.debug(" Preparing request for SDNC Topology 'rollback-NetworkActivateRequest' rollback . . . - " + "\n" +  sndcTopologyRollbackRequestAsString)
 
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareSDNCRollbackRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareSDNCRollbackRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void prepareRpcSDNCRollbackRequest (DelegateExecution execution) {
+    public void prepareRpcSDNCRollbackRequest (DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside prepareRpcSDNCRollbackRequest() of DoCreateNetworkInstance")
+        logger.trace("Inside prepareRpcSDNCRollbackRequest() of DoCreateNetworkInstance")
 
-		try {
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			String assignSDNCResponse = execution.getVariable(Prefix + "assignSDNCResponse")
-			String networkId = execution.getVariable(Prefix + "networkId")
-			if (networkId == 'null') {networkId = ""}
-			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
+        try {
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String assignSDNCResponse = execution.getVariable(Prefix + "assignSDNCResponse")
+            String networkId = execution.getVariable(Prefix + "networkId")
+            if (networkId == 'null') {networkId = ""}
+            String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
 
-			// 2. prepare rollback topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "unassign", "DeleteNetworkInstance", cloudRegionId, networkId, null)
-			String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
-			logger.debug(" Preparing request for SDNC Topology 'unassign-DeleteNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
+            // 2. prepare rollback topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "unassign", "DeleteNetworkInstance", cloudRegionId, networkId, null)
+            String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
+            execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
+            logger.debug(" Preparing request for SDNC Topology 'unassign-DeleteNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
 
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCRollbackRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCRollbackRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void prepareRpcSDNCActivateRollback(DelegateExecution execution) {
+    public void prepareRpcSDNCActivateRollback(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside prepareRpcSDNCActivateRollback() of DoCreateNetworkInstance")
+        logger.trace("Inside prepareRpcSDNCActivateRollback() of DoCreateNetworkInstance")
 
-		try {
+        try {
 
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			String activateSDNCResponse = execution.getVariable(Prefix + "activateSDNCResponse")
-			String networkId = execution.getVariable(Prefix + "networkId")
-			if (networkId == 'null') {networkId = ""}
-			String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
-
-			// 2. prepare rollback topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "deactivate", "DeleteNetworkInstance", cloudRegionId, networkId, null)
-			String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
-			execution.setVariable(Prefix + "rollbackActivateSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
-			logger.debug(" Preparing request for RPC SDNC Topology 'deactivate-DeleteNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
-
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCActivateRollback() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String createNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String activateSDNCResponse = execution.getVariable(Prefix + "activateSDNCResponse")
+            String networkId = execution.getVariable(Prefix + "networkId")
+            if (networkId == 'null') {networkId = ""}
+            String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
+
+            // 2. prepare rollback topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, "deactivate", "DeleteNetworkInstance", cloudRegionId, networkId, null)
+            String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
+            execution.setVariable(Prefix + "rollbackActivateSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
+            logger.debug(" Preparing request for RPC SDNC Topology 'deactivate-DeleteNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
+
+
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRpcSDNCActivateRollback() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+    }
 
-	public void prepareRollbackData(DelegateExecution execution) {
+    public void prepareRollbackData(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside prepareRollbackData() of DoCreateNetworkInstance")
-
-		try {
-
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
-			if (rollbackSDNCRequest != null) {
-				if (rollbackSDNCRequest != "") {
-			        rollbackData.put("rollbackSDNCRequest", execution.getVariable(Prefix + "rollbackSDNCRequest"))
-			    }
-			}
-			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
-			if (rollbackNetworkRequest != null) {
-				if (rollbackNetworkRequest != "") {
-			        rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
-				}
-			}
-			String rollbackActivateSDNCRequest = execution.getVariable(Prefix + "rollbackActivateSDNCRequest")
-			if (rollbackActivateSDNCRequest != null) {
-				if (rollbackActivateSDNCRequest != "") {
-			        rollbackData.put("rollbackActivateSDNCRequest", execution.getVariable(Prefix + "rollbackActivateSDNCRequest"))
-				}
-			}
-			execution.setVariable("rollbackData", rollbackData)
-			logger.debug("** rollbackData : " + rollbackData)
-
-			execution.setVariable("WorkflowException", execution.getVariable(Prefix + "WorkflowException"))
-			logger.debug("** WorkflowException : " + execution.getVariable("WorkflowException"))
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRollbackData() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void postProcessResponse(DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside postProcessResponse() of DoCreateNetworkInstance")
-
-		try {
-
-			//Conditions:
-			// 1. Silent Success: execution.getVariable("CRENWKI_orchestrationStatus") == "ACTIVE"
-			// 2. Success: execution.getVariable("WorkflowException") == null (NULL)
-			// 3. WorkflowException: execution.getVariable("WorkflowException") != null (NOT NULL)
-
-			logger.debug(" ***** Is Exception Encountered (isException)? : " + execution.getVariable(Prefix + "isException"))
-			// successful flow
-			if (execution.getVariable(Prefix + "isException") == false) {
-				// set rollback data
-				execution.setVariable("orchestrationStatus", "")
-				execution.setVariable("networkId", execution.getVariable(Prefix + "networkId"))
-				execution.setVariable("networkName", execution.getVariable(Prefix + "networkName"))
-				prepareSuccessRollbackData(execution) // populate rollbackData
-				execution.setVariable("WorkflowException", null)
-				execution.setVariable(Prefix + "Success", true)
-				logger.debug(" ***** postProcessResponse(), GOOD !!!")
-			} else {
-   			   // inside sub-flow logic
-				execution.setVariable(Prefix + "Success", false)
-				execution.setVariable("rollbackData", null)
-				String exceptionMessage = " Exception encountered in MSO Bpmn. "
-				if (execution.getVariable("workflowException") != null) {  // Output of Rollback flow.
-				   logger.debug(" ***** workflowException: " + execution.getVariable("workflowException"))
-				   WorkflowException wfex = execution.getVariable("workflowException")
-				   exceptionMessage = wfex.getErrorMessage()
-   				} else {
-			       if (execution.getVariable(Prefix + "WorkflowException") != null) {
-				      WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
-				      exceptionMessage = pwfex.getErrorMessage()
-			       }
-   				}
-			    // going to the Main flow: a-la-carte or macro
-			    logger.debug(" ***** postProcessResponse(), BAD !!!")
-			    exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-				throw new BpmnError("MSOWorkflowException")
-			}
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside prepareRollbackData() of DoCreateNetworkInstance")
+
+        try {
+
+            Map<String, String> rollbackData = new HashMap<String, String>();
+            String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
+            if (rollbackSDNCRequest != null) {
+                if (rollbackSDNCRequest != "") {
+                    rollbackData.put("rollbackSDNCRequest", execution.getVariable(Prefix + "rollbackSDNCRequest"))
+                }
+            }
+            String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+            if (rollbackNetworkRequest != null) {
+                if (rollbackNetworkRequest != "") {
+                    rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
+                }
+            }
+            String rollbackActivateSDNCRequest = execution.getVariable(Prefix + "rollbackActivateSDNCRequest")
+            if (rollbackActivateSDNCRequest != null) {
+                if (rollbackActivateSDNCRequest != "") {
+                    rollbackData.put("rollbackActivateSDNCRequest", execution.getVariable(Prefix + "rollbackActivateSDNCRequest"))
+                }
+            }
+            execution.setVariable("rollbackData", rollbackData)
+            logger.debug("** rollbackData : " + rollbackData)
+
+            execution.setVariable("WorkflowException", execution.getVariable(Prefix + "WorkflowException"))
+            logger.debug("** WorkflowException : " + execution.getVariable("WorkflowException"))
+
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareRollbackData() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+    }
+
+    public void postProcessResponse(DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside postProcessResponse() of DoCreateNetworkInstance")
+
+        try {
+
+            //Conditions:
+            // 1. Silent Success: execution.getVariable("CRENWKI_orchestrationStatus") == "ACTIVE"
+            // 2. Success: execution.getVariable("WorkflowException") == null (NULL)
+            // 3. WorkflowException: execution.getVariable("WorkflowException") != null (NOT NULL)
+
+            logger.debug(" ***** Is Exception Encountered (isException)? : " + execution.getVariable(Prefix + "isException"))
+            // successful flow
+            if (execution.getVariable(Prefix + "isException") == false) {
+                // set rollback data
+                execution.setVariable("orchestrationStatus", "")
+                execution.setVariable("networkId", execution.getVariable(Prefix + "networkId"))
+                execution.setVariable("networkName", execution.getVariable(Prefix + "networkName"))
+                prepareSuccessRollbackData(execution) // populate rollbackData
+                execution.setVariable("WorkflowException", null)
+                execution.setVariable(Prefix + "Success", true)
+                logger.debug(" ***** postProcessResponse(), GOOD !!!")
+            } else {
+                // inside sub-flow logic
+                execution.setVariable(Prefix + "Success", false)
+                execution.setVariable("rollbackData", null)
+                String exceptionMessage = " Exception encountered in MSO Bpmn. "
+                if (execution.getVariable("workflowException") != null) {  // Output of Rollback flow.
+                    logger.debug(" ***** workflowException: " + execution.getVariable("workflowException"))
+                    WorkflowException wfex = execution.getVariable("workflowException")
+                    exceptionMessage = wfex.getErrorMessage()
+                } else {
+                    if (execution.getVariable(Prefix + "WorkflowException") != null) {
+                        WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
+                        exceptionMessage = pwfex.getErrorMessage()
+                    }
+                }
+                // going to the Main flow: a-la-carte or macro
+                logger.debug(" ***** postProcessResponse(), BAD !!!")
+                exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+                throw new BpmnError("MSOWorkflowException")
+            }
 
-		} catch(BpmnError b){
-		     logger.debug("Rethrowing MSOWorkflowException")
-		     throw b
+        } catch(BpmnError b){
+            logger.debug("Rethrowing MSOWorkflowException")
+            throw b
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-			throw new BpmnError("MSOWorkflowException")
-
-		}
-
-
-
-	}
-
-	public void prepareSuccessRollbackData(DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside prepareSuccessRollbackData() of DoCreateNetworkInstance")
-
-		try {
-
-			if (execution.getVariable("sdncVersion") != '1610') {
-			    prepareRpcSDNCRollbackRequest(execution)
-				prepareRpcSDNCActivateRollback(execution)
-			} else {
-			    prepareSDNCRollbackRequest(execution)
-			}
-
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
-			if (rollbackSDNCRequest != null) {
-				if (rollbackSDNCRequest != "") {
-					rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
-				}
-			}
-			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
-			if (rollbackNetworkRequest != null) {
-				if (rollbackNetworkRequest != "") {
-					rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
-				}
-			}
-			String rollbackActivateSDNCRequest = execution.getVariable(Prefix + "rollbackActivateSDNCRequest")
-			if (rollbackActivateSDNCRequest != null) {
-				if (rollbackActivateSDNCRequest != "") {
-					rollbackData.put("rollbackActivateSDNCRequest", rollbackActivateSDNCRequest)
-				}
-			}
-			execution.setVariable("rollbackData", rollbackData)
-
-			logger.debug("** 'rollbackData' for Full Rollback : " + rollbackData)
-			execution.setVariable("WorkflowException", null)
-
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareSuccessRollbackData() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void setExceptionFlag(DelegateExecution execution){
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside setExceptionFlag() of DoCreateNetworkInstance")
-
-		try {
-
-			execution.setVariable(Prefix + "isException", true)
-
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			logger.debug(Prefix + "WorkflowException - " +execution.getVariable(Prefix + "WorkflowException"))
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+            throw new BpmnError("MSOWorkflowException")
+
+        }
+
+
+
+    }
+
+    public void prepareSuccessRollbackData(DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside prepareSuccessRollbackData() of DoCreateNetworkInstance")
+
+        try {
+
+            if (execution.getVariable("sdncVersion") != '1610') {
+                prepareRpcSDNCRollbackRequest(execution)
+                prepareRpcSDNCActivateRollback(execution)
+            } else {
+                prepareSDNCRollbackRequest(execution)
+            }
+
+            Map<String, String> rollbackData = new HashMap<String, String>();
+            String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
+            if (rollbackSDNCRequest != null) {
+                if (rollbackSDNCRequest != "") {
+                    rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
+                }
+            }
+            String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+            if (rollbackNetworkRequest != null) {
+                if (rollbackNetworkRequest != "") {
+                    rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
+                }
+            }
+            String rollbackActivateSDNCRequest = execution.getVariable(Prefix + "rollbackActivateSDNCRequest")
+            if (rollbackActivateSDNCRequest != null) {
+                if (rollbackActivateSDNCRequest != "") {
+                    rollbackData.put("rollbackActivateSDNCRequest", rollbackActivateSDNCRequest)
+                }
+            }
+            execution.setVariable("rollbackData", rollbackData)
+
+            logger.debug("** 'rollbackData' for Full Rollback : " + rollbackData)
+            execution.setVariable("WorkflowException", null)
+
+
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstance flow. prepareSuccessRollbackData() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+    }
+
+    public void setExceptionFlag(DelegateExecution execution){
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside setExceptionFlag() of DoCreateNetworkInstance")
+
+        try {
+
+            execution.setVariable(Prefix + "isException", true)
+
+            if (execution.getVariable("SavedWorkflowException1") != null) {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
+            } else {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+            }
+            logger.debug(Prefix + "WorkflowException - " +execution.getVariable(Prefix + "WorkflowException"))
 
-		} catch(Exception ex){
-		  	String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. setExceptionFlag(): " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-		}
+        } catch(Exception ex){
+            String exceptionMessage = "Bpmn error encountered in DoCreateNetworkInstance flow. setExceptionFlag(): " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        }
 
-	}
+    }
 
 
-	// *******************************
-	//     Build Error Section
-	// *******************************
+    // *******************************
+    //     Build Error Section
+    // *******************************
 
 
 
-	public void processJavaException(DelegateExecution execution){
+    public void processJavaException(DelegateExecution execution){
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		try{
-			logger.debug( "Caught a Java Exception in " + Prefix)
-			logger.debug("Started processJavaException Method")
-			logger.debug("Variables List: " + execution.getVariables())
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
+        try{
+            logger.debug( "Caught a Java Exception in " + Prefix)
+            logger.debug("Started processJavaException Method")
+            logger.debug("Variables List: " + execution.getVariables())
+            execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+            exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
 
-		}catch(Exception e){
-			logger.debug("Caught Exception during processJavaException Method: " + e)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
-		}
-		logger.debug( "Completed processJavaException Method in " + Prefix)
-	}
+        }catch(Exception e){
+            logger.debug("Caught Exception during processJavaException Method: " + e)
+            execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+            exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
+        }
+        logger.debug( "Completed processJavaException Method in " + Prefix)
+    }
 
 }
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy
index e34e505e55..313e2f4cb7 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollback.groovy
@@ -48,333 +48,312 @@ import org.camunda.bpm.engine.delegate.DelegateExecution
 public class DoCreateNetworkInstanceRollback extends AbstractServiceTaskProcessor {
     private static final Logger logger = LoggerFactory.getLogger( DoCreateNetworkInstanceRollback.class);
 
-	String Prefix="CRENWKIR_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	def className = getClass().getSimpleName()
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(DelegateExecution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable(Prefix + "rollbackNetworkRequest", null)
-		execution.setVariable(Prefix + "rollbackSDNCRequest", null)
-		execution.setVariable(Prefix + "rollbackActivateSDNCRequest", null)
-		execution.setVariable(Prefix + "WorkflowException", null)
-
-		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
-		execution.setVariable(Prefix + "rollbackNetworkResponse", "")
-		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
-
-		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
-		execution.setVariable(Prefix + "rollbackSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
-
-		execution.setVariable(Prefix + "rollbackActivateSDNCRequest", "")
-		execution.setVariable(Prefix + "rollbackActivateSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackActivateSDNCReturnCode", "")
-
-		execution.setVariable(Prefix + "Success", false)
-		execution.setVariable(Prefix + "fullRollback", false)
-		execution.setVariable(Prefix + "networkId", "")
-		execution.setVariable(Prefix + "urlRollbackPoNetwork", "")
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside preProcessRequest() of " + className + ".groovy")
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			// GET Incoming request/variables
-			String rollbackNetworkRequest = null
-			String rollbackSDNCRequest = null
-			String rollbackActivateSDNCRequest = null
-
-			// Partial Rollback
-			Map<String, String> rollbackData = execution.getVariable("rollbackData")
-			if (rollbackData != null && rollbackData instanceof Map) {
-
-					if(rollbackData.containsKey("rollbackSDNCRequest")) {
-					   rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]
-					}
-
-					if(rollbackData.containsKey("rollbackNetworkRequest")) {
-						rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]
-					}
-
-					if(rollbackData.containsKey("rollbackActivateSDNCRequest")) {
-					   rollbackActivateSDNCRequest = rollbackData["rollbackActivateSDNCRequest"]
-					}
-
-			}
-
-			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)
-			execution.setVariable(Prefix + "rollbackActivateSDNCRequest", rollbackActivateSDNCRequest)
-			logger.debug("'rollbackData': " + '\n' + execution.getVariable("rollbackData"))
-
-			String sdncVersion = execution.getVariable("sdncVersion")
-			logger.debug("sdncVersion? : " + sdncVersion)
-
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-
-			} catch (IOException ex) {
-				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
-				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				logger.debug(dataErrorMessage )
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			logger.debug("*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"))
-			if(execution.getVariable(Prefix + "WorkflowException") != null) {
-				// called by: DoCreateNetworkInstance, partial rollback
-				execution.setVariable(Prefix + "fullRollback", false)
-
-			} else {
-			   // called by: Macro - Full Rollback, WorkflowException = null
-			   execution.setVariable(Prefix + "fullRollback", true)
-
-			}
-			logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
-
-
-		} catch (BpmnError e) {
-		throw e;
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callPONetworkAdapter (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside callPONetworkAdapter() of " + className + "")
-
-		try {
-			String poUrl = UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint",execution)
-			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
-			String networkId = utils.getNodeText(rollbackSDNCRequest, "network-id")
-
-			String rollbackNetworkRequest  = execution.getVariable(Prefix + "rollbackNetworkRequest")
-
-			String urlRollbackPoNetwork = poUrl+ "/" + networkId + "/rollback"
-			logger.debug("'urlRollbackPoNetwork': " + urlRollbackPoNetwork)
-			execution.setVariable(Prefix + "urlRollbackPoNetwork", urlRollbackPoNetwork)
-
-			URL url = new URL(urlRollbackPoNetwork)
-			HttpClient httpClient = new HttpClientFactory().newXmlClient(url, ONAPComponents.OPENSTACK_ADAPTER)
-			httpClient.addAdditionalHeader("Authorization", execution.getVariable("BasicAuthHeaderValuePO"))
-			Response response = httpClient.delete(rollbackNetworkRequest)
-
-			execution.setVariable(Prefix + "rollbackNetworkReturnCode", response.getStatus())
-
-			logger.debug(" Network Adapter rollback responseCode: " + response.getStatus())
-
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Exception Encountered in callPONetworkAdapter() of DoCreateNetworkInstanceRollback flow - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-		}
-
-	}
-
-
-	public void validateRollbackResponses (DelegateExecution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside validateRollbackResponses() of DoCreateNetworkInstanceRollback")
-
-		try {
-			// validate PO network rollback response
-			String rollbackNetworkErrorMessages = ""
-			String rollbackNetworkReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {
-				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")
-				logger.debug(" NetworkRollback Code - " + rollbackNetworkReturnCode)
-				if (rollbackNetworkReturnCode != "200") {
-					rollbackNetworkErrorMessages = " + PO Network rollback failed. "
-				} else {
-					rollbackNetworkErrorMessages = " + PO Network rollback completed."
-				}
-			}
-
-			// validate SDNC rollback response
-			String rollbackSdncErrorMessages = ""
-			String rollbackSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {
-				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")
-				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")
-				String rollbackSDNCReturnInnerCode = ""
-				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-				rollbackSDNCResponse = rollbackSDNCResponse
-				rollbackSDNCResponse = rollbackSDNCResponse.replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
-						rollbackSDNCReturnInnerCode = utils.getNodeText(rollbackSDNCResponse, "response-code")
-						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
-						    rollbackSdncErrorMessages = " + SNDC assign rollback completed."
-						} else {
-							rollbackSdncErrorMessages = " + SDNC assign rollback failed. "
-						}
-					} else {
-						  rollbackSdncErrorMessages = " + SNDC assign rollback completed."
-					}
-				 } else {
-					  rollbackSdncErrorMessages = " + SDNC assign rollback failed. "
-			     }
-				logger.debug(" SDNC assign rollback Code - " + rollbackSDNCReturnCode)
-				logger.debug(" SDNC assign rollback  Response - " + rollbackSDNCResponse)
-			}
-
-			// validate SDNC activate rollback response
-			String rollbackActivateSdncErrorMessages = ""
-			String rollbackActivateSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackActivateSDNCRequest") != null) {
-				rollbackActivateSDNCReturnCode = execution.getVariable(Prefix + "rollbackActivateSDNCReturnCode")
-				String rollbackActivateSDNCResponse = execution.getVariable(Prefix + "rollbackActivateSDNCResponse")
-				String rollbackActivateSDNCReturnInnerCode = ""
-				rollbackActivateSDNCResponse = rollbackActivateSDNCResponse
-				rollbackActivateSDNCResponse = rollbackActivateSDNCResponse.replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackActivateSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackActivateSDNCResponse, "response-code")) {
-						rollbackActivateSDNCReturnInnerCode = utils.getNodeText(rollbackActivateSDNCResponse, "response-code")
-						if (rollbackActivateSDNCReturnInnerCode == "200" || rollbackActivateSDNCReturnInnerCode == "" || rollbackActivateSDNCReturnInnerCode == "0") {
-						   rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."
-						} else {
-							rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "
-						}
-					} else {
-						 rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."
-					}
-				} else {
-					  rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "
-				}
-				logger.debug(" SDNC activate rollback Code - " + rollbackActivateSDNCReturnCode)
-				logger.debug(" SDNC activate rollback  Response - " + rollbackActivateSDNCResponse)
-			}
-
-
-			String statusMessage = ""
-			int errorCode = 7000
-			logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
-			if (execution.getVariable(Prefix + "fullRollback") == false) {
-				// original WorkflowException,
-				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException")
-				if (wfe != null) {
-				   // rollback due to failure in DoCreate - Partial rollback
-				   statusMessage = wfe.getErrorMessage()
-				   errorCode = wfe.getErrorCode()
-				} else {
-				   statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-				   errorCode = '7000'
-			    }
-
-				// set if all rolledbacks are successful
-				if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {
-					execution.setVariable("rolledBack", true)
-					execution.setVariable("wasDeleted", true)
-
-				} else {
-					execution.setVariable("rolledBack", false)
-					execution.setVariable("wasDeleted", true)
-				}
-
-				statusMessage = statusMessage + rollbackActivateSdncErrorMessages + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
-				logger.debug("Final DoCreateNetworkInstanceRollback status message: " + statusMessage)
-				String processKey = getProcessKey(execution);
-				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);
-				execution.setVariable("workflowException", exception);
-
-			} else {
-				// rollback due to failures in Main flow (Macro) - Full rollback
-				// WorkflowException = null
-			    if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {
-					execution.setVariable("rollbackSuccessful", true)
-					execution.setVariable("rollbackError", false)
-			    } else {
-				    String exceptionMessage = "Network Create Rollback was not Successful. "
+    String Prefix="CRENWKIR_"
+    ExceptionUtil exceptionUtil = new ExceptionUtil()
+    JsonUtils jsonUtil = new JsonUtils()
+    VidUtils vidUtils = new VidUtils(this)
+    NetworkUtils networkUtils = new NetworkUtils()
+    SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+
+    def className = getClass().getSimpleName()
+
+    /**
+     * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
+     * @param execution
+     */
+    public InitializeProcessVariables(DelegateExecution execution){
+        /* Initialize all the process variables in this block */
+
+        execution.setVariable(Prefix + "rollbackNetworkRequest", null)
+        execution.setVariable(Prefix + "rollbackSDNCRequest", null)
+        execution.setVariable(Prefix + "rollbackActivateSDNCRequest", null)
+        execution.setVariable(Prefix + "WorkflowException", null)
+
+        execution.setVariable(Prefix + "rollbackNetworkRequest", "")
+        execution.setVariable(Prefix + "rollbackNetworkResponse", "")
+        execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
+
+        execution.setVariable(Prefix + "rollbackSDNCRequest", "")
+        execution.setVariable(Prefix + "rollbackSDNCResponse", "")
+        execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
+
+        execution.setVariable(Prefix + "rollbackActivateSDNCRequest", "")
+        execution.setVariable(Prefix + "rollbackActivateSDNCResponse", "")
+        execution.setVariable(Prefix + "rollbackActivateSDNCReturnCode", "")
+
+        execution.setVariable(Prefix + "Success", false)
+        execution.setVariable(Prefix + "fullRollback", false)
+        execution.setVariable(Prefix + "networkId", "")
+        execution.setVariable(Prefix + "urlRollbackPoNetwork", "")
+    }
+
+    // **************************************************
+    //     Pre or Prepare Request Section
+    // **************************************************
+    /**
+     * This method is executed during the preProcessRequest task of the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
+     * @param execution
+     */
+    public void preProcessRequest (DelegateExecution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside preProcessRequest() of " + className + ".groovy")
+
+        try {
+            // initialize flow variables
+            InitializeProcessVariables(execution)
+
+            // GET Incoming request/variables
+            String rollbackNetworkRequest = null
+            String rollbackSDNCRequest = null
+            String rollbackActivateSDNCRequest = null
+
+            // Partial Rollback
+            Map<String, String> rollbackData = execution.getVariable("rollbackData")
+            if (rollbackData != null && rollbackData instanceof Map) {
+
+                if(rollbackData.containsKey("rollbackSDNCRequest")) {
+                    rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]
+                }
+
+                if(rollbackData.containsKey("rollbackNetworkRequest")) {
+                    rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]
+                }
+
+                if(rollbackData.containsKey("rollbackActivateSDNCRequest")) {
+                    rollbackActivateSDNCRequest = rollbackData["rollbackActivateSDNCRequest"]
+                }
+
+            }
+
+            execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)
+            execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)
+            execution.setVariable(Prefix + "rollbackActivateSDNCRequest", rollbackActivateSDNCRequest)
+            logger.debug("'rollbackData': " + '\n' + execution.getVariable("rollbackData"))
+
+            String sdncVersion = execution.getVariable("sdncVersion")
+            logger.debug("sdncVersion? : " + sdncVersion)
+
+            // PO Authorization Info / headers Authorization=
+            String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
+            try {
+                def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
+                execution.setVariable("BasicAuthHeaderValuePO",encodedString)
+                execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
+
+            } catch (IOException ex) {
+                String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
+                String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
+                logger.debug(dataErrorMessage )
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            }
+
+            if (execution.getVariable("SavedWorkflowException1") != null) {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
+            } else {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+            }
+            logger.debug("*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"))
+            if(execution.getVariable(Prefix + "WorkflowException") != null) {
+                // called by: DoCreateNetworkInstance, partial rollback
+                execution.setVariable(Prefix + "fullRollback", false)
+
+            } else {
+                // called by: Macro - Full Rollback, WorkflowException = null
+                execution.setVariable(Prefix + "fullRollback", true)
+
+            }
+            logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
+
+
+        } catch (BpmnError e) {
+            throw e;
+
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+    }
+
+    public void setNetworkAdapterResponseCode (DelegateExecution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        execution.setVariable("prefix",Prefix)
+        try {
+
+            execution.setVariable(Prefix + "rollbackNetworkReturnCode", "200")
+
+        } catch (Exception ex) {
+            String exceptionMessage = "Exception Encountered in callPONetworkAdapter() of DoCreateNetworkInstanceRollback flow - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        }
+
+    }
+
+
+    public void validateRollbackResponses (DelegateExecution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside validateRollbackResponses() of DoCreateNetworkInstanceRollback")
+
+        try {
+            // validate PO network rollback response
+            String rollbackNetworkErrorMessages = ""
+            String rollbackNetworkReturnCode = "200"
+            if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {
+                rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")
+                logger.debug(" NetworkRollback Code - " + rollbackNetworkReturnCode)
+                if (rollbackNetworkReturnCode != "200") {
+                    rollbackNetworkErrorMessages = " + PO Network rollback failed. "
+                } else {
+                    rollbackNetworkErrorMessages = " + PO Network rollback completed."
+                }
+            }
+
+            // validate SDNC rollback response
+            String rollbackSdncErrorMessages = ""
+            String rollbackSDNCReturnCode = "200"
+            if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {
+                rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")
+                String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")
+                String rollbackSDNCReturnInnerCode = ""
+                SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+                rollbackSDNCResponse = rollbackSDNCResponse
+                rollbackSDNCResponse = rollbackSDNCResponse.replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+                if (rollbackSDNCReturnCode == "200") {
+                    if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
+                        rollbackSDNCReturnInnerCode = utils.getNodeText(rollbackSDNCResponse, "response-code")
+                        if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
+                            rollbackSdncErrorMessages = " + SNDC assign rollback completed."
+                        } else {
+                            rollbackSdncErrorMessages = " + SDNC assign rollback failed. "
+                        }
+                    } else {
+                        rollbackSdncErrorMessages = " + SNDC assign rollback completed."
+                    }
+                } else {
+                    rollbackSdncErrorMessages = " + SDNC assign rollback failed. "
+                }
+                logger.debug(" SDNC assign rollback Code - " + rollbackSDNCReturnCode)
+                logger.debug(" SDNC assign rollback  Response - " + rollbackSDNCResponse)
+            }
+
+            // validate SDNC activate rollback response
+            String rollbackActivateSdncErrorMessages = ""
+            String rollbackActivateSDNCReturnCode = "200"
+            if (execution.getVariable(Prefix + "rollbackActivateSDNCRequest") != null) {
+                rollbackActivateSDNCReturnCode = execution.getVariable(Prefix + "rollbackActivateSDNCReturnCode")
+                String rollbackActivateSDNCResponse = execution.getVariable(Prefix + "rollbackActivateSDNCResponse")
+                String rollbackActivateSDNCReturnInnerCode = ""
+                rollbackActivateSDNCResponse = rollbackActivateSDNCResponse
+                rollbackActivateSDNCResponse = rollbackActivateSDNCResponse.replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+                if (rollbackActivateSDNCReturnCode == "200") {
+                    if (utils.nodeExists(rollbackActivateSDNCResponse, "response-code")) {
+                        rollbackActivateSDNCReturnInnerCode = utils.getNodeText(rollbackActivateSDNCResponse, "response-code")
+                        if (rollbackActivateSDNCReturnInnerCode == "200" || rollbackActivateSDNCReturnInnerCode == "" || rollbackActivateSDNCReturnInnerCode == "0") {
+                            rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."
+                        } else {
+                            rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "
+                        }
+                    } else {
+                        rollbackActivateSdncErrorMessages = " + SNDC activate rollback completed."
+                    }
+                } else {
+                    rollbackActivateSdncErrorMessages = " + SDNC activate rollback failed. "
+                }
+                logger.debug(" SDNC activate rollback Code - " + rollbackActivateSDNCReturnCode)
+                logger.debug(" SDNC activate rollback  Response - " + rollbackActivateSDNCResponse)
+            }
+
+
+            String statusMessage = ""
+            int errorCode = 7000
+            logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
+            if (execution.getVariable(Prefix + "fullRollback") == false) {
+                // original WorkflowException,
+                WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException")
+                if (wfe != null) {
+                    // rollback due to failure in DoCreate - Partial rollback
+                    statusMessage = wfe.getErrorMessage()
+                    errorCode = wfe.getErrorCode()
+                } else {
+                    statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
+                    errorCode = '7000'
+                }
+
+                // set if all rolledbacks are successful
+                if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {
+                    execution.setVariable("rolledBack", true)
+                    execution.setVariable("wasDeleted", true)
+
+                } else {
+                    execution.setVariable("rolledBack", false)
+                    execution.setVariable("wasDeleted", true)
+                }
+
+                statusMessage = statusMessage + rollbackActivateSdncErrorMessages + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
+                logger.debug("Final DoCreateNetworkInstanceRollback status message: " + statusMessage)
+                String processKey = getProcessKey(execution);
+                WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);
+                execution.setVariable("workflowException", exception);
+
+            } else {
+                // rollback due to failures in Main flow (Macro) - Full rollback
+                // WorkflowException = null
+                if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200" && rollbackActivateSDNCReturnCode == "200") {
+                    execution.setVariable("rollbackSuccessful", true)
+                    execution.setVariable("rollbackError", false)
+                } else {
+                    String exceptionMessage = "Network Create Rollback was not Successful. "
                     logger.debug(exceptionMessage)
-					execution.setVariable("rollbackSuccessful", false)
-				    execution.setVariable("rollbackError", true)
-					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-					throw new BpmnError("MSOWorkflowException")
-			    }
+                    execution.setVariable("rollbackSuccessful", false)
+                    execution.setVariable("rollbackError", true)
+                    exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+                    throw new BpmnError("MSOWorkflowException")
+                }
 
-			}
+            }
 
 
-		} catch (Exception ex) {
-			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-			String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
+            String exceptionMessage = " Bpmn error encountered in DoCreateNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	// *******************************
-	//     Build Error Section
-	// *******************************
+    // *******************************
+    //     Build Error Section
+    // *******************************
 
 
 
-	public void processJavaException(DelegateExecution execution){
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		execution.setVariable("prefix",Prefix)
+    public void processJavaException(DelegateExecution execution){
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        execution.setVariable("prefix",Prefix)
 
-		try{
-			logger.debug("Caught a Java Exception in " + Prefix)
-			logger.debug("Started processJavaException Method")
-			logger.debug("Variables List: " + execution.getVariables())
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
+        try{
+            logger.debug("Caught a Java Exception in " + Prefix)
+            logger.debug("Started processJavaException Method")
+            logger.debug("Variables List: " + execution.getVariables())
+            execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+            exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
 
-		}catch(Exception e){
-			logger.debug("Caught Exception during processJavaException Method: " + e)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
-		}
-		logger.debug("Completed processJavaException Method in " + Prefix)
-	}
+        }catch(Exception e){
+            logger.debug("Caught Exception during processJavaException Method: " + e)
+            execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+            exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
+        }
+        logger.debug("Completed processJavaException Method in " + Prefix)
+    }
 
 }
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
index 89c5be8d6e..0d49d91910 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstance.groovy
@@ -59,346 +59,346 @@ import javax.ws.rs.core.Response
 public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
     private static final Logger logger = LoggerFactory.getLogger( DoDeleteNetworkInstance.class);
 
-	String Prefix= "DELNWKI_"
-	String groovyClassName = "DoDeleteNetworkInstance"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	public InitializeProcessVariables(DelegateExecution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable(Prefix + "networkRequest", "")
-		execution.setVariable(Prefix + "isSilentSuccess", false)
-		execution.setVariable(Prefix + "Success", false)
-
-		execution.setVariable(Prefix + "requestId", "")
-		execution.setVariable(Prefix + "source", "")
-		execution.setVariable(Prefix + "lcpCloudRegion", "")
-		execution.setVariable(Prefix + "networkInputs", "")
-		execution.setVariable(Prefix + "tenantId", "")
-
-		execution.setVariable(Prefix + "queryAAIResponse", "")
-		execution.setVariable(Prefix + "aaiReturnCode", "")
-		execution.setVariable(Prefix + "isAAIGood", false)
-		execution.setVariable(Prefix + "isVfRelationshipExist", false)
-
-		// AAI query Cloud Region
-		execution.setVariable(Prefix + "queryCloudRegionRequest","")
-		execution.setVariable(Prefix + "queryCloudRegionReturnCode","")
-		execution.setVariable(Prefix + "queryCloudRegionResponse","")
-		execution.setVariable(Prefix + "cloudRegionPo","")
-		execution.setVariable(Prefix + "cloudRegionSdnc","")
-
-		execution.setVariable(Prefix + "deleteNetworkRequest", "")
-		execution.setVariable(Prefix + "deleteNetworkResponse", "")
-		execution.setVariable(Prefix + "networkReturnCode", "")
-		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
-
-		execution.setVariable(Prefix + "deleteSDNCRequest", "")
-		execution.setVariable(Prefix + "deleteSDNCResponse", "")
-		execution.setVariable(Prefix + "sdncReturnCode", "")
-		execution.setVariable(Prefix + "sdncResponseSuccess", false)
-
-		execution.setVariable(Prefix + "deactivateSDNCRequest", "")
-		execution.setVariable(Prefix + "deactivateSDNCResponse", "")
-		execution.setVariable(Prefix + "deactivateSdncReturnCode", "")
-		execution.setVariable(Prefix + "isSdncDeactivateRollbackNeeded", "")
-
-		execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", "")
-		execution.setVariable(Prefix + "isException", false)
-
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-
-	public void preProcessRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside preProcessRequest() of " + groovyClassName + " Request ")
-
-		// initialize flow variables
-		InitializeProcessVariables(execution)
-
-		try {
-			// get incoming message/input
-			execution.setVariable("action", "DELETE")
-			String deleteNetwork = execution.getVariable("bpmnRequest")
-			if (deleteNetwork != null) {
-				if (deleteNetwork.contains("requestDetails")) {
-					// JSON format request is sent, create xml
-					try {
-						def prettyJson = JsonOutput.prettyPrint(deleteNetwork.toString())
-						logger.debug(" Incoming message formatted . . . : " + '\n' + prettyJson)
-						deleteNetwork =  vidUtils.createXmlNetworkRequestInfra(execution, deleteNetwork)
-
-					} catch (Exception ex) {
-						String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
-						logger.debug(dataErrorMessage)
-						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-					}
-				} else {
-	 				   // XML format request is sent
-
-				}
-			} else {
-					// vIPR format request is sent, create xml from individual variables
-				deleteNetwork = vidUtils.createXmlNetworkRequestInstance(execution)
-			}
-
-			deleteNetwork = utils.formatXml(deleteNetwork)
-			logger.debug(deleteNetwork)
-			execution.setVariable(Prefix + "networkRequest", deleteNetwork)
-			logger.debug(Prefix + "networkRequest - " + '\n' + deleteNetwork)
-
-			// validate 'backout-on-failure' to override 'mso.rollback'
-			boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, deleteNetwork)
-			execution.setVariable(Prefix + "rollbackEnabled", rollbackEnabled)
-			logger.debug(Prefix + "rollbackEnabled - " + rollbackEnabled)
-
-			String networkInputs = utils.getNodeXml(deleteNetwork, "network-inputs", false).replace("tag0:","").replace(":tag0","")
-			execution.setVariable(Prefix + "networkInputs", networkInputs)
-
-			// prepare messageId
-			String messageId = execution.getVariable("testMessageId")  // for testing
-			if (messageId == null || messageId == "") {
-					messageId = UUID.randomUUID()
-					logger.debug(Prefix + "messageId, random generated: " + messageId)
-			} else {
-					logger.debug(Prefix + "messageId, pre-assigned: " + messageId)
-			}
-			execution.setVariable(Prefix + "messageId", messageId)
-
-			String source = utils.getNodeText(deleteNetwork, "source")
-			execution.setVariable(Prefix + "source", source)
-			logger.debug(Prefix + "source - " + source)
-
-			String networkId = ""
-			if (utils.nodeExists(networkInputs, "network-id")) {
-				networkId = utils.getNodeText(networkInputs, "network-id")
-				if (networkId == null || networkId == "" || networkId == 'null' ) {
-					sendSyncError(execution)
-					// missing value of network-id
-					String dataErrorMessage = "network-request has missing 'network-id' element/value."
-					logger.debug(" Invalid Request - " + dataErrorMessage)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-				}
-			}
-
-			// lcpCloudRegion or tenantId not sent, will be extracted from query AA&I
-			def lcpCloudRegion = null
-			if (utils.nodeExists(networkInputs, "aic-cloud-region")) {
-				lcpCloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
-				if (lcpCloudRegion == 'null') {
-					lcpCloudRegion = null
-				}
-			}
-			execution.setVariable(Prefix + "lcpCloudRegion", lcpCloudRegion)
-			logger.debug("lcpCloudRegion : " + lcpCloudRegion)
-
-			String tenantId = null
-			if (utils.nodeExists(networkInputs, "tenant-id")) {
-				tenantId = utils.getNodeText(networkInputs, "tenant-id")
-				if (tenantId == 'null') {
-					tenantId = null
-				}
-
-			}
-			execution.setVariable(Prefix + "tenantId", tenantId)
-			logger.debug("tenantId : " + tenantId)
-
-			String sdncVersion = execution.getVariable("sdncVersion")
-			logger.debug("sdncVersion? : " + sdncVersion)
-
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth", execution)
-
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-
-			} catch (IOException ex) {
-				String dataErrorMessage = " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				logger.debug(dataErrorMessage )
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-
-		} catch (Exception ex){
-			 // caught exception
-			String exceptionMessage = "Exception Encountered in DoDeleteNetworkInstance, PreProcessRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-
-	public void callRESTQueryAAI (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.debug(" ***** Inside callRESTQueryAAI() of DoDoDeleteNetworkInstance ***** " )
-
-		// get variables
-		String networkInputs  = execution.getVariable(Prefix + "networkInputs")
-		String networkId   = utils.getNodeText(networkInputs, "network-id")
-		networkId = UriUtils.encode(networkId,"UTF-8")
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		Boolean isVfRelationshipExist = false
-		try {
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ALL)
-			Optional<L3Network> l3Network = getAAIClient().get(L3Network.class,uri);
-			AAIResultWrapper wrapper = getAAIClient().get(uri);
-			Optional<Relationships> relationships = wrapper.getRelationships()
-
-			if (l3Network.isPresent()) {
-				execution.setVariable(Prefix + "aaiReturnCode", 200)
-				execution.setVariable(Prefix + "queryAAIResponse", l3Network.get())
-				execution.setVariable(Prefix + "isAAIGood", true)
-				if (relationships.isPresent()){
-					if(!relationships.get().getRelatedAAIUris(AAIObjectType.VF_MODULE).isEmpty()){
-						execution.setVariable(Prefix + "isVfRelationshipExist", true)
-						isVfRelationshipExist = true
-						String relationshipMessage = "AAI Query Success Response but 'vf-module' relationship exist, not allowed to delete: network Id: " + networkId
-						exceptionUtil.buildWorkflowException(execution, 2500, relationshipMessage)
-					}else{
-						List<AAIResourceUri> tenantURIList = relationships.get().getRelatedAAIUris(AAIObjectType.TENANT)
-						for(AAIResourceUri tenantURI: tenantURIList){
-							if(execution.getVariable(Prefix + "tenantId") == null) {
-								String tenantId = tenantURI.getURIKeys().get("tenant-id")
-								execution.setVariable(Prefix + "tenantId", tenantId)
-								logger.debug(" Get AAI getTenantId()  : " + tenantId)
-							}
-						}
-						List<AAIResourceUri> cloudRegionURIList = relationships.get().getRelatedAAIUris(AAIObjectType.CLOUD_REGION)
-						for(AAIResourceUri tenantURI: cloudRegionURIList){
-							if(execution.getVariable(Prefix + "lcpCloudRegion") == null) {
-								String lcpCloudRegion = tenantURI.getURIKeys().get("cloud-region-id")
-								execution.setVariable(Prefix + "lcpCloudRegion", lcpCloudRegion)
-								logger.debug(" Get AAI getCloudRegion()  : " + lcpCloudRegion)
-							}
-						}
-					}
-				}
-				logger.debug(Prefix + "isVfRelationshipExist - " + isVfRelationshipExist)
-			} else {
-				// not found // empty aai response
-				execution.setVariable(Prefix + "aaiReturnCode", 404)
-				execution.setVariable(Prefix + "isAAIGood", false)
-				execution.setVariable(Prefix + "isSilentSuccess", true)
-				logger.debug(" AAI Query is Silent Success")
-			}
-			logger.debug(" AAI Query call, isAAIGood? : " + execution.getVariable(Prefix + "isAAIGood"))
-		} catch (Exception ex) {
-		   // caught exception
-		   String exceptionMessage = "Exception Encountered in DoDeleteNetworkInstance, callRESTQueryAAI() - " + ex.getMessage()
-		   logger.debug(exceptionMessage)
-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTQueryAAICloudRegion (DelegateExecution execution) {
-
-		execution.setVariable("prefix", Prefix)
-
-		logger.debug(" ***** Inside callRESTQueryAAICloudRegion of DoDeleteNetworkInstance ***** " )
-
-		try {
-			String networkInputs  = execution.getVariable(Prefix + "networkInputs")
-			// String cloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
-			String cloudRegion = execution.getVariable(Prefix + "lcpCloudRegion")
-			// Prepare AA&I url
-			AaiUtil aaiUtil = new AaiUtil(this)
-
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, Defaults.CLOUD_OWNER.toString(), cloudRegion)
-			def queryCloudRegionRequest = aaiUtil.createAaiUri(uri)
-
-			execution.setVariable(Prefix + "queryCloudRegionRequest", queryCloudRegionRequest)
-
-			String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
-			String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
-
-			if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
-				execution.setVariable(Prefix + "cloudRegionPo", cloudRegionPo)
-				execution.setVariable(Prefix + "cloudRegionSdnc", cloudRegionSdnc)
-
-			} else {
-				String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable(Prefix + "queryCloudRegionReturnCode")
-				logger.debug(dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-			}
-
-		} catch (BpmnError e) {
-		throw e;
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, callRESTQueryAAICloudRegion(). Unexpected Response from AAI - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void prepareNetworkRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix", Prefix)
-
-		logger.trace("Inside prepareNetworkRequest of DoDeleteNetworkInstance ")
-		ExceptionUtil exceptionUtil = new ExceptionUtil()
-		try {
-			// get variables
-			String networkRequest = execution.getVariable(Prefix + "networkRequest")
-			String cloudSiteId = execution.getVariable(Prefix + "cloudRegionPo")
-			String tenantId = execution.getVariable(Prefix + "tenantId")
-
-			L3Network l3Network = execution.getVariable(Prefix + "queryAAIResponse")
-			String networkType = l3Network.getNetworkType()
-			String networkId = l3Network.getNetworkId()
-
-			String networkStackId = ""
-			networkStackId = l3Network.getHeatStackId()
-			if (networkStackId == 'null' || networkStackId == "" || networkStackId == null) {
-				networkStackId = "force_delete"
-			}
-
-			String requestId = execution.getVariable("msoRequestId")
-			if (requestId != null) {
-				execution.setVariable("mso-request-id", requestId)
-			} else {
-				requestId = execution.getVariable("mso-request-id")
-			}
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-			// Added new Elements
-			String messageId = execution.getVariable(Prefix + "messageId")
-			String notificationUrl = ""                                   //TODO - is this coming from URN? What variable/value to use?
-			//String notificationUrl = execution.getVariable("URN_?????") //TODO - is this coming from URN? What variable/value to use?
-
-			String modelCustomizationUuid = ""
-			if (utils.nodeExists(networkRequest, "networkModelInfo")) {
-				String networkModelInfo = utils.getNodeXml(networkRequest, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")
-				modelCustomizationUuid = utils.getNodeText(networkModelInfo, "modelCustomizationUuid")
-			} else {
-			    modelCustomizationUuid = utils.getNodeText(networkRequest, "modelCustomizationId")
-			}
+    String Prefix= "DELNWKI_"
+    String groovyClassName = "DoDeleteNetworkInstance"
+    ExceptionUtil exceptionUtil = new ExceptionUtil()
+    JsonUtils jsonUtil = new JsonUtils()
+    VidUtils vidUtils = new VidUtils(this)
+    NetworkUtils networkUtils = new NetworkUtils()
+    SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+
+    public InitializeProcessVariables(DelegateExecution execution){
+        /* Initialize all the process variables in this block */
+
+        execution.setVariable(Prefix + "networkRequest", "")
+        execution.setVariable(Prefix + "isSilentSuccess", false)
+        execution.setVariable(Prefix + "Success", false)
+
+        execution.setVariable(Prefix + "requestId", "")
+        execution.setVariable(Prefix + "source", "")
+        execution.setVariable(Prefix + "lcpCloudRegion", "")
+        execution.setVariable(Prefix + "networkInputs", "")
+        execution.setVariable(Prefix + "tenantId", "")
+
+        execution.setVariable(Prefix + "queryAAIResponse", "")
+        execution.setVariable(Prefix + "aaiReturnCode", "")
+        execution.setVariable(Prefix + "isAAIGood", false)
+        execution.setVariable(Prefix + "isVfRelationshipExist", false)
+
+        // AAI query Cloud Region
+        execution.setVariable(Prefix + "queryCloudRegionRequest","")
+        execution.setVariable(Prefix + "queryCloudRegionReturnCode","")
+        execution.setVariable(Prefix + "queryCloudRegionResponse","")
+        execution.setVariable(Prefix + "cloudRegionPo","")
+        execution.setVariable(Prefix + "cloudRegionSdnc","")
+
+        execution.setVariable(Prefix + "deleteNetworkRequest", "")
+        execution.setVariable(Prefix + "deleteNetworkResponse", "")
+        execution.setVariable(Prefix + "networkReturnCode", "")
+        execution.setVariable(Prefix + "rollbackNetworkRequest", "")
+
+        execution.setVariable(Prefix + "deleteSDNCRequest", "")
+        execution.setVariable(Prefix + "deleteSDNCResponse", "")
+        execution.setVariable(Prefix + "sdncReturnCode", "")
+        execution.setVariable(Prefix + "sdncResponseSuccess", false)
+
+        execution.setVariable(Prefix + "deactivateSDNCRequest", "")
+        execution.setVariable(Prefix + "deactivateSDNCResponse", "")
+        execution.setVariable(Prefix + "deactivateSdncReturnCode", "")
+        execution.setVariable(Prefix + "isSdncDeactivateRollbackNeeded", "")
+
+        execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", "")
+        execution.setVariable(Prefix + "isException", false)
+
+
+    }
+
+    // **************************************************
+    //     Pre or Prepare Request Section
+    // **************************************************
+
+    public void preProcessRequest (DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside preProcessRequest() of " + groovyClassName + " Request ")
+
+        // initialize flow variables
+        InitializeProcessVariables(execution)
+
+        try {
+            // get incoming message/input
+            execution.setVariable("action", "DELETE")
+            String deleteNetwork = execution.getVariable("bpmnRequest")
+            if (deleteNetwork != null) {
+                if (deleteNetwork.contains("requestDetails")) {
+                    // JSON format request is sent, create xml
+                    try {
+                        def prettyJson = JsonOutput.prettyPrint(deleteNetwork.toString())
+                        logger.debug(" Incoming message formatted . . . : " + '\n' + prettyJson)
+                        deleteNetwork =  vidUtils.createXmlNetworkRequestInfra(execution, deleteNetwork)
+
+                    } catch (Exception ex) {
+                        String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
+                        logger.debug(dataErrorMessage)
+                        exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                    }
+                } else {
+                    // XML format request is sent
+
+                }
+            } else {
+                // vIPR format request is sent, create xml from individual variables
+                deleteNetwork = vidUtils.createXmlNetworkRequestInstance(execution)
+            }
+
+            deleteNetwork = utils.formatXml(deleteNetwork)
+            logger.debug(deleteNetwork)
+            execution.setVariable(Prefix + "networkRequest", deleteNetwork)
+            logger.debug(Prefix + "networkRequest - " + '\n' + deleteNetwork)
+
+            // validate 'backout-on-failure' to override 'mso.rollback'
+            boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, deleteNetwork)
+            execution.setVariable(Prefix + "rollbackEnabled", rollbackEnabled)
+            logger.debug(Prefix + "rollbackEnabled - " + rollbackEnabled)
+
+            String networkInputs = utils.getNodeXml(deleteNetwork, "network-inputs", false).replace("tag0:","").replace(":tag0","")
+            execution.setVariable(Prefix + "networkInputs", networkInputs)
+
+            // prepare messageId
+            String messageId = execution.getVariable("testMessageId")  // for testing
+            if (messageId == null || messageId == "") {
+                messageId = UUID.randomUUID()
+                logger.debug(Prefix + "messageId, random generated: " + messageId)
+            } else {
+                logger.debug(Prefix + "messageId, pre-assigned: " + messageId)
+            }
+            execution.setVariable(Prefix + "messageId", messageId)
+
+            String source = utils.getNodeText(deleteNetwork, "source")
+            execution.setVariable(Prefix + "source", source)
+            logger.debug(Prefix + "source - " + source)
+
+            String networkId = ""
+            if (utils.nodeExists(networkInputs, "network-id")) {
+                networkId = utils.getNodeText(networkInputs, "network-id")
+                if (networkId == null || networkId == "" || networkId == 'null' ) {
+                    sendSyncError(execution)
+                    // missing value of network-id
+                    String dataErrorMessage = "network-request has missing 'network-id' element/value."
+                    logger.debug(" Invalid Request - " + dataErrorMessage)
+                    exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                }
+            }
+
+            // lcpCloudRegion or tenantId not sent, will be extracted from query AA&I
+            def lcpCloudRegion = null
+            if (utils.nodeExists(networkInputs, "aic-cloud-region")) {
+                lcpCloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
+                if (lcpCloudRegion == 'null') {
+                    lcpCloudRegion = null
+                }
+            }
+            execution.setVariable(Prefix + "lcpCloudRegion", lcpCloudRegion)
+            logger.debug("lcpCloudRegion : " + lcpCloudRegion)
+
+            String tenantId = null
+            if (utils.nodeExists(networkInputs, "tenant-id")) {
+                tenantId = utils.getNodeText(networkInputs, "tenant-id")
+                if (tenantId == 'null') {
+                    tenantId = null
+                }
+
+            }
+            execution.setVariable(Prefix + "tenantId", tenantId)
+            logger.debug("tenantId : " + tenantId)
+
+            String sdncVersion = execution.getVariable("sdncVersion")
+            logger.debug("sdncVersion? : " + sdncVersion)
+
+            // PO Authorization Info / headers Authorization=
+            String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth", execution)
+
+            try {
+                def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
+                execution.setVariable("BasicAuthHeaderValuePO",encodedString)
+                execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
+
+            } catch (IOException ex) {
+                String dataErrorMessage = " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
+                logger.debug(dataErrorMessage )
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            }
+
+        } catch (BpmnError e) {
+            throw e;
+
+        } catch (Exception ex){
+            // caught exception
+            String exceptionMessage = "Exception Encountered in DoDeleteNetworkInstance, PreProcessRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-			String deleteNetworkRequest = """
+        }
+
+    }
+
+
+    public void callRESTQueryAAI (DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.debug(" ***** Inside callRESTQueryAAI() of DoDoDeleteNetworkInstance ***** " )
+
+        // get variables
+        String networkInputs  = execution.getVariable(Prefix + "networkInputs")
+        String networkId   = utils.getNodeText(networkInputs, "network-id")
+        networkId = UriUtils.encode(networkId,"UTF-8")
+        ExceptionUtil exceptionUtil = new ExceptionUtil()
+        Boolean isVfRelationshipExist = false
+        try {
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ALL)
+            Optional<L3Network> l3Network = getAAIClient().get(L3Network.class,uri);
+            AAIResultWrapper wrapper = getAAIClient().get(uri);
+            Optional<Relationships> relationships = wrapper.getRelationships()
+
+            if (l3Network.isPresent()) {
+                execution.setVariable(Prefix + "aaiReturnCode", 200)
+                execution.setVariable(Prefix + "queryAAIResponse", l3Network.get())
+                execution.setVariable(Prefix + "isAAIGood", true)
+                if (relationships.isPresent()){
+                    if(!relationships.get().getRelatedAAIUris(AAIObjectType.VF_MODULE).isEmpty()){
+                        execution.setVariable(Prefix + "isVfRelationshipExist", true)
+                        isVfRelationshipExist = true
+                        String relationshipMessage = "AAI Query Success Response but 'vf-module' relationship exist, not allowed to delete: network Id: " + networkId
+                        exceptionUtil.buildWorkflowException(execution, 2500, relationshipMessage)
+                    }else{
+                        List<AAIResourceUri> tenantURIList = relationships.get().getRelatedAAIUris(AAIObjectType.TENANT)
+                        for(AAIResourceUri tenantURI: tenantURIList){
+                            if(execution.getVariable(Prefix + "tenantId") == null) {
+                                String tenantId = tenantURI.getURIKeys().get("tenant-id")
+                                execution.setVariable(Prefix + "tenantId", tenantId)
+                                logger.debug(" Get AAI getTenantId()  : " + tenantId)
+                            }
+                        }
+                        List<AAIResourceUri> cloudRegionURIList = relationships.get().getRelatedAAIUris(AAIObjectType.CLOUD_REGION)
+                        for(AAIResourceUri tenantURI: cloudRegionURIList){
+                            if(execution.getVariable(Prefix + "lcpCloudRegion") == null) {
+                                String lcpCloudRegion = tenantURI.getURIKeys().get("cloud-region-id")
+                                execution.setVariable(Prefix + "lcpCloudRegion", lcpCloudRegion)
+                                logger.debug(" Get AAI getCloudRegion()  : " + lcpCloudRegion)
+                            }
+                        }
+                    }
+                }
+                logger.debug(Prefix + "isVfRelationshipExist - " + isVfRelationshipExist)
+            } else {
+                // not found // empty aai response
+                execution.setVariable(Prefix + "aaiReturnCode", 404)
+                execution.setVariable(Prefix + "isAAIGood", false)
+                execution.setVariable(Prefix + "isSilentSuccess", true)
+                logger.debug(" AAI Query is Silent Success")
+            }
+            logger.debug(" AAI Query call, isAAIGood? : " + execution.getVariable(Prefix + "isAAIGood"))
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Exception Encountered in DoDeleteNetworkInstance, callRESTQueryAAI() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+    }
+
+    public void callRESTQueryAAICloudRegion (DelegateExecution execution) {
+
+        execution.setVariable("prefix", Prefix)
+
+        logger.debug(" ***** Inside callRESTQueryAAICloudRegion of DoDeleteNetworkInstance ***** " )
+
+        try {
+            String networkInputs  = execution.getVariable(Prefix + "networkInputs")
+            // String cloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
+            String cloudRegion = execution.getVariable(Prefix + "lcpCloudRegion")
+            // Prepare AA&I url
+            AaiUtil aaiUtil = new AaiUtil(this)
+
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, Defaults.CLOUD_OWNER.toString(), cloudRegion)
+            def queryCloudRegionRequest = aaiUtil.createAaiUri(uri)
+
+            execution.setVariable(Prefix + "queryCloudRegionRequest", queryCloudRegionRequest)
+
+            String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
+            String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
+
+            if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
+                execution.setVariable(Prefix + "cloudRegionPo", cloudRegionPo)
+                execution.setVariable(Prefix + "cloudRegionSdnc", cloudRegionSdnc)
+
+            } else {
+                String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable(Prefix + "queryCloudRegionReturnCode")
+                logger.debug(dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+            }
+
+        } catch (BpmnError e) {
+            throw e;
+
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, callRESTQueryAAICloudRegion(). Unexpected Response from AAI - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+        }
+
+    }
+
+    public void prepareNetworkRequest (DelegateExecution execution) {
+
+        execution.setVariable("prefix", Prefix)
+
+        logger.trace("Inside prepareNetworkRequest of DoDeleteNetworkInstance ")
+        ExceptionUtil exceptionUtil = new ExceptionUtil()
+        try {
+            // get variables
+            String networkRequest = execution.getVariable(Prefix + "networkRequest")
+            String cloudSiteId = execution.getVariable(Prefix + "cloudRegionPo")
+            String tenantId = execution.getVariable(Prefix + "tenantId")
+
+            L3Network l3Network = execution.getVariable(Prefix + "queryAAIResponse")
+            String networkType = l3Network.getNetworkType()
+            String networkId = l3Network.getNetworkId()
+
+            String networkStackId = ""
+            networkStackId = l3Network.getHeatStackId()
+            if (networkStackId == 'null' || networkStackId == "" || networkStackId == null) {
+                networkStackId = "force_delete"
+            }
+
+            String requestId = execution.getVariable("msoRequestId")
+            if (requestId != null) {
+                execution.setVariable("mso-request-id", requestId)
+            } else {
+                requestId = execution.getVariable("mso-request-id")
+            }
+            String serviceInstanceId = execution.getVariable("serviceInstanceId")
+
+            // Added new Elements
+            String messageId = execution.getVariable(Prefix + "messageId")
+            String notificationUrl = ""                                   //TODO - is this coming from URN? What variable/value to use?
+            //String notificationUrl = execution.getVariable("URN_?????") //TODO - is this coming from URN? What variable/value to use?
+
+            String modelCustomizationUuid = ""
+            if (utils.nodeExists(networkRequest, "networkModelInfo")) {
+                String networkModelInfo = utils.getNodeXml(networkRequest, "networkModelInfo", false).replace("tag0:","").replace(":tag0","")
+                modelCustomizationUuid = utils.getNodeText(networkModelInfo, "modelCustomizationUuid")
+            } else {
+                modelCustomizationUuid = utils.getNodeText(networkRequest, "modelCustomizationId")
+            }
+
+            String deleteNetworkRequest = """
 					  <deleteNetworkRequest>
 					    <cloudSiteId>${MsoUtils.xmlEscape(cloudSiteId)}</cloudSiteId>
 					    <tenantId>${MsoUtils.xmlEscape(tenantId)}</tenantId>
@@ -416,645 +416,567 @@ public class DoDeleteNetworkInstance extends AbstractServiceTaskProcessor {
 					  </deleteNetworkRequest>
 						""".trim()
 
-			logger.debug(Prefix + "deleteNetworkRequest - " + "\n" +  deleteNetworkRequest)
-			// Format Response
-			String buildDeleteNetworkRequestAsString = utils.formatXml(deleteNetworkRequest)
-			logger.debug(buildDeleteNetworkRequestAsString)
-			logger.debug(Prefix + "deleteNetworkRequestAsString - " + "\n" +  buildDeleteNetworkRequestAsString)
-
-			String restURL = UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)
-			execution.setVariable("mso.adapters.network.rest.endpoint", restURL + "/" + networkId)
-			logger.debug("mso.adapters.network.rest.endpoint - " + "\n" +  restURL + "/" + networkId)
-
-			execution.setVariable(Prefix + "deleteNetworkRequest", buildDeleteNetworkRequestAsString)
-			logger.debug(Prefix + "deleteNetworkRequest - " + "\n" +  buildDeleteNetworkRequestAsString)
-		}
-		catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareNetworkRequest(). Unexpected Response from AAI - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-	}
-
-	/**
-	 * This method is used instead of an HTTP Connector task because the
-	 * connector does not allow DELETE with a body.
-	 */
-	public void sendRequestToVnfAdapter(DelegateExecution execution) {
-		def method = getClass().getSimpleName() + '.sendRequestToVnfAdapter(' +
-			'execution=' + execution.getId() +
-			')'
-
-		logger.trace('Entered ' + method)
-
-		try {
-
-			String vnfAdapterUrl = UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint",execution)
-			String vnfAdapterRequest = execution.getVariable(Prefix + "deleteNetworkRequest")
-
-			URL url = new URL(vnfAdapterUrl)
-			HttpClient httpClient = new HttpClientFactory().newXmlClient(url, ONAPComponents.OPENSTACK_ADAPTER)
-			httpClient.accept = "application/xml"
-			httpClient.addAdditionalHeader("Authorization", execution.getVariable("BasicAuthHeaderValuePO"))
-			Response response = httpClient.delete(vnfAdapterRequest)
-
-			execution.setVariable(Prefix + "deleteNetworkResponse", response.readEntity(String.class))
-			execution.setVariable(Prefix + "networkReturnCode", response.getStatus())
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, sendRequestToVnfAdapter() - " + ex.getMessage()
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
-					"BPMN", ErrorCode.UnknownError.getValue(),
-					"Exception is:\n" + ex);
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-	}
-
-
-	public void prepareSDNCRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix", Prefix)
-
-		logger.trace("Inside prepareSDNCRequest of DoDeleteNetworkInstance ")
-
-		try {
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
-
-			String networkId = ""
-			if (utils.nodeExists(deleteNetworkInput, "network-id")) {
-				networkId = utils.getNodeText(deleteNetworkInput, "network-id")
-			}
-			if (networkId == 'null') {networkId = ""}
-
-			String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
-
-			// 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)
-			logger.debug(Prefix + "requestId " + requestId)
-			L3Network queryAAIResponse = execution.getVariable(Prefix + "queryAAIResponse")
-
-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			// 1. prepare delete topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyDeleteRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "delete", "DisconnectNetworkRequest", cloudRegionId, networkId, queryAAIResponse, null)
-		    String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyDeleteRequest)
-			logger.debug(sndcTopologyDeleteRequesAsString)
-			execution.setVariable(Prefix + "deleteSDNCRequest", sndcTopologyDeleteRequesAsString)
-			logger.debug(Prefix + "deleteSDNCRequest - " + "\n" +  sndcTopologyDeleteRequesAsString)
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareSDNCRequest() - " + ex.getMessage()
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
-					"BPMN", ErrorCode.UnknownError.getValue(),
-					"Exception is:\n" + ex);
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void prepareRpcSDNCRequest (DelegateExecution execution) {
+            logger.debug(Prefix + "deleteNetworkRequest - " + "\n" +  deleteNetworkRequest)
+            // Format Response
+            String buildDeleteNetworkRequestAsString = utils.formatXml(deleteNetworkRequest)
+            logger.debug(buildDeleteNetworkRequestAsString)
+            logger.debug(Prefix + "deleteNetworkRequestAsString - " + "\n" +  buildDeleteNetworkRequestAsString)
 
-		execution.setVariable("prefix", Prefix)
+            String restURL = UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)
+            execution.setVariable("mso.adapters.network.rest.endpoint", restURL + "/" + networkId)
+            logger.debug("mso.adapters.network.rest.endpoint - " + "\n" +  restURL + "/" + networkId)
 
-		logger.trace("Inside prepareRpcSDNCRequest of DoDeleteNetworkInstance ")
-
-		try {
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
-
-			String networkId = ""
-			if (utils.nodeExists(deleteNetworkInput, "network-id")) {
-				networkId = utils.getNodeText(deleteNetworkInput, "network-id")
-			}
-			if (networkId == 'null') {networkId = ""}
-
-			String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
-
-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			// 1. prepare delete topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "unassign", "DeleteNetworkInstance", cloudRegionId, networkId, null)
-			String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
-			logger.debug(sndcTopologyDeleteRequesAsString)
-			execution.setVariable(Prefix + "deleteSDNCRequest", sndcTopologyDeleteRequesAsString)
-			logger.debug(Prefix + "deleteSDNCRequest - " + "\n" +  sndcTopologyDeleteRequesAsString)
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareSDNCRequest() - " + ex.getMessage()
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
-					"BPMN", ErrorCode.UnknownError.getValue(),
-					"Exception is:\n" + ex);
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
+            execution.setVariable(Prefix + "deleteNetworkRequest", buildDeleteNetworkRequestAsString)
+            logger.debug(Prefix + "deleteNetworkRequest - " + "\n" +  buildDeleteNetworkRequestAsString)
+        }
+        catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareNetworkRequest(). Unexpected Response from AAI - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
+        }
+    }
+
+    /**
+     * This method is used instead of an HTTP Connector task because the
+     * connector does not allow DELETE with a body.
+     */
+    public void sendRequestToVnfAdapter(DelegateExecution execution) {
+        def method = getClass().getSimpleName() + '.sendRequestToVnfAdapter(' +
+                'execution=' + execution.getId() +
+                ')'
+
+        logger.trace('Entered ' + method)
+
+        try {
+
+            String vnfAdapterUrl = UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint",execution)
+            String vnfAdapterRequest = execution.getVariable(Prefix + "deleteNetworkRequest")
+
+            URL url = new URL(vnfAdapterUrl)
+            HttpClient httpClient = new HttpClientFactory().newXmlClient(url, ONAPComponents.OPENSTACK_ADAPTER)
+            httpClient.accept = "application/xml"
+            httpClient.addAdditionalHeader("Authorization", execution.getVariable("BasicAuthHeaderValuePO"))
+            Response response = httpClient.delete(vnfAdapterRequest)
+
+            execution.setVariable(Prefix + "deleteNetworkResponse", response.readEntity(String.class))
+            execution.setVariable(Prefix + "networkReturnCode", response.getStatus())
+
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, sendRequestToVnfAdapter() - " + ex.getMessage()
+            logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
+                    "BPMN", ErrorCode.UnknownError.getValue(),
+                    "Exception is:\n" + ex);
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-	public void prepareRpcSDNCDeactivate(DelegateExecution execution) {
+        }
+    }
+
+
+    public void prepareSDNCRequest (DelegateExecution execution) {
+
+        execution.setVariable("prefix", Prefix)
+
+        logger.trace("Inside prepareSDNCRequest of DoDeleteNetworkInstance ")
+
+        try {
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
+
+            String networkId = ""
+            if (utils.nodeExists(deleteNetworkInput, "network-id")) {
+                networkId = utils.getNodeText(deleteNetworkInput, "network-id")
+            }
+            if (networkId == 'null') {networkId = ""}
+
+            String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
+
+            // 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)
+            logger.debug(Prefix + "requestId " + requestId)
+            L3Network queryAAIResponse = execution.getVariable(Prefix + "queryAAIResponse")
+
+            SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            // 1. prepare delete topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyDeleteRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "delete", "DisconnectNetworkRequest", cloudRegionId, networkId, queryAAIResponse, null)
+            String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyDeleteRequest)
+            logger.debug(sndcTopologyDeleteRequesAsString)
+            execution.setVariable(Prefix + "deleteSDNCRequest", sndcTopologyDeleteRequesAsString)
+            logger.debug(Prefix + "deleteSDNCRequest - " + "\n" +  sndcTopologyDeleteRequesAsString)
+
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareSDNCRequest() - " + ex.getMessage()
+            logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
+                    "BPMN", ErrorCode.UnknownError.getValue(),
+                    "Exception is:\n" + ex);
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		execution.setVariable("prefix",Prefix)
+        }
 
-		logger.trace("Inside prepareRpcSDNCDeactivate() of DoDeleteNetworkInstance ")
-
-		try {
-
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			String networkId = ""
-			if (utils.nodeExists(deleteNetworkInput, "network-id")) {
-				networkId = utils.getNodeText(deleteNetworkInput, "network-id")
-			}
-			if (networkId == 'null') {networkId = ""}
-			String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
+    }
 
-			String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "deactivate", "DeleteNetworkInstance", cloudRegionId, networkId, null)
-			String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
-			execution.setVariable(Prefix + "deactivateSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
-			logger.debug(" Preparing request for RPC SDNC Topology deactivate - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
+    public void prepareRpcSDNCRequest (DelegateExecution execution) {
 
+        execution.setVariable("prefix", Prefix)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRpcSDNCActivateRollback() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        logger.trace("Inside prepareRpcSDNCRequest of DoDeleteNetworkInstance ")
 
-		}
+        try {
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
 
-	}
+            String networkId = ""
+            if (utils.nodeExists(deleteNetworkInput, "network-id")) {
+                networkId = utils.getNodeText(deleteNetworkInput, "network-id")
+            }
+            if (networkId == 'null') {networkId = ""}
 
-	// **************************************************
-	//     Post or Validate Response Section
-	// **************************************************
+            String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
 
-	public void validateNetworkResponse (DelegateExecution execution) {
+            SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            // 1. prepare delete topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "unassign", "DeleteNetworkInstance", cloudRegionId, networkId, null)
+            String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
+            logger.debug(sndcTopologyDeleteRequesAsString)
+            execution.setVariable(Prefix + "deleteSDNCRequest", sndcTopologyDeleteRequesAsString)
+            logger.debug(Prefix + "deleteSDNCRequest - " + "\n" +  sndcTopologyDeleteRequesAsString)
 
-		execution.setVariable("prefix", Prefix)
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareSDNCRequest() - " + ex.getMessage()
+            logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
+                    "BPMN", ErrorCode.UnknownError.getValue(),
+                    "Exception is:\n" + ex);
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		logger.trace("Inside validateNetworkResponse of DoDeleteNetworkInstance ")
+        }
 
-		try {
-			String returnCode = execution.getVariable(Prefix + "networkReturnCode")
-			String networkResponse = execution.getVariable(Prefix + "deleteNetworkResponse")
+    }
 
-			logger.debug(" Network Adapter responseCode: " + returnCode)
-			logger.debug("Network Adapter Response - " + "\n" + networkResponse)
-			logger.debug(networkResponse)
 
-			String errorMessage = ""
-			if (returnCode == "200") {
-				logger.debug(" Network Adapter Response is successful - " + "\n" + networkResponse)
+    public void prepareRpcSDNCDeactivate(DelegateExecution execution) {
 
-				// prepare rollback data
-				String rollbackData = utils.getNodeXml(networkResponse, "rollback", false).replace("tag0:","").replace(":tag0","")
-				if ((rollbackData == null) || (rollbackData.isEmpty())) {
-					logger.debug(" Network Adapter 'rollback' data is not Sent: " + "\n" + networkResponse)
-					execution.setVariable(Prefix + "rollbackNetworkRequest", "")
-				} else {
-				    String rollbackNetwork =
-					  """<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.onap.so/network">
-						  	${rollbackData}
-						 </NetworkAdapter:rollbackNetwork>"""
-				    String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
-				    execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkXml)
-				    logger.debug(" Network Adapter rollback data - " + "\n" + rollbackNetworkXml)
-				}
+        execution.setVariable("prefix",Prefix)
 
+        logger.trace("Inside prepareRpcSDNCDeactivate() of DoDeleteNetworkInstance ")
 
-			} else { // network error
-			   if (returnCode.toInteger() > 399 && returnCode.toInteger() < 600) {   //4xx, 5xx
-				   if (networkResponse.contains("deleteNetworkError")  ) {
-					   networkResponse = networkResponse.replace('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>', '')
-					   errorMessage  = utils.getNodeText(networkResponse, "message")
-					   errorMessage  = "Received error from Network Adapter: " + errorMessage
-					   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
+        try {
 
-				   } 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)
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String networkId = ""
+            if (utils.nodeExists(deleteNetworkInput, "network-id")) {
+                networkId = utils.getNodeText(deleteNetworkInput, "network-id")
+            }
+            if (networkId == 'null') {networkId = ""}
+            String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
 
-				   }
+            String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "deactivate", "DeleteNetworkInstance", cloudRegionId, networkId, null)
+            String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
+            execution.setVariable(Prefix + "deactivateSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
+            logger.debug(" Preparing request for RPC SDNC Topology deactivate - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
 
-			   } else { // CatchAll exception
-				   String dataErrorMessage  = "Received error from Network Adapter. Return code is: " + returnCode
-				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
 
-			   }
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRpcSDNCActivateRollback() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-			}
+        }
 
-		} catch (BpmnError e) {
-			throw e;
+    }
 
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, validateNetworkResponse() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+    public void validateSDNCResponse (DelegateExecution execution) {
 
-		}
+        execution.setVariable("prefix", Prefix)
 
-	}
+        logger.trace("Inside validateSDNCResponse of DoDeleteNetworkInstance ")
 
-	public void validateSDNCResponse (DelegateExecution execution) {
+        String response = execution.getVariable(Prefix + "deleteSDNCResponse")
+        boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+        WorkflowException workflowException = execution.getVariable("WorkflowException")
 
-		execution.setVariable("prefix", Prefix)
+        SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+        sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+        // reset variable
+        String deleteSDNCResponseDecodeXml = execution.getVariable(Prefix + "deleteSDNCResponse")
+        deleteSDNCResponseDecodeXml = deleteSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+        execution.setVariable(Prefix + "deleteSDNCResponse", deleteSDNCResponseDecodeXml)
 
-		logger.trace("Inside validateSDNCResponse of DoDeleteNetworkInstance ")
+        if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, prefix+'sdncResponseSuccess'
+            execution.setVariable(Prefix + "isSdncRollbackNeeded", true)      //
+            execution.setVariable(Prefix + "isPONR", true)
+            logger.debug("Successfully Validated SDNC Response")
+        } else {
+            logger.debug("Did NOT Successfully Validated SDNC Response")
+            throw new BpmnError("MSOWorkflowException")
+        }
 
-		String response = execution.getVariable(Prefix + "deleteSDNCResponse")
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-		WorkflowException workflowException = execution.getVariable("WorkflowException")
+    }
 
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-		// reset variable
-		String deleteSDNCResponseDecodeXml = execution.getVariable(Prefix + "deleteSDNCResponse")
-		deleteSDNCResponseDecodeXml = deleteSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-		execution.setVariable(Prefix + "deleteSDNCResponse", deleteSDNCResponseDecodeXml)
+    public void validateRpcSDNCDeactivateResponse (DelegateExecution execution) {
 
-		if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, prefix+'sdncResponseSuccess'
-			execution.setVariable(Prefix + "isSdncRollbackNeeded", true)      //
-			execution.setVariable(Prefix + "isPONR", true)
-			logger.debug("Successfully Validated SDNC Response")
-		} else {
-			logger.debug("Did NOT Successfully Validated SDNC Response")
-		 	throw new BpmnError("MSOWorkflowException")
-		}
+        execution.setVariable("prefix",Prefix)
 
-	}
+        logger.trace("Inside validateRpcSDNCDeactivateResponse() of DoDeleteNetworkInstance ")
 
-	public void validateRpcSDNCDeactivateResponse (DelegateExecution execution) {
+        String response = execution.getVariable(Prefix + "deactivateSDNCResponse")
+        boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+        WorkflowException workflowException = execution.getVariable("WorkflowException")
 
-		execution.setVariable("prefix",Prefix)
+        SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+        sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+        // reset variable
+        String assignSDNCResponseDecodeXml = execution.getVariable(Prefix + "deactivateSDNCResponse")
+        assignSDNCResponseDecodeXml = assignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+        execution.setVariable(Prefix + "deactivateSDNCResponse", assignSDNCResponseDecodeXml)
 
-		logger.trace("Inside validateRpcSDNCDeactivateResponse() of DoDeleteNetworkInstance ")
+        if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, Prefix+'sdncResponseSuccess'
+            execution.setVariable(Prefix + "isSdncDeactivateRollbackNeeded", true)
+            logger.debug("Successfully Validated Rpc SDNC Activate Response")
 
-		String response = execution.getVariable(Prefix + "deactivateSDNCResponse")
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-		WorkflowException workflowException = execution.getVariable("WorkflowException")
+        } else {
+            logger.debug("Did NOT Successfully Validated Rpc SDNC Deactivate Response")
+            throw new BpmnError("MSOWorkflowException")
+        }
 
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-		// reset variable
-		String assignSDNCResponseDecodeXml = execution.getVariable(Prefix + "deactivateSDNCResponse")
-		assignSDNCResponseDecodeXml = assignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-		execution.setVariable(Prefix + "deactivateSDNCResponse", assignSDNCResponseDecodeXml)
+    }
 
-		if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, Prefix+'sdncResponseSuccess'
-			execution.setVariable(Prefix + "isSdncDeactivateRollbackNeeded", true)
-			logger.debug("Successfully Validated Rpc SDNC Activate Response")
+    public void prepareRpcSDNCDeactivateRollback(DelegateExecution execution) {
 
-		} else {
-			logger.debug("Did NOT Successfully Validated Rpc SDNC Deactivate Response")
-			throw new BpmnError("MSOWorkflowException")
-		}
+        execution.setVariable("prefix",Prefix)
 
-	}
+        logger.trace("Inside prepareRpcSDNCDeactivateRollback() of DoDeleteNetworkInstance ")
 
-	public void prepareRpcSDNCDeactivateRollback(DelegateExecution execution) {
+        try {
 
-		execution.setVariable("prefix",Prefix)
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String deactivateSDNCResponse = execution.getVariable(Prefix + "deactivateSDNCResponse")
+            String networkId = utils.getNodeText(deactivateSDNCResponse, "network-id")
+            if (networkId == 'null') {networkId = ""}
+            String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
 
-		logger.trace("Inside prepareRpcSDNCDeactivateRollback() of DoDeleteNetworkInstance ")
-
-		try {
+            // 2. prepare rollback topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "activate", "CreateNetworkInstance", cloudRegionId, networkId, null)
+            String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
+            execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
+            logger.debug(" Preparing request for RPC SDNC Topology 'activate-CreateNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
 
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			String deactivateSDNCResponse = execution.getVariable(Prefix + "deactivateSDNCResponse")
-			String networkId = utils.getNodeText(deactivateSDNCResponse, "network-id")
-			if (networkId == 'null') {networkId = ""}
-			String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
 
-			// 2. prepare rollback topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "activate", "CreateNetworkInstance", cloudRegionId, networkId, null)
-			String sndcTopologyRollbackRpcRequestAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
-			execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", sndcTopologyRollbackRpcRequestAsString)
-			logger.debug(" Preparing request for RPC SDNC Topology 'activate-CreateNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyRollbackRpcRequestAsString)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRpcSDNCDeactivateRollback() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
+        }
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRpcSDNCDeactivateRollback() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+    }
 
-		}
+    public void prepareRollbackData(DelegateExecution execution) {
 
-	}
+        execution.setVariable("prefix",Prefix)
 
-	public void prepareRollbackData(DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
+        logger.trace("Inside prepareRollbackData() of DoDeleteNetworkInstance ")
 
-		logger.trace("Inside prepareRollbackData() of DoDeleteNetworkInstance ")
+        try {
 
-		try {
+            Map<String, String> rollbackData = new HashMap<String, String>();
+            String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+            if (rollbackNetworkRequest != null) {
+                if (rollbackNetworkRequest != "") {
+                    rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
+                }
+            }
+            String rollbackDeactivateSDNCRequest = execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest")
+            if (rollbackDeactivateSDNCRequest != null) {
+                if (rollbackDeactivateSDNCRequest != "") {
+                    rollbackData.put("rollbackDeactivateSDNCRequest", execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest"))
+                }
+            }
+            execution.setVariable("rollbackData", rollbackData)
+            logger.debug("** rollbackData : " + rollbackData)
 
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
-			if (rollbackNetworkRequest != null) {
-				if (rollbackNetworkRequest != "") {
-				   rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
-			    }
-			}
-			String rollbackDeactivateSDNCRequest = execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest")
-			if (rollbackDeactivateSDNCRequest != null) {
-				if (rollbackDeactivateSDNCRequest != "") {
-			        rollbackData.put("rollbackDeactivateSDNCRequest", execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest"))
-			    }
-			}
-			execution.setVariable("rollbackData", rollbackData)
-			logger.debug("** rollbackData : " + rollbackData)
-
-			execution.setVariable("WorkflowException", execution.getVariable("WorkflowException"))
-			logger.debug("** WorkflowException : " + execution.getVariable("WorkflowException"))
-
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRollbackData() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
+            execution.setVariable("WorkflowException", execution.getVariable("WorkflowException"))
+            logger.debug("** WorkflowException : " + execution.getVariable("WorkflowException"))
 
-	public void postProcessResponse (DelegateExecution execution) {
-
-		execution.setVariable("prefix", Prefix)
-
-		logger.trace("Inside postProcessResponse of DoDeleteNetworkInstance ")
-
-		try {
-
-			logger.debug(" ***** Is Exception Encountered (isException)? : " + execution.getVariable(Prefix + "isException"))
-			if (execution.getVariable(Prefix + "isException") == false) {
-				execution.setVariable(Prefix + "Success", true)
-				execution.setVariable("WorkflowException", null)
-				if (execution.getVariable(Prefix + "isSilentSuccess") == true) {
-					execution.setVariable("rolledBack", false)
-				} else {
-				    execution.setVariable("rolledBack", true)
-				}
-				prepareSuccessRollbackData(execution) // populate rollbackData
-
-			} else {
-				execution.setVariable(Prefix + "Success", false)
-				execution.setVariable("rollbackData", null)
-				String exceptionMessage = " Exception encountered in MSO Bpmn. "
-				if (execution.getVariable("workflowException") != null) {  // Output of Rollback flow.
-				   logger.debug(" ***** workflowException: " + execution.getVariable("workflowException"))
-				   WorkflowException wfex = execution.getVariable("workflowException")
-				   exceptionMessage = wfex.getErrorMessage()
-   				} else {
-			       if (execution.getVariable(Prefix + "WorkflowException") != null) {
-				      WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
-				      exceptionMessage = pwfex.getErrorMessage()
-			       } else {
-				      if (execution.getVariable("WorkflowException") != null) {
-					     WorkflowException pwfex = execution.getVariable("WorkflowException")
-					     exceptionMessage = pwfex.getErrorMessage()
-					  }
-			       }
-   				}
-
-				// going to the Main flow: a-la-carte or macro
-				logger.debug(" ***** postProcessResponse(), BAD !!!")
-				exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-				throw new BpmnError("MSOWorkflowException")
-
-			}
-
-		} catch(BpmnError b){
-		    logger.debug("Rethrowing MSOWorkflowException")
-		    throw b
-
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, postProcessResponse() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-			throw new BpmnError("MSOWorkflowException")
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRollbackData() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
         }
 
-	}
-
-	public void prepareSuccessRollbackData(DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside prepareSuccessRollbackData() of DoDeleteNetworkInstance ")
-
-		try {
-
-			if (execution.getVariable("sdncVersion") != '1610') {
-				prepareRpcSDNCDeactivateRollback(execution)
-				prepareRpcSDNCUnassignRollback(execution)
-			} else {
-			    prepareSDNCRollback(execution)
-			}
-
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
-			if (rollbackSDNCRequest != null) {
-				if (rollbackSDNCRequest != "") {
-				   rollbackData.put("rollbackSDNCRequest", execution.getVariable(Prefix + "rollbackSDNCRequest"))
-				}
-			}
-			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
-			if (rollbackNetworkRequest != null) {
-				if (rollbackNetworkRequest != "") {
-				   rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
-			    }
-			}
-			String rollbackDeactivateSDNCRequest = execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest")
-			if (rollbackDeactivateSDNCRequest != null) {
-				if (rollbackDeactivateSDNCRequest != "") {
-			        rollbackData.put("rollbackDeactivateSDNCRequest", execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest"))
-			    }
-			}
-			execution.setVariable("rollbackData", rollbackData)
-
-			logger.debug("** rollbackData : " + rollbackData)
-			execution.setVariable("WorkflowException", null)
+    }
+
+    public void postProcessResponse (DelegateExecution execution) {
+
+        execution.setVariable("prefix", Prefix)
+
+        logger.trace("Inside postProcessResponse of DoDeleteNetworkInstance ")
+
+        try {
+
+            logger.debug(" ***** Is Exception Encountered (isException)? : " + execution.getVariable(Prefix + "isException"))
+            if (execution.getVariable(Prefix + "isException") == false) {
+                execution.setVariable(Prefix + "Success", true)
+                execution.setVariable("WorkflowException", null)
+                if (execution.getVariable(Prefix + "isSilentSuccess") == true) {
+                    execution.setVariable("rolledBack", false)
+                } else {
+                    execution.setVariable("rolledBack", true)
+                }
+                prepareSuccessRollbackData(execution) // populate rollbackData
+
+            } else {
+                execution.setVariable(Prefix + "Success", false)
+                execution.setVariable("rollbackData", null)
+                String exceptionMessage = " Exception encountered in MSO Bpmn. "
+                if (execution.getVariable("workflowException") != null) {  // Output of Rollback flow.
+                    logger.debug(" ***** workflowException: " + execution.getVariable("workflowException"))
+                    WorkflowException wfex = execution.getVariable("workflowException")
+                    exceptionMessage = wfex.getErrorMessage()
+                } else {
+                    if (execution.getVariable(Prefix + "WorkflowException") != null) {
+                        WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
+                        exceptionMessage = pwfex.getErrorMessage()
+                    } else {
+                        if (execution.getVariable("WorkflowException") != null) {
+                            WorkflowException pwfex = execution.getVariable("WorkflowException")
+                            exceptionMessage = pwfex.getErrorMessage()
+                        }
+                    }
+                }
+
+                // going to the Main flow: a-la-carte or macro
+                logger.debug(" ***** postProcessResponse(), BAD !!!")
+                exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+                throw new BpmnError("MSOWorkflowException")
+
+            }
+
+        } catch(BpmnError b){
+            logger.debug("Rethrowing MSOWorkflowException")
+            throw b
+
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, postProcessResponse() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+            throw new BpmnError("MSOWorkflowException")
 
+        }
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareSuccessRollbackData() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+    }
+
+    public void prepareSuccessRollbackData(DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside prepareSuccessRollbackData() of DoDeleteNetworkInstance ")
+
+        try {
+
+            if (execution.getVariable("sdncVersion") != '1610') {
+                prepareRpcSDNCDeactivateRollback(execution)
+                prepareRpcSDNCUnassignRollback(execution)
+            } else {
+                prepareSDNCRollback(execution)
+            }
+
+            Map<String, String> rollbackData = new HashMap<String, String>();
+            String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
+            if (rollbackSDNCRequest != null) {
+                if (rollbackSDNCRequest != "") {
+                    rollbackData.put("rollbackSDNCRequest", execution.getVariable(Prefix + "rollbackSDNCRequest"))
+                }
+            }
+            String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+            if (rollbackNetworkRequest != null) {
+                if (rollbackNetworkRequest != "") {
+                    rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
+                }
+            }
+            String rollbackDeactivateSDNCRequest = execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest")
+            if (rollbackDeactivateSDNCRequest != null) {
+                if (rollbackDeactivateSDNCRequest != "") {
+                    rollbackData.put("rollbackDeactivateSDNCRequest", execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest"))
+                }
+            }
+            execution.setVariable("rollbackData", rollbackData)
+
+            logger.debug("** rollbackData : " + rollbackData)
+            execution.setVariable("WorkflowException", null)
+
+
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareSuccessRollbackData() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void prepareRpcSDNCUnassignRollback(DelegateExecution execution) {
+    public void prepareRpcSDNCUnassignRollback(DelegateExecution execution) {
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside prepareRpcSDNCUnassignRollbac() of DoDeleteNetworkInstance ")
+        logger.trace("Inside prepareRpcSDNCUnassignRollbac() of DoDeleteNetworkInstance ")
 
-		try {
+        try {
 
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
 
-			String deleteSDNCResponse = execution.getVariable(Prefix + "deleteSDNCResponse")
-			String networkId = utils.getNodeText(deleteSDNCResponse, "network-id")
-			if (networkId == 'null') {networkId = ""}
-			String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
+            String deleteSDNCResponse = execution.getVariable(Prefix + "deleteSDNCResponse")
+            String networkId = utils.getNodeText(deleteSDNCResponse, "network-id")
+            if (networkId == 'null') {networkId = ""}
+            String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
 
-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			// 1. prepare delete topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "assign", "CreateNetworkInstance", cloudRegionId, networkId, null)
-			String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
-			logger.debug(sndcTopologyDeleteRequesAsString)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyDeleteRequesAsString)
-			logger.debug(Prefix + "rollbackSDNCRequest" + "\n" +  sndcTopologyDeleteRequesAsString)
-			logger.debug(" Preparing request for RPC SDNC Topology 'assign-CreateNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyDeleteRequesAsString)
+            SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            // 1. prepare delete topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyRollbackRpcRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "assign", "CreateNetworkInstance", cloudRegionId, networkId, null)
+            String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyRollbackRpcRequest)
+            logger.debug(sndcTopologyDeleteRequesAsString)
+            execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyDeleteRequesAsString)
+            logger.debug(Prefix + "rollbackSDNCRequest" + "\n" +  sndcTopologyDeleteRequesAsString)
+            logger.debug(" Preparing request for RPC SDNC Topology 'assign-CreateNetworkInstance' rollback . . . - " + "\n" +  sndcTopologyDeleteRequesAsString)
 
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRpcSDNCUnassignRollback() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstance flow. prepareRpcSDNCUnassignRollback() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void prepareSDNCRollback (DelegateExecution execution) {
+    public void prepareSDNCRollback (DelegateExecution execution) {
 
-		execution.setVariable("prefix", Prefix)
+        execution.setVariable("prefix", Prefix)
 
-		logger.trace("Inside prepareSDNCRollback of DoDeleteNetworkInstance ")
+        logger.trace("Inside prepareSDNCRollback of DoDeleteNetworkInstance ")
 
-		try {
+        try {
 
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String deleteNetworkInput = execution.getVariable(Prefix + "networkRequest")
 
-			String networkId = ""
-			if (utils.nodeExists(deleteNetworkInput, "network-id")) {
-				networkId = utils.getNodeText(deleteNetworkInput, "network-id")
-			}
-			if (networkId == 'null') {networkId = ""}
+            String networkId = ""
+            if (utils.nodeExists(deleteNetworkInput, "network-id")) {
+                networkId = utils.getNodeText(deleteNetworkInput, "network-id")
+            }
+            if (networkId == 'null') {networkId = ""}
 
-			String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
+            String serviceInstanceId = utils.getNodeText(deleteNetworkInput, "service-instance-id")
 
-			// 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 '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)
 
-			L3Network queryAAIResponse = execution.getVariable(Prefix + "queryAAIResponse")
+            L3Network queryAAIResponse = execution.getVariable(Prefix + "queryAAIResponse")
 
-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			// 1. prepare delete topology via SDNC Adapter SUBFLOW call
-			String sndcTopologyDeleteRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "rollback", "DisconnectNetworkRequest", cloudRegionId, networkId, queryAAIResponse, null)
-		    String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyDeleteRequest)
-			logger.debug(sndcTopologyDeleteRequesAsString)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyDeleteRequesAsString)
-			logger.debug(Prefix + "rollbackSDNCRequest - " + "\n" +  sndcTopologyDeleteRequesAsString)
-			logger.debug(" Preparing request for RPC SDNC Topology 'rollback-DisconnectNetworkRequest' rollback . . . - " + "\n" +  sndcTopologyDeleteRequesAsString)
+            SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            // 1. prepare delete topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyDeleteRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, deleteNetworkInput, serviceInstanceId, sdncCallback, "rollback", "DisconnectNetworkRequest", cloudRegionId, networkId, queryAAIResponse, null)
+            String sndcTopologyDeleteRequesAsString = utils.formatXml(sndcTopologyDeleteRequest)
+            logger.debug(sndcTopologyDeleteRequesAsString)
+            execution.setVariable(Prefix + "rollbackSDNCRequest", sndcTopologyDeleteRequesAsString)
+            logger.debug(Prefix + "rollbackSDNCRequest - " + "\n" +  sndcTopologyDeleteRequesAsString)
+            logger.debug(" Preparing request for RPC SDNC Topology 'rollback-DisconnectNetworkRequest' rollback . . . - " + "\n" +  sndcTopologyDeleteRequesAsString)
 
 
-		} catch (Exception ex) {
-			// caught exception
-			String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareSDNCRollback() - " + ex.getMessage()
-			logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
-					"BPMN", ErrorCode.UnknownError.getValue(),
-					"Exception is:\n" + ex);
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            // caught exception
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance, prepareSDNCRollback() - " + ex.getMessage()
+            logger.error(LoggingAnchor.FIVE, MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), exceptionMessage,
+                    "BPMN", ErrorCode.UnknownError.getValue(),
+                    "Exception is:\n" + ex);
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void setExceptionFlag(DelegateExecution execution){
+    public void setExceptionFlag(DelegateExecution execution){
 
-		execution.setVariable("prefix",Prefix)
+        execution.setVariable("prefix",Prefix)
 
-		logger.trace("Inside setExceptionFlag() of DoDeleteNetworkInstance ")
+        logger.trace("Inside setExceptionFlag() of DoDeleteNetworkInstance ")
 
-		try {
+        try {
 
-			execution.setVariable(Prefix + "isException", true)
+            execution.setVariable(Prefix + "isException", true)
 
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			logger.debug(Prefix + "WorkflowException - " +execution.getVariable(Prefix + "WorkflowException"))
+            if (execution.getVariable("SavedWorkflowException1") != null) {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
+            } else {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+            }
+            logger.debug(Prefix + "WorkflowException - " +execution.getVariable(Prefix + "WorkflowException"))
 
-		} catch(Exception ex){
-			  String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance flow. setExceptionFlag(): " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-		}
+        } catch(Exception ex){
+            String exceptionMessage = "Bpmn error encountered in DoDeleteNetworkInstance flow. setExceptionFlag(): " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        }
 
-	}
+    }
 
 
-	// *******************************
-	//     Build Error Section
-	// *******************************
+    // *******************************
+    //     Build Error Section
+    // *******************************
 
-	public void processJavaException(DelegateExecution execution){
+    public void processJavaException(DelegateExecution execution){
 
-		execution.setVariable("prefix",Prefix)
-		try{
-			logger.debug("Caught a Java Exception")
-			logger.debug("Started processJavaException Method")
-			logger.debug("Variables List: " + execution.getVariables())
-			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")
+        execution.setVariable("prefix",Prefix)
+        try{
+            logger.debug("Caught a Java Exception")
+            logger.debug("Started processJavaException Method")
+            logger.debug("Variables List: " + execution.getVariables())
+            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){
-			logger.debug("Caught Exception during processJavaException Method: " + e)
-			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")
-		}
-		logger.debug("Completed processJavaException Method of " + Prefix)
-	}
+        }catch(Exception e){
+            logger.debug("Caught Exception during processJavaException Method: " + e)
+            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")
+        }
+        logger.debug("Completed processJavaException Method of " + Prefix)
+    }
 
 }
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollback.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollback.groovy
deleted file mode 100644
index 36c145b0e0..0000000000
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollback.groovy
+++ /dev/null
@@ -1,338 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.onap.so.bpmn.infrastructure.scripts;
-
-import groovy.xml.XmlUtil
-import groovy.json.*
-import org.onap.so.bpmn.core.UrnPropertiesReader
-import org.onap.so.bpmn.core.json.JsonUtils
-import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.onap.so.bpmn.common.scripts.ExceptionUtil
-import org.onap.so.bpmn.common.scripts.NetworkUtils
-import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
-import org.onap.so.bpmn.common.scripts.VidUtils
-import org.onap.so.bpmn.core.WorkflowException
-
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.delegate.DelegateExecution
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-/**
- * This groovy class supports the <class>DoCreateNetworkInstanceRollback.bpmn</class> process.
- *
- */
-public class DoDeleteNetworkInstanceRollback extends AbstractServiceTaskProcessor {
-    private static final Logger logger = LoggerFactory.getLogger( DoDeleteNetworkInstanceRollback.class);
-
-	String Prefix="DELNWKIR_"
-	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	def className = getClass().getSimpleName()
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoDeleteNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(DelegateExecution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable(Prefix + "WorkflowException", null)
-
-		execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", null)
-		execution.setVariable(Prefix + "rollbackDeactivateSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackDeactivateSDNCReturnCode", "")
-
-		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
-		execution.setVariable(Prefix + "rollbackSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
-
-		execution.setVariable(Prefix + "rollbackNetworkRequest", null)
-		execution.setVariable(Prefix + "rollbackNetworkResponse", "")
-		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
-
-		execution.setVariable(Prefix + "Success", false)
-		execution.setVariable(Prefix + "fullRollback", false)
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoDeleteNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside preProcessRequest() of " + className + ".groovy ")
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			// GET Incoming request/variables
-			String rollbackDeactivateSDNCRequest = null
-			String rollbackSDNCRequest = null
-			String rollbackNetworkRequest = null
-
-			Map<String, String> rollbackData = execution.getVariable("rollbackData")
-			if (rollbackData != null && rollbackData instanceof Map) {
-
-				if(rollbackData.containsKey("rollbackDeactivateSDNCRequest")) {
-				   rollbackDeactivateSDNCRequest = rollbackData["rollbackDeactivateSDNCRequest"]
-				}
-
-				if(rollbackData.containsKey("rollbackSDNCRequest")) {
-					rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]
-				 }
-
-				if(rollbackData.containsKey("rollbackNetworkRequest")) {
-					rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]
-				 }
-			}
-
-			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)
-			execution.setVariable(Prefix + "rollbackDeactivateSDNCRequest", rollbackDeactivateSDNCRequest)
-			logger.debug("'rollbackData': " + '\n' + execution.getVariable("rollbackData"))
-
-			String sdncVersion = execution.getVariable("sdncVersion")
-			logger.debug("sdncVersion? : " + sdncVersion)
-
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-
-			} catch (IOException ex) {
-				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
-				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				logger.debug(dataErrorMessage )
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			logger.debug("*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"))
-			if(execution.getVariable(Prefix + "WorkflowException") != null) {
-				// called by: DoCreateNetworkInstance, partial rollback
-				execution.setVariable(Prefix + "fullRollback", false)
-
-			} else {
-			   // called by: Macro - Full Rollback, WorkflowException = null
-			   execution.setVariable(Prefix + "fullRollback", true)
-
-			}
-
-			logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
-
-		} catch (BpmnError e) {
-		throw e;
-
-		} catch (Exception ex) {
-			sendSyncError(execution)
-			// caught exception
-			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void validateRollbackResponses (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside validateRollbackResponses() of DoDeleteNetworkInstanceRollback ")
-
-		try {
-
-			// validate SDNC activate response
-			String rollbackDeactivateSDNCMessages = ""
-			String rollbackDeactivateSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackDeactivateSDNCRequest") != null) {
-				rollbackDeactivateSDNCReturnCode = execution.getVariable(Prefix + "rollbackDeactivateSDNCReturnCode")
-				String rollbackDeactivateSDNCResponse = execution.getVariable(Prefix + "rollbackDeactivateSDNCResponse")
-				String rollbackDeactivateSDNCReturnInnerCode = ""
-				rollbackDeactivateSDNCResponse = rollbackDeactivateSDNCResponse.replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackDeactivateSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackDeactivateSDNCResponse, "response-code")) {
-						rollbackDeactivateSDNCReturnInnerCode = utils.getNodeText(rollbackDeactivateSDNCResponse, "response-code")
-						if (rollbackDeactivateSDNCReturnInnerCode == "200" || rollbackDeactivateSDNCReturnInnerCode == "" || rollbackDeactivateSDNCReturnInnerCode == "0") {
-						   rollbackDeactivateSDNCMessages = " + SNDC deactivate rollback completed."
-						} else {
-							rollbackDeactivateSDNCMessages = " + SDNC deactivate rollback failed. "
-						}
-					} else {
-						 rollbackDeactivateSDNCMessages = " + SNDC deactivate rollback completed."
-					}
-				} else {
-					  rollbackDeactivateSDNCMessages = " + SDNC deactivate rollback failed. "
-				}
-				logger.debug(" SDNC deactivate rollback Code - " + rollbackDeactivateSDNCReturnCode)
-				logger.debug(" SDNC deactivate rollback  Response - " + rollbackDeactivateSDNCResponse)
-			}
-
-			// validate SDNC rollback response
-			String rollbackSdncErrorMessages = ""
-			String rollbackSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {
-				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")
-				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")
-				String rollbackSDNCReturnInnerCode = ""
-				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-				rollbackSDNCResponse = rollbackSDNCResponse.replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
-						rollbackSDNCReturnInnerCode = utils.getNodeText(rollbackSDNCResponse, "response-code")
-						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
-							rollbackSdncErrorMessages = " + SNDC unassign rollback completed."
-						} else {
-							rollbackSdncErrorMessages = " + SDNC unassign rollback failed. "
-						}
-					} else {
-						  rollbackSdncErrorMessages = " + SNDC unassign rollback completed."
-					}
-				 } else {
-					  rollbackSdncErrorMessages = " + SDNC unassign rollback failed. "
-				 }
-				logger.debug(" SDNC assign rollback Code - " + rollbackSDNCReturnCode)
-				logger.debug(" SDNC assign rollback  Response - " + rollbackSDNCResponse)
-			}
-
-			// validate PO network rollback response
-			String rollbackNetworkErrorMessages = ""
-			String rollbackNetworkReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {
-				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")
-				String rollbackNetworkResponse = execution.getVariable(Prefix + "rollbackNetworkResponse")
-				if (rollbackNetworkReturnCode != "200") {
-					rollbackNetworkErrorMessages = " + PO Network rollback failed. "
-				} else {
-					rollbackNetworkErrorMessages = " + PO Network rollback completed."
-				}
-
-				logger.debug(" NetworkRollback Code - " + rollbackNetworkReturnCode)
-				logger.debug(" NetworkRollback Response - " + rollbackNetworkResponse)
-			}
-
-			String statusMessage = ""
-			int errorCode = 7000
-			logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
-			if (execution.getVariable(Prefix + "fullRollback") == false) {
-				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException") // original WorkflowException
-				if (wfe != null) {
-					statusMessage = wfe.getErrorMessage()
-					errorCode = wfe.getErrorCode()
-				} else {
-					statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-					errorCode = '7000'
-				}
-
-				// set if all rolledbacks are successful
-				if (rollbackDeactivateSDNCReturnCode == "200" && rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
-					execution.setVariable("rolledBack", true)
-					execution.setVariable("wasDeleted", true)
-
-				} else {
-					execution.setVariable("rolledBack", false)
-					execution.setVariable("wasDeleted", true)
-				}
-
-				statusMessage =  statusMessage + rollbackDeactivateSDNCMessages + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
-				logger.debug("Final DoDeleteNetworkInstanceRollback status message: " + statusMessage)
-				String processKey = getProcessKey(execution);
-				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);
-				execution.setVariable("workflowException", exception);
-
-			} else {
-				// rollback due to failures in Main flow (Macro or a-ala-carte) - Full rollback
-			    if (rollbackDeactivateSDNCReturnCode == "200" && rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
-				    execution.setVariable("rollbackSuccessful", true)
-				    execution.setVariable("rollbackError", false)
-			    } else {
-				    String exceptionMessage = "Network Delete Rollback was not Successful. "
-                    logger.debug(exceptionMessage)
-					execution.setVariable("rollbackSuccessful", false)
-				    execution.setVariable("rollbackError", true)
-					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-					throw new BpmnError("MSOWorkflowException")
-			    }
-			}
-
-		} catch (Exception ex) {
-			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-			String exceptionMessage = " Bpmn error encountered in DoDeleteNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	// *******************************
-	//     Build Error Section
-	// *******************************
-
-
-
-	public void processJavaException(DelegateExecution execution){
-
-		execution.setVariable("prefix",Prefix)
-
-		try{
-			logger.debug("Caught a Java Exception in " + Prefix)
-			logger.debug("Started processJavaException Method")
-			logger.debug("Variables List: " + execution.getVariables())
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
-
-		}catch(Exception e){
-			logger.debug("Caught Exception during processJavaException Method: " + e)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
-		}
-		logger.debug("Completed processJavaException Method in " + Prefix)
-	}
-
-}
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
index 6162780b27..87e56791fc 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstance.groovy
@@ -73,1107 +73,1027 @@ import groovy.xml.XmlUtil
 public class DoUpdateNetworkInstance extends AbstractServiceTaskProcessor {
     private static final Logger logger = LoggerFactory.getLogger( DoUpdateNetworkInstance.class);
 
-	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>DoUpdateNetworkInstance.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(DelegateExecution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable(Prefix + "messageId", "")
-		execution.setVariable("BasicAuthHeaderValuePO", "")
-		execution.setVariable("BasicAuthHeaderValueSDNC", "")
-		execution.setVariable(Prefix + "networkRequest", "")
-		execution.setVariable(Prefix + "networkInputs", "")
-		execution.setVariable(Prefix + "networkOutputs", "")
-		execution.setVariable(Prefix + "requestId", "")
-		execution.setVariable(Prefix + "source", "")
-		execution.setVariable(Prefix + "networkId", "")
-
-		execution.setVariable(Prefix + "isPONR", false)    // Point-of-no-return, means, rollback is not needed
-
-		// AAI query Cloud Region
-		execution.setVariable(Prefix + "queryCloudRegionRequest","")
-		execution.setVariable(Prefix + "queryCloudRegionReturnCode","")
-		execution.setVariable(Prefix + "queryCloudRegionResponse","")
-		execution.setVariable(Prefix + "cloudRegionPo","")
-		execution.setVariable(Prefix + "cloudRegionSdnc","")
-		execution.setVariable(Prefix + "isCloudRegionGood", false)
-
-		// AAI query Id
-		execution.setVariable(Prefix + "queryIdAAIRequest","")
-		execution.setVariable(Prefix + "queryIdAAIResponse", "")
-		execution.setVariable(Prefix + "aaiIdReturnCode", "")
-
-		// AAI query vpn binding
-		execution.setVariable(Prefix + "queryVpnBindingAAIRequest","")
-		execution.setVariable(Prefix + "queryVpnBindingAAIResponse", "")
-		execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "")
-		execution.setVariable(Prefix + "vpnBindings", null)
-		execution.setVariable(Prefix + "vpnCount", 0)
-		execution.setVariable(Prefix + "routeCollection", "")
-
-		// AAI query network policy
-		execution.setVariable(Prefix + "queryNetworkPolicyAAIRequest","")
-		execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", "")
-		execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "")
-		execution.setVariable(Prefix + "networkPolicyUriList", null)
-		execution.setVariable(Prefix + "networkPolicyCount", 0)
-		execution.setVariable(Prefix + "networkCollection", "")
-
-		// AAI query route table reference
-		execution.setVariable(Prefix + "queryNetworkTableRefAAIRequest","")
-		execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", "")
-		execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "")
-		execution.setVariable(Prefix + "networkTableRefUriList", null)
-		execution.setVariable(Prefix + "networkTableRefCount", 0)
-		execution.setVariable(Prefix + "tableRefCollection", "")
-
-		// AAI requery Id
-		execution.setVariable(Prefix + "requeryIdAAIRequest","")
-		execution.setVariable(Prefix + "requeryIdAAIResponse", "")
-		execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "")
-
-		// AAI update contrail
-		execution.setVariable(Prefix + "updateContrailAAIUrlRequest","")
-		execution.setVariable(Prefix + "updateContrailAAIPayloadRequest","")
-		execution.setVariable(Prefix + "updateContrailAAIResponse", "")
-		execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", "")
-
-		execution.setVariable(Prefix + "updateNetworkRequest", "")
-		execution.setVariable(Prefix + "updateNetworkResponse", "")
-		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
-		execution.setVariable(Prefix + "networkReturnCode", "")
-		execution.setVariable(Prefix + "isNetworkRollbackNeeded", false)
-
-		execution.setVariable(Prefix + "changeAssignSDNCRequest", "")
-		execution.setVariable(Prefix + "changeAssignSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
-		execution.setVariable(Prefix + "sdncReturnCode", "")
-		execution.setVariable(Prefix + "isSdncRollbackNeeded", false)
-		execution.setVariable(Prefix + "sdncResponseSuccess", false)
-
-		execution.setVariable(Prefix + "isVnfBindingPresent", false)
-		execution.setVariable(Prefix + "Success", false)
-		execution.setVariable(Prefix + "serviceInstanceId", "")
-
-		execution.setVariable(Prefix + "isException", false)
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstance.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside preProcessRequest DoUpdateNetworkInstance Request ")
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			// GET Incoming request & validate 3 kinds of format.
-			execution.setVariable("action", "UPDATE")
-			String networkRequest = execution.getVariable("bpmnRequest")
-			if (networkRequest != null) {
-				if (networkRequest.contains("requestDetails")) {
-					// JSON format request is sent, create xml
-					try {
-						def prettyJson = JsonOutput.prettyPrint(networkRequest.toString())
-						logger.debug(" Incoming message formatted . . . : " + '\n' + prettyJson)
-						networkRequest =  vidUtils.createXmlNetworkRequestInfra(execution, networkRequest)
-
-					} catch (Exception ex) {
-						String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
-						logger.debug(dataErrorMessage)
-						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-					}
-				} else {
-					 // XML format request is sent
-
-				}
-			} else {
-				// vIPR format request is sent, create xml from individual variables
-				networkRequest = vidUtils.createXmlNetworkRequestInstance(execution)
-			}
-
-			networkRequest = utils.formatXml(networkRequest)
-			logger.debug(networkRequest)
-			execution.setVariable(Prefix + "networkRequest", networkRequest)
-			logger.debug(" network-request - " + '\n' + networkRequest)
-
-			// validate 'disableRollback'  (aka, 'suppressRollback')
-			boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, networkRequest)
-			execution.setVariable(Prefix + "rollbackEnabled", rollbackEnabled)
-			logger.debug(Prefix + "rollbackEnabled - " + rollbackEnabled)
-
-			String networkInputs = utils.getNodeXml(networkRequest, "network-inputs", false).replace("tag0:","").replace(":tag0","")
-			execution.setVariable(Prefix + "networkInputs", networkInputs)
-			logger.debug(Prefix + "networkInputs - " + '\n' + networkInputs)
-
-			// prepare messageId
-			String messageId = execution.getVariable(Prefix + "messageId")  // for testing
-			if (messageId == null || messageId == "") {
-				messageId = UUID.randomUUID()
-				logger.debug(" UPDNETI_messageId, random generated: " + messageId)
-			} else {
-				logger.debug(" UPDNETI_messageId, pre-assigned: " + messageId)
-			}
-			execution.setVariable(Prefix + "messageId", messageId)
-
-			String source = utils.getNodeText(networkRequest, "source")
-			execution.setVariable(Prefix + "source", source)
-			logger.debug(Prefix + "source - " + source)
-
-			String networkId = ""
-			if (utils.nodeExists(networkRequest, "network-id")) {
-				networkId = utils.getNodeText(networkRequest, "network-id")
-				if (networkId == 'null' || networkId == "") {
-					sendSyncError(execution)
-					// missing value of networkId
-					String dataErrorMessage = "Variable 'network-id' value/element is missing."
-					logger.debug(" Invalid Request - " + dataErrorMessage)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-				}
-			}
-
-			String lcpCloudRegion = ""
-			if (utils.nodeExists(networkRequest, "aic-cloud-region")) {
-				lcpCloudRegion = utils.getNodeText(networkRequest, "aic-cloud-region")
-				if ((lcpCloudRegion == 'null') || (lcpCloudRegion == "")) {
-					sendSyncError(execution)
-					String dataErrorMessage = "requestDetails has missing 'aic-cloud-region' value/element."
-					logger.debug(" Invalid Request - " + dataErrorMessage)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-				}
-			}
-
-			String serviceInstanceId = ""
-			if (utils.nodeExists(networkRequest, "service-instance-id")) {
-				serviceInstanceId = utils.getNodeText(networkRequest, "service-instance-id")
-				if ((serviceInstanceId == 'null') || (lcpCloudRegion == "")) {
-					sendSyncError(execution)
-					String dataErrorMessage = "Variable 'serviceInstanceId' value/element is missing."
-					logger.debug(" Invalid Request - " + dataErrorMessage)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-				}
-			}
-
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
-
-
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-
-			} catch (IOException ex) {
-				String exceptionMessage = "Exception Encountered in DoUpdateNetworkInstance, PreProcessRequest() - "
-				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				logger.debug(dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			// Set variables for Generic Get Sub Flow use
-			execution.setVariable(Prefix + "serviceInstanceId", serviceInstanceId)
-			logger.debug(Prefix + "serviceInstanceId - " + serviceInstanceId)
-
-			logger.debug(" Url for SDNC adapter: " + UrnPropertiesReader.getVariable("mso.adapters.sdnc.endpoint",execution))
-
-			String sdncVersion = execution.getVariable("sdncVersion")
-			logger.debug("sdncVersion? : " + sdncVersion)
-
-			// build 'networkOutputs'
-			networkId = utils.getNodeText(networkRequest, "network-id")
-			if ((networkId == null) || (networkId == "null")) {
-				networkId = ""
-			}
-			String networkName = utils.getNodeText(networkRequest, "network-name")
-			if ((networkName == null) || (networkName == "null")) {
-				networkName = ""
-			}
-			String networkOutputs =
-			   """<network-outputs>
+    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>DoUpdateNetworkInstance.bpmn</class> process.
+     * @param execution
+     */
+    public InitializeProcessVariables(DelegateExecution execution){
+        /* Initialize all the process variables in this block */
+
+        execution.setVariable(Prefix + "messageId", "")
+        execution.setVariable("BasicAuthHeaderValuePO", "")
+        execution.setVariable("BasicAuthHeaderValueSDNC", "")
+        execution.setVariable(Prefix + "networkRequest", "")
+        execution.setVariable(Prefix + "networkInputs", "")
+        execution.setVariable(Prefix + "networkOutputs", "")
+        execution.setVariable(Prefix + "requestId", "")
+        execution.setVariable(Prefix + "source", "")
+        execution.setVariable(Prefix + "networkId", "")
+
+        execution.setVariable(Prefix + "isPONR", false)    // Point-of-no-return, means, rollback is not needed
+
+        // AAI query Cloud Region
+        execution.setVariable(Prefix + "queryCloudRegionRequest","")
+        execution.setVariable(Prefix + "queryCloudRegionReturnCode","")
+        execution.setVariable(Prefix + "queryCloudRegionResponse","")
+        execution.setVariable(Prefix + "cloudRegionPo","")
+        execution.setVariable(Prefix + "cloudRegionSdnc","")
+        execution.setVariable(Prefix + "isCloudRegionGood", false)
+
+        // AAI query Id
+        execution.setVariable(Prefix + "queryIdAAIRequest","")
+        execution.setVariable(Prefix + "queryIdAAIResponse", "")
+        execution.setVariable(Prefix + "aaiIdReturnCode", "")
+
+        // AAI query vpn binding
+        execution.setVariable(Prefix + "queryVpnBindingAAIRequest","")
+        execution.setVariable(Prefix + "queryVpnBindingAAIResponse", "")
+        execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "")
+        execution.setVariable(Prefix + "vpnBindings", null)
+        execution.setVariable(Prefix + "vpnCount", 0)
+        execution.setVariable(Prefix + "routeCollection", "")
+
+        // AAI query network policy
+        execution.setVariable(Prefix + "queryNetworkPolicyAAIRequest","")
+        execution.setVariable(Prefix + "queryNetworkPolicyAAIResponse", "")
+        execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "")
+        execution.setVariable(Prefix + "networkPolicyUriList", null)
+        execution.setVariable(Prefix + "networkPolicyCount", 0)
+        execution.setVariable(Prefix + "networkCollection", "")
+
+        // AAI query route table reference
+        execution.setVariable(Prefix + "queryNetworkTableRefAAIRequest","")
+        execution.setVariable(Prefix + "queryNetworkTableRefAAIResponse", "")
+        execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "")
+        execution.setVariable(Prefix + "networkTableRefUriList", null)
+        execution.setVariable(Prefix + "networkTableRefCount", 0)
+        execution.setVariable(Prefix + "tableRefCollection", "")
+
+        // AAI requery Id
+        execution.setVariable(Prefix + "requeryIdAAIRequest","")
+        execution.setVariable(Prefix + "requeryIdAAIResponse", "")
+        execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "")
+
+        // AAI update contrail
+        execution.setVariable(Prefix + "updateContrailAAIUrlRequest","")
+        execution.setVariable(Prefix + "updateContrailAAIPayloadRequest","")
+        execution.setVariable(Prefix + "updateContrailAAIResponse", "")
+        execution.setVariable(Prefix + "aaiUpdateContrailReturnCode", "")
+
+        execution.setVariable(Prefix + "updateNetworkRequest", "")
+        execution.setVariable(Prefix + "updateNetworkResponse", "")
+        execution.setVariable(Prefix + "rollbackNetworkRequest", "")
+        execution.setVariable(Prefix + "networkReturnCode", "")
+        execution.setVariable(Prefix + "isNetworkRollbackNeeded", false)
+
+        execution.setVariable(Prefix + "changeAssignSDNCRequest", "")
+        execution.setVariable(Prefix + "changeAssignSDNCResponse", "")
+        execution.setVariable(Prefix + "rollbackSDNCRequest", "")
+        execution.setVariable(Prefix + "sdncReturnCode", "")
+        execution.setVariable(Prefix + "isSdncRollbackNeeded", false)
+        execution.setVariable(Prefix + "sdncResponseSuccess", false)
+
+        execution.setVariable(Prefix + "isVnfBindingPresent", false)
+        execution.setVariable(Prefix + "Success", false)
+        execution.setVariable(Prefix + "serviceInstanceId", "")
+
+        execution.setVariable(Prefix + "isException", false)
+
+    }
+
+    // **************************************************
+    //     Pre or Prepare Request Section
+    // **************************************************
+    /**
+     * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstance.bpmn</class> process.
+     * @param execution
+     */
+    public void preProcessRequest (DelegateExecution execution) {
+
+        execution.setVariable("prefix",Prefix)
+
+        logger.trace("Inside preProcessRequest DoUpdateNetworkInstance Request ")
+
+        try {
+            // initialize flow variables
+            InitializeProcessVariables(execution)
+
+            // GET Incoming request & validate 3 kinds of format.
+            execution.setVariable("action", "UPDATE")
+            String networkRequest = execution.getVariable("bpmnRequest")
+            if (networkRequest != null) {
+                if (networkRequest.contains("requestDetails")) {
+                    // JSON format request is sent, create xml
+                    try {
+                        def prettyJson = JsonOutput.prettyPrint(networkRequest.toString())
+                        logger.debug(" Incoming message formatted . . . : " + '\n' + prettyJson)
+                        networkRequest =  vidUtils.createXmlNetworkRequestInfra(execution, networkRequest)
+
+                    } catch (Exception ex) {
+                        String dataErrorMessage = " Invalid json format Request - " + ex.getMessage()
+                        logger.debug(dataErrorMessage)
+                        exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                    }
+                } else {
+                    // XML format request is sent
+
+                }
+            } else {
+                // vIPR format request is sent, create xml from individual variables
+                networkRequest = vidUtils.createXmlNetworkRequestInstance(execution)
+            }
+
+            networkRequest = utils.formatXml(networkRequest)
+            logger.debug(networkRequest)
+            execution.setVariable(Prefix + "networkRequest", networkRequest)
+            logger.debug(" network-request - " + '\n' + networkRequest)
+
+            // validate 'disableRollback'  (aka, 'suppressRollback')
+            boolean rollbackEnabled = networkUtils.isRollbackEnabled(execution, networkRequest)
+            execution.setVariable(Prefix + "rollbackEnabled", rollbackEnabled)
+            logger.debug(Prefix + "rollbackEnabled - " + rollbackEnabled)
+
+            String networkInputs = utils.getNodeXml(networkRequest, "network-inputs", false).replace("tag0:","").replace(":tag0","")
+            execution.setVariable(Prefix + "networkInputs", networkInputs)
+            logger.debug(Prefix + "networkInputs - " + '\n' + networkInputs)
+
+            // prepare messageId
+            String messageId = execution.getVariable(Prefix + "messageId")  // for testing
+            if (messageId == null || messageId == "") {
+                messageId = UUID.randomUUID()
+                logger.debug(" UPDNETI_messageId, random generated: " + messageId)
+            } else {
+                logger.debug(" UPDNETI_messageId, pre-assigned: " + messageId)
+            }
+            execution.setVariable(Prefix + "messageId", messageId)
+
+            String source = utils.getNodeText(networkRequest, "source")
+            execution.setVariable(Prefix + "source", source)
+            logger.debug(Prefix + "source - " + source)
+
+            String networkId = ""
+            if (utils.nodeExists(networkRequest, "network-id")) {
+                networkId = utils.getNodeText(networkRequest, "network-id")
+                if (networkId == 'null' || networkId == "") {
+                    sendSyncError(execution)
+                    // missing value of networkId
+                    String dataErrorMessage = "Variable 'network-id' value/element is missing."
+                    logger.debug(" Invalid Request - " + dataErrorMessage)
+                    exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+
+                }
+            }
+
+            String lcpCloudRegion = ""
+            if (utils.nodeExists(networkRequest, "aic-cloud-region")) {
+                lcpCloudRegion = utils.getNodeText(networkRequest, "aic-cloud-region")
+                if ((lcpCloudRegion == 'null') || (lcpCloudRegion == "")) {
+                    sendSyncError(execution)
+                    String dataErrorMessage = "requestDetails has missing 'aic-cloud-region' value/element."
+                    logger.debug(" Invalid Request - " + dataErrorMessage)
+                    exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                }
+            }
+
+            String serviceInstanceId = ""
+            if (utils.nodeExists(networkRequest, "service-instance-id")) {
+                serviceInstanceId = utils.getNodeText(networkRequest, "service-instance-id")
+                if ((serviceInstanceId == 'null') || (lcpCloudRegion == "")) {
+                    sendSyncError(execution)
+                    String dataErrorMessage = "Variable 'serviceInstanceId' value/element is missing."
+                    logger.debug(" Invalid Request - " + dataErrorMessage)
+                    exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+                }
+            }
+
+            // PO Authorization Info / headers Authorization=
+            String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
+
+
+            try {
+                def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
+                execution.setVariable("BasicAuthHeaderValuePO",encodedString)
+                execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
+
+            } catch (IOException ex) {
+                String exceptionMessage = "Exception Encountered in DoUpdateNetworkInstance, PreProcessRequest() - "
+                String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
+                logger.debug(dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            }
+
+            // Set variables for Generic Get Sub Flow use
+            execution.setVariable(Prefix + "serviceInstanceId", serviceInstanceId)
+            logger.debug(Prefix + "serviceInstanceId - " + serviceInstanceId)
+
+            logger.debug(" Url for SDNC adapter: " + UrnPropertiesReader.getVariable("mso.adapters.sdnc.endpoint",execution))
+
+            String sdncVersion = execution.getVariable("sdncVersion")
+            logger.debug("sdncVersion? : " + sdncVersion)
+
+            // build 'networkOutputs'
+            networkId = utils.getNodeText(networkRequest, "network-id")
+            if ((networkId == null) || (networkId == "null")) {
+                networkId = ""
+            }
+            String networkName = utils.getNodeText(networkRequest, "network-name")
+            if ((networkName == null) || (networkName == "null")) {
+                networkName = ""
+            }
+            String networkOutputs =
+                    """<network-outputs>
 	                   <network-id>${MsoUtils.xmlEscape(networkId)}</network-id>
 	                   <network-name>${MsoUtils.xmlEscape(networkName)}</network-name>
 	                 </network-outputs>"""
-			execution.setVariable(Prefix + "networkOutputs", networkOutputs)
-			logger.debug(Prefix + "networkOutputs - " + '\n' + networkOutputs)
-			execution.setVariable(Prefix + "networkId", networkId)
-			execution.setVariable(Prefix + "networkName", networkName)
+            execution.setVariable(Prefix + "networkOutputs", networkOutputs)
+            logger.debug(Prefix + "networkOutputs - " + '\n' + networkOutputs)
+            execution.setVariable(Prefix + "networkId", networkId)
+            execution.setVariable(Prefix + "networkName", networkName)
 
 
-		} catch (BpmnError e) {
-			throw e;
+        } catch (BpmnError e) {
+            throw e;
 
-		} catch (Exception ex){
-			sendSyncError(execution)
-			 // caught exception
-			String exceptionMessage = "Exception Encountered in DoUpdateNetworkInstance, PreProcessRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex){
+            sendSyncError(execution)
+            // caught exception
+            String exceptionMessage = "Exception Encountered in DoUpdateNetworkInstance, PreProcessRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
-	}
-
-	/**
-	 * Gets the service instance uri from aai
-	 *
-	 */
-	public void getServiceInstance(DelegateExecution execution) {
-		logger.trace("getServiceInstance ")
-		try {
-			String serviceInstanceId = execution.getVariable('serviceInstanceId')
-
-			AAIResourcesClient resourceClient = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId)
-
-			if(!resourceClient.exists(uri)){
-				exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Service Instance not found in aai")
-			}else{
-				Map<String, String> keys = uri.getURIKeys()
-				execution.setVariable("serviceType", keys.get("service-type"))
-				execution.setVariable("subscriberName", keys.get("global-customer-id"))
-			}
-
-		}catch(BpmnError e) {
-			throw e;
-		}catch (Exception ex){
-			String msg = "Exception in getServiceInstance. " + ex.getMessage()
-			logger.debug(msg)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-	}
+        }
+    }
+
+    /**
+     * Gets the service instance uri from aai
+     *
+     */
+    public void getServiceInstance(DelegateExecution execution) {
+        logger.trace("getServiceInstance ")
+        try {
+            String serviceInstanceId = execution.getVariable('serviceInstanceId')
+
+            AAIResourcesClient resourceClient = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId)
+
+            if(!resourceClient.exists(uri)){
+                exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Service Instance not found in aai")
+            }else{
+                Map<String, String> keys = uri.getURIKeys()
+                execution.setVariable("serviceType", keys.get("service-type"))
+                execution.setVariable("subscriberName", keys.get("global-customer-id"))
+            }
+
+        }catch(BpmnError e) {
+            throw e;
+        }catch (Exception ex){
+            String msg = "Exception in getServiceInstance. " + ex.getMessage()
+            logger.debug(msg)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
+        }
+    }
 
-	public void callRESTQueryAAICloudRegion (DelegateExecution execution) {
+    public void callRESTQueryAAICloudRegion (DelegateExecution execution) {
 
-		execution.setVariable("prefix", Prefix)
+        execution.setVariable("prefix", Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAICloudRegion of DoUpdateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAICloudRegion of DoUpdateNetworkInstance ***** " )
 
-		try {
-			String networkInputs  = execution.getVariable(Prefix + "networkInputs")
-			String cloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
+        try {
+            String networkInputs  = execution.getVariable(Prefix + "networkInputs")
+            String cloudRegion = utils.getNodeText(networkInputs, "aic-cloud-region")
 
-			// Prepare AA&I url
-			String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
-			AaiUtil aaiUtil = new AaiUtil(this)
+            // Prepare AA&I url
+            String aai_endpoint = UrnPropertiesReader.getVariable("aai.endpoint", execution)
+            AaiUtil aaiUtil = new AaiUtil(this)
 
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, Defaults.CLOUD_OWNER.toString(), cloudRegion)
-			def queryCloudRegionRequest = aaiUtil.createAaiUri(uri)
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CLOUD_REGION, Defaults.CLOUD_OWNER.toString(), cloudRegion)
+            def queryCloudRegionRequest = aaiUtil.createAaiUri(uri)
 
-			execution.setVariable(Prefix + "queryCloudRegionRequest", queryCloudRegionRequest)
+            execution.setVariable(Prefix + "queryCloudRegionRequest", queryCloudRegionRequest)
 
-			String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
-			String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
+            String cloudRegionPo = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "PO", cloudRegion)
+            String cloudRegionSdnc = aaiUtil.getAAICloudReqion(execution,  queryCloudRegionRequest, "SDNC", cloudRegion)
 
-			if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
-				execution.setVariable(Prefix + "cloudRegionPo", cloudRegionPo)
-				execution.setVariable(Prefix + "cloudRegionSdnc", cloudRegionSdnc)
-				execution.setVariable(Prefix + "isCloudRegionGood", true)
+            if ((cloudRegionPo != "ERROR") && (cloudRegionSdnc != "ERROR")) {
+                execution.setVariable(Prefix + "cloudRegionPo", cloudRegionPo)
+                execution.setVariable(Prefix + "cloudRegionSdnc", cloudRegionSdnc)
+                execution.setVariable(Prefix + "isCloudRegionGood", true)
 
-			} else {
-			    String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable(Prefix + "queryCloudRegionReturnCode")
-			    logger.debug(dataErrorMessage)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            } else {
+                String dataErrorMessage = "QueryAAICloudRegion Unsuccessful. Return Code: " + execution.getVariable(Prefix + "queryCloudRegionReturnCode")
+                logger.debug(dataErrorMessage)
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
 
-			}
+            }
 
-			logger.debug(" is Cloud Region Good: " + execution.getVariable(Prefix + "isCloudRegionGood"))
+            logger.debug(" is Cloud Region Good: " + execution.getVariable(Prefix + "isCloudRegionGood"))
 
-		} catch (BpmnError e) {
-			throw e;
+        } catch (BpmnError e) {
+            throw e;
 
-		} catch (Exception ex) {
-			// try error
-			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow - callRESTQueryAAICloudRegion() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            // try error
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow - callRESTQueryAAICloudRegion() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void callRESTQueryAAINetworkId(DelegateExecution execution) {
+    public void callRESTQueryAAINetworkId(DelegateExecution execution) {
 
-		execution.setVariable("prefix", Prefix)
+        execution.setVariable("prefix", Prefix)
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkId of DoUpdateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTQueryAAINetworkId of DoUpdateNetworkInstance ***** " )
 
-		try {
-			// get variables
-			String networkRequest = execution.getVariable(Prefix + "networkRequest")
-			String networkId   = utils.getNodeText(networkRequest, "network-id")
-			execution.setVariable(Prefix + "networkId", networkId)
+        try {
+            // get variables
+            String networkRequest = execution.getVariable(Prefix + "networkRequest")
+            String networkId   = utils.getNodeText(networkRequest, "network-id")
+            execution.setVariable(Prefix + "networkId", networkId)
 
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
-			AAIResultWrapper network = client.get(uri, NotFoundException.class)
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
+            AAIResultWrapper network = client.get(uri, NotFoundException.class)
 
-			execution.setVariable(Prefix + "aaiIdReturnCode", "200")
+            execution.setVariable(Prefix + "aaiIdReturnCode", "200")
 
-			execution.setVariable(Prefix + "queryIdAAIResponse", network)
+            execution.setVariable(Prefix + "queryIdAAIResponse", network)
 
 
-		} catch (NotFoundException e) {
-			String dataErrorMessage = "Response Error from QueryAAINetworkId is 404 (Not Found)."
-			logger.debug(" AAI Query Failed. " + dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkId() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from QueryAAINetworkId is 404 (Not Found)."
+            logger.debug(" AAI Query Failed. " + dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkId() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
 
-	public void callRESTReQueryAAINetworkId(DelegateExecution execution) {
+    public void callRESTReQueryAAINetworkId(DelegateExecution execution) {
 
-		execution.setVariable("prefix", Prefix)
+        execution.setVariable("prefix", Prefix)
 
-		logger.debug(" ***** Inside callRESTReQueryAAINetworkId of DoUpdateNetworkInstance ***** " )
+        logger.debug(" ***** Inside callRESTReQueryAAINetworkId of DoUpdateNetworkInstance ***** " )
 
-		try {
-			// get variables
-			String networkRequest = execution.getVariable(Prefix + "networkRequest")
-			String networkId   = utils.getNodeText(networkRequest, "network-id")
+        try {
+            // get variables
+            String networkRequest = execution.getVariable(Prefix + "networkRequest")
+            String networkId   = utils.getNodeText(networkRequest, "network-id")
 
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
-			AAIResultWrapper network = client.get(uri, NotFoundException.class)
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId).depth(Depth.ONE)
+            AAIResultWrapper network = client.get(uri, NotFoundException.class)
 
-			execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "200")
-			execution.setVariable(Prefix + "requeryIdAAIResponse", network)
+            execution.setVariable(Prefix + "aaiRequeryIdReturnCode", "200")
+            execution.setVariable(Prefix + "requeryIdAAIResponse", network)
 
-			L3Network net = network.asBean(L3Network.class).get()
-			String netId = net.getNetworkId()
-			String netName = net.getNetworkName()
-			String networkOutputs =
-					"""<network-outputs>
+            L3Network net = network.asBean(L3Network.class).get()
+            String netId = net.getNetworkId()
+            String netName = net.getNetworkName()
+            String networkOutputs =
+                    """<network-outputs>
                    <network-id>${MsoUtils.xmlEscape(netId)}</network-id>
                    <network-name>${MsoUtils.xmlEscape(netName)}</network-name>
                  </network-outputs>"""
-			execution.setVariable(Prefix + "networkOutputs", networkOutputs)
-			logger.debug(" networkOutputs - " + '\n' + networkOutputs)
-
-		} catch (NotFoundException e) {
-			String dataErrorMessage = "Response Error from ReQueryAAINetworkId is 404 (Not Found)."
-			logger.debug(" AAI ReQuery Failed. - " + dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTReQueryAAINetworkId() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTQueryAAINetworkVpnBinding(DelegateExecution execution) {
-
-		execution.setVariable("prefix", Prefix)
-
-		logger.debug(" ***** Inside callRESTQueryAAINetworkVpnBinding of DoUpdateNetworkInstance ***** " )
-
-		try {
-
-			// get variables
-			AAIResultWrapper queryIdAAIResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
-			if(queryIdAAIResponse.getRelationships().isPresent()){
-				List<AAIResourceUri> uris = queryIdAAIResponse.getRelationships().get().getRelatedAAIUris(AAIObjectType.VPN_BINDING)
-
-				logger.debug(Prefix + "vpnCount - " + uris.size())
-
-				if (uris.size() > 0) {
-					String routeTargets = ""
-					for(AAIResourceUri u : uris) {
-
-						AAIResourcesClient client = new AAIResourcesClient()
-						AAIResultWrapper wrapper = client.get(u.depth(Depth.TWO), NotFoundException.class)
-						Optional<VpnBinding> binding = wrapper.asBean(VpnBinding.class)
-
-						String routeTarget = ""
-						String routeRole = ""
-						if(binding.get().getRouteTargets() != null) {
-							List<RouteTarget> targets = binding.get().getRouteTargets().getRouteTarget()
-							for(RouteTarget target : targets) {
-								routeTarget  = target.getGlobalRouteTarget()
-								routeRole  = target.getRouteTargetRole()
-								routeTargets += "<routeTargets>" + '\n' +
-										" <routeTarget>" + routeTarget + "</routeTarget>" + '\n' +
-										" <routeTargetRole>" + routeRole + "</routeTargetRole>" + '\n' +
-										"</routeTargets>" + '\n'
-							}
-						}
-
-					} // end loop
-
-					execution.setVariable(Prefix + "routeCollection", routeTargets)
-					logger.debug(" UPDNETI_routeCollection - " + '\n' + routeTargets)
-
-				} else {
-					// reset return code to success
-					execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")
-					AaiUtil aaiUriUtil = new AaiUtil(this)
-					String schemaVersion = aaiUriUtil.getNamespace()
-					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(Prefix + "queryVpnBindingAAIResponse", aaiStubResponseAsXml)
-					execution.setVariable(Prefix + "routeCollection", "<routeTargets/>")
-					logger.debug(" No vpnBinding, using this stub as response - " + '\n' + aaiStubResponseAsXml)
-
-				}
-			}
+            execution.setVariable(Prefix + "networkOutputs", networkOutputs)
+            logger.debug(" networkOutputs - " + '\n' + networkOutputs)
+
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from ReQueryAAINetworkId is 404 (Not Found)."
+            logger.debug(" AAI ReQuery Failed. - " + dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTReQueryAAINetworkId() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		} catch (NotFoundException e) {
-			logger.debug("Response Error from AAINetworkVpnBinding is 404 (Not Found).")
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Response Error from AAINetworkVpnBinding is 404 (Not Found).")
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkVpnBinding() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
+        }
 
-	public void callRESTQueryAAINetworkPolicy(DelegateExecution execution) {
+    }
 
-		execution.setVariable("prefix", Prefix)
+    public void callRESTQueryAAINetworkVpnBinding(DelegateExecution execution) {
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkPolicy of DoUpdateNetworkInstance ***** " )
+        execution.setVariable("prefix", Prefix)
 
-		try {
-			// get variables
-			AAIResultWrapper queryIdAAIResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
-			if(queryIdAAIResponse.getRelationships().isPresent()){
-				List<AAIResourceUri> uris = queryIdAAIResponse.getRelationships().get().getRelatedAAIUris(AAIObjectType.NETWORK_POLICY)
+        logger.debug(" ***** Inside callRESTQueryAAINetworkVpnBinding of DoUpdateNetworkInstance ***** " )
 
-				execution.setVariable(Prefix + "networkPolicyCount", uris.size())
-				logger.debug(Prefix + "networkPolicyCount - " + uris.size())
+        try {
 
-				if (uris.size() > 0) {
+            // get variables
+            AAIResultWrapper queryIdAAIResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
+            if(queryIdAAIResponse.getRelationships().isPresent()){
+                List<AAIResourceUri> uris = queryIdAAIResponse.getRelationships().get().getRelatedAAIUris(AAIObjectType.VPN_BINDING)
 
-					String networkPolicies = ""
-					// AII loop call using list vpnBindings
-					for(AAIResourceUri u : uris) {
+                logger.debug(Prefix + "vpnCount - " + uris.size())
 
-						AAIResourcesClient client = new AAIResourcesClient()
-						NetworkPolicy p = client.get(u, NotFoundException.class).asBean(NetworkPolicy.class).get()
+                if (uris.size() > 0) {
+                    String routeTargets = ""
+                    for(AAIResourceUri u : uris) {
 
-						execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
+                        AAIResourcesClient client = new AAIResourcesClient()
+                        AAIResultWrapper wrapper = client.get(u.depth(Depth.TWO), NotFoundException.class)
+                        Optional<VpnBinding> binding = wrapper.asBean(VpnBinding.class)
 
-						String networkPolicy  = p.getNetworkPolicyFqdn()
-						networkPolicies += "<policyFqdns>" + networkPolicy + "</policyFqdns>" + '\n'
+                        String routeTarget = ""
+                        String routeRole = ""
+                        if(binding.get().getRouteTargets() != null) {
+                            List<RouteTarget> targets = binding.get().getRouteTargets().getRouteTarget()
+                            for(RouteTarget target : targets) {
+                                routeTarget  = target.getGlobalRouteTarget()
+                                routeRole  = target.getRouteTargetRole()
+                                routeTargets += "<routeTargets>" + '\n' +
+                                        " <routeTarget>" + routeTarget + "</routeTarget>" + '\n' +
+                                        " <routeTargetRole>" + routeRole + "</routeTargetRole>" + '\n' +
+                                        "</routeTargets>" + '\n'
+                            }
+                        }
 
-					} // end loop
+                    } // end loop
 
-					execution.setVariable(Prefix + "networkCollection", networkPolicies)
-					logger.debug(" UPDNETI_networkCollection - " + '\n' + networkPolicies)
+                    execution.setVariable(Prefix + "routeCollection", routeTargets)
+                    logger.debug(" UPDNETI_routeCollection - " + '\n' + routeTargets)
 
-				} else {
-					// reset return code to success
-					execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
-					AaiUtil aaiUriUtil = new AaiUtil(this)
-					String schemaVersion = aaiUriUtil.getNamespace()
-					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>
+                } else {
+                    // reset return code to success
+                    execution.setVariable(Prefix + "aaiQqueryVpnBindingReturnCode", "200")
+                    AaiUtil aaiUriUtil = new AaiUtil(this)
+                    String schemaVersion = aaiUriUtil.getNamespace()
+                    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(Prefix + "queryNetworkPolicyAAIResponse", aaiStubResponseAsXml)
-					execution.setVariable(Prefix + "networkCollection", "<policyFqdns/>")
-					logger.debug(" No net policies, using this stub as response - " + '\n' + aaiStubResponseAsXml)
+                    String aaiStubResponseAsXml = utils.formatXml(aaiStubResponse)
+                    execution.setVariable(Prefix + "queryVpnBindingAAIResponse", aaiStubResponseAsXml)
+                    execution.setVariable(Prefix + "routeCollection", "<routeTargets/>")
+                    logger.debug(" No vpnBinding, using this stub as response - " + '\n' + aaiStubResponseAsXml)
+
+                }
+            }
+
+        } catch (NotFoundException e) {
+            logger.debug("Response Error from AAINetworkVpnBinding is 404 (Not Found).")
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Response Error from AAINetworkVpnBinding is 404 (Not Found).")
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkVpnBinding() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-				}
-			}
+        }
 
-		} catch (NotFoundException e) {
-			String dataErrorMessage = "Response Error from QueryAAINetworkPolicy is 404 (Not Found)."
-			logger.debug(dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkPolicy() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+    }
 
-		}
+    public void callRESTQueryAAINetworkPolicy(DelegateExecution execution) {
 
-	}
+        execution.setVariable("prefix", Prefix)
 
-	public void callRESTQueryAAINetworkTableRef(DelegateExecution execution) {
+        logger.debug(" ***** Inside callRESTQueryAAINetworkPolicy of DoUpdateNetworkInstance ***** " )
 
-		execution.setVariable("prefix", Prefix)
+        try {
+            // get variables
+            AAIResultWrapper queryIdAAIResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
+            if(queryIdAAIResponse.getRelationships().isPresent()){
+                List<AAIResourceUri> uris = queryIdAAIResponse.getRelationships().get().getRelatedAAIUris(AAIObjectType.NETWORK_POLICY)
 
-		logger.debug(" ***** Inside callRESTQueryAAINetworkTableRef of DoUpdateNetworkInstance ***** " )
+                execution.setVariable(Prefix + "networkPolicyCount", uris.size())
+                logger.debug(Prefix + "networkPolicyCount - " + uris.size())
 
-		try {
-			AAIResultWrapper queryIdAAIResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
-			if(queryIdAAIResponse.getRelationships().isPresent()){
-				List<AAIResourceUri> uris = queryIdAAIResponse.getRelationships().get().getRelatedAAIUris(AAIObjectType.ROUTE_TABLE_REFERENCE)
+                if (uris.size() > 0) {
 
-				execution.setVariable(Prefix + "networkTableRefCount", uris.size())
-				logger.debug(Prefix + "networkTableRefCount - " + uris.size())
+                    String networkPolicies = ""
+                    // AII loop call using list vpnBindings
+                    for(AAIResourceUri u : uris) {
 
-				logger.debug(" UPDNETI_networkTableRefCount - " + uris.size())
-				if (uris.size() > 0) {
+                        AAIResourcesClient client = new AAIResourcesClient()
+                        NetworkPolicy p = client.get(u, NotFoundException.class).asBean(NetworkPolicy.class).get()
 
-					execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
+                        execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
 
-					// AII loop call using list vpnBindings
-					String networkTableRefs = ""
-					for(AAIResourceUri u : uris) {
+                        String networkPolicy  = p.getNetworkPolicyFqdn()
+                        networkPolicies += "<policyFqdns>" + networkPolicy + "</policyFqdns>" + '\n'
 
-						AAIResourcesClient client = new AAIResourcesClient()
-						RouteTableReference rt = client.get(u, NotFoundException.class).asBean(RouteTableReference.class).get()
+                    } // end loop
 
-						String networkTableRef  = rt.getRouteTableReferenceFqdn()
-						networkTableRefs += "<routeTableFqdns>" + networkTableRef + "</routeTableFqdns>" + '\n'
+                    execution.setVariable(Prefix + "networkCollection", networkPolicies)
+                    logger.debug(" UPDNETI_networkCollection - " + '\n' + networkPolicies)
 
-					} // end loop
+                } else {
+                    // reset return code to success
+                    execution.setVariable(Prefix + "aaiQqueryNetworkPolicyReturnCode", "200")
+                    AaiUtil aaiUriUtil = new AaiUtil(this)
+                    String schemaVersion = aaiUriUtil.getNamespace()
+                    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(Prefix + "queryNetworkPolicyAAIResponse", aaiStubResponseAsXml)
+                    execution.setVariable(Prefix + "networkCollection", "<policyFqdns/>")
+                    logger.debug(" No net policies, using this stub as response - " + '\n' + aaiStubResponseAsXml)
+
+                }
+            }
+
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from QueryAAINetworkPolicy is 404 (Not Found)."
+            logger.debug(dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkPolicy() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-					execution.setVariable(Prefix + "tableRefCollection", networkTableRefs)
-					logger.debug(" UPDNETI_tableRefCollection - " + '\n' + networkTableRefs)
+        }
 
-				} else {
-					// reset return code to success
-					execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
-					AaiUtil aaiUriUtil = new AaiUtil(this)
-					String schemaVersion = aaiUriUtil.getNamespace()
-					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(Prefix + "queryNetworkTableRefAAIResponse", aaiStubResponseAsXml)
-					execution.setVariable(Prefix + "tableRefCollection", "<routeTableFqdns/>")
-					logger.debug(" No net table references, using this stub as response - " + '\n' + aaiStubResponseAsXml)
-
-				}
-			}
-
-		} catch (NotFoundException e) {
-			String dataErrorMessage = "Response Error from QueryAAINetworkTableRef is 404 (Not Found)."
-			logger.debug(dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkTableRef() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void callRESTUpdateContrailAAINetwork(DelegateExecution execution) {
-		execution.setVariable("prefix", Prefix)
-		logger.debug(" ***** Inside callRESTUpdateContrailAAINetwork of DoUpdateNetworkInstance ***** " )
-		try {
-			// get variables
-			String networkRequest = execution.getVariable(Prefix + "networkRequest")
-			String networkId   = utils.getNodeText(networkRequest, "network-id")
-			AAIResultWrapper requeryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse")
-			String updateNetworkResponse   = execution.getVariable(Prefix + "updateNetworkResponse")
-
-			L3Network oldL3Network = requeryIdAAIResponse.asBean(L3Network.class).get()
-			L3Network l3Network = new L3Network()
-			if (oldL3Network.getHeatStackId() != null) {
-			} else {
-				if (utils.nodeExists(updateNetworkResponse, 'networkStackId')) {
-					l3Network.setHeatStackId(utils.getNodeText(updateNetworkResponse, 'networkStackId'))
-				}
-			}
-			if (oldL3Network.getNeutronNetworkId() != null) {
-			} else {
-				if (utils.nodeExists(updateNetworkResponse, 'neutronNetworkId')) {
-					l3Network.setNeutronNetworkId(utils.getNodeText(updateNetworkResponse, 'neutronNetworkId'))
-				}
-			}
-			if (oldL3Network.getContrailNetworkFqdn() != null) {
-			} else {
-				if (utils.nodeExists(updateNetworkResponse, 'networkFqdn')) {
-					l3Network.setContrailNetworkFqdn(utils.getNodeText(updateNetworkResponse, 'networkFqdn'))
-				}
-			}
-
-			String status = utils.getNodeText(updateNetworkResponse, 'orchestration-status')
-			if(status.equals("pending-create") || status.equals("PendingCreate")){
-				l3Network.setOrchestrationStatus("Created")
-			}else{
-				l3Network.setOrchestrationStatus("Active")
-			}
-
-			AAIResourcesClient client = new AAIResourcesClient()
-			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId)
-			client.update(uri, l3Network)
-
-			List<Subnet> subnets = oldL3Network.getSubnets().getSubnet()
-			for(Subnet s:subnets){
-				String subnetOrchStatus = s.getOrchestrationStatus()
-				String subnetId = s.getSubnetId()
-
-				Subnet subnet = new Subnet()
-				String neutronSubnetId = networkUtils.extractNeutSubId(updateNetworkResponse, subnetId)
-				subnet.setNeutronSubnetId(neutronSubnetId)
-				if(subnetOrchStatus.equals("pending-create") || subnetOrchStatus.equals("PendingCreate") ){
-					subnet.setOrchestrationStatus("Created")
-				}else{
-					subnet.setOrchestrationStatus("Active")
-				}
-
-				AAIResourceUri subUri = AAIUriFactory.createResourceUri(AAIObjectType.SUBNET, networkId, subnetId)
-				client.update(subUri, subnet)
-			}
-
-			execution.setVariable(Prefix + "isPONR", true)
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (NotFoundException e) {
-			String dataErrorMessage = " Response Error from UpdateContrailAAINetwork is 404 (Not Found)."
-			logger.debug(dataErrorMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-		} catch (Exception ex) {
-			String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTUpdateContrailAAINetwork() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void prepareUpdateNetworkRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix", Prefix)
-
-		logger.trace("Inside prepareUpdateNetworkRequest of DoUpdateNetworkInstance ")
-
-		try {
-
-			// get variables
-			String requestId = execution.getVariable(Prefix + "requestId")
-			String messageId = execution.getVariable(Prefix + "messageId")
-			String source    = execution.getVariable(Prefix + "source")
-
-			String requestInput = execution.getVariable(Prefix + "networkRequest")
-            L3Network queryIdResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionPo")
-			String backoutOnFailure = execution.getVariable(Prefix + "rollbackEnabled")
+    }
 
-			// Prepare Network request
-			String routeCollection = execution.getVariable(Prefix + "routeCollection")
-			String policyCollection = execution.getVariable(Prefix + "networkCollection")
-			String tableCollection = execution.getVariable(Prefix + "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:", "")
-			logger.debug(buildUpdateNetworkRequestAsString)
+    public void callRESTQueryAAINetworkTableRef(DelegateExecution execution) {
 
-			execution.setVariable(Prefix + "updateNetworkRequest", buildUpdateNetworkRequestAsString)
-			logger.debug(" UPDNETI_updateNetworkRequest - " + "\n" +  buildUpdateNetworkRequestAsString)
+        execution.setVariable("prefix", Prefix)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareUpdateNetworkRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        logger.debug(" ***** Inside callRESTQueryAAINetworkTableRef of DoUpdateNetworkInstance ***** " )
 
-		}
+        try {
+            AAIResultWrapper queryIdAAIResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
+            if(queryIdAAIResponse.getRelationships().isPresent()){
+                List<AAIResourceUri> uris = queryIdAAIResponse.getRelationships().get().getRelatedAAIUris(AAIObjectType.ROUTE_TABLE_REFERENCE)
 
-	}
+                execution.setVariable(Prefix + "networkTableRefCount", uris.size())
+                logger.debug(Prefix + "networkTableRefCount - " + uris.size())
 
-	public void prepareSDNCRequest (DelegateExecution execution) {
+                logger.debug(" UPDNETI_networkTableRefCount - " + uris.size())
+                if (uris.size() > 0) {
 
-		execution.setVariable("prefix", Prefix)
+                    execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
 
-		logger.trace("Inside prepareSDNCRequest of DoUpdateNetworkInstance ")
+                    // AII loop call using list vpnBindings
+                    String networkTableRefs = ""
+                    for(AAIResourceUri u : uris) {
 
-		try {
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String updateNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+                        AAIResourcesClient client = new AAIResourcesClient()
+                        RouteTableReference rt = client.get(u, NotFoundException.class).asBean(RouteTableReference.class).get()
 
-			String networkId = ""
-			if (utils.nodeExists(updateNetworkInput, "network-id")) {
-			   networkId = utils.getNodeText(updateNetworkInput, "network-id")
-			}
-			if (networkId == null) {networkId = ""}
+                        String networkTableRef  = rt.getRouteTableReferenceFqdn()
+                        networkTableRefs += "<routeTableFqdns>" + networkTableRef + "</routeTableFqdns>" + '\n'
 
-			String serviceInstanceId = utils.getNodeText(updateNetworkInput, "service-instance-id")
+                    } // end loop
 
-			AAIResultWrapper wrapper = execution.getVariable(Prefix + "queryIdAAIResponse")
-			L3Network queryAAIResponse = wrapper.asBean(L3Network.class).get()
+                    execution.setVariable(Prefix + "tableRefCollection", networkTableRefs)
+                    logger.debug(" UPDNETI_tableRefCollection - " + '\n' + networkTableRefs)
 
-			// 1. prepare assign topology via SDNC Adapter SUBFLOW call
- 		   	String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, updateNetworkInput, serviceInstanceId, sdncCallback, "changeassign", "NetworkActivateRequest", cloudRegionId, networkId, queryAAIResponse, null)
+                } else {
+                    // reset return code to success
+                    execution.setVariable(Prefix + "aaiQqueryNetworkTableRefReturnCode", "200")
+                    AaiUtil aaiUriUtil = new AaiUtil(this)
+                    String schemaVersion = aaiUriUtil.getNamespace()
+                    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(Prefix + "queryNetworkTableRefAAIResponse", aaiStubResponseAsXml)
+                    execution.setVariable(Prefix + "tableRefCollection", "<routeTableFqdns/>")
+                    logger.debug(" No net table references, using this stub as response - " + '\n' + aaiStubResponseAsXml)
 
-			String sndcTopologyUpdateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
-			logger.debug(sndcTopologyUpdateRequesAsString)
-			execution.setVariable(Prefix + "changeAssignSDNCRequest", sndcTopologyUpdateRequesAsString)
-			logger.debug(" UPDNETI_changeAssignSDNCRequest - " + "\n" +  sndcTopologyUpdateRequesAsString)
+                }
+            }
 
+        } catch (NotFoundException e) {
+            String dataErrorMessage = "Response Error from QueryAAINetworkTableRef is 404 (Not Found)."
+            logger.debug(dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSDNCRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTQueryAAINetworkTableRef() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
 
-	}
+    }
+
+    public void callRESTUpdateContrailAAINetwork(DelegateExecution execution) {
+        execution.setVariable("prefix", Prefix)
+        logger.debug(" ***** Inside callRESTUpdateContrailAAINetwork of DoUpdateNetworkInstance ***** " )
+        try {
+            // get variables
+            String networkRequest = execution.getVariable(Prefix + "networkRequest")
+            String networkId   = utils.getNodeText(networkRequest, "network-id")
+            AAIResultWrapper requeryIdAAIResponse   = execution.getVariable(Prefix + "requeryIdAAIResponse")
+            String updateNetworkResponse   = execution.getVariable(Prefix + "updateNetworkResponse")
+
+            L3Network oldL3Network = requeryIdAAIResponse.asBean(L3Network.class).get()
+            L3Network l3Network = new L3Network()
+            if (oldL3Network.getHeatStackId() != null) {
+            } else {
+                if (utils.nodeExists(updateNetworkResponse, 'networkStackId')) {
+                    l3Network.setHeatStackId(utils.getNodeText(updateNetworkResponse, 'networkStackId'))
+                }
+            }
+            if (oldL3Network.getNeutronNetworkId() != null) {
+            } else {
+                if (utils.nodeExists(updateNetworkResponse, 'neutronNetworkId')) {
+                    l3Network.setNeutronNetworkId(utils.getNodeText(updateNetworkResponse, 'neutronNetworkId'))
+                }
+            }
+            if (oldL3Network.getContrailNetworkFqdn() != null) {
+            } else {
+                if (utils.nodeExists(updateNetworkResponse, 'networkFqdn')) {
+                    l3Network.setContrailNetworkFqdn(utils.getNodeText(updateNetworkResponse, 'networkFqdn'))
+                }
+            }
+
+            String status = utils.getNodeText(updateNetworkResponse, 'orchestration-status')
+            if(status.equals("pending-create") || status.equals("PendingCreate")){
+                l3Network.setOrchestrationStatus("Created")
+            }else{
+                l3Network.setOrchestrationStatus("Active")
+            }
+
+            AAIResourcesClient client = new AAIResourcesClient()
+            AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.L3_NETWORK, networkId)
+            client.update(uri, l3Network)
+
+            List<Subnet> subnets = oldL3Network.getSubnets().getSubnet()
+            for(Subnet s:subnets){
+                String subnetOrchStatus = s.getOrchestrationStatus()
+                String subnetId = s.getSubnetId()
+
+                Subnet subnet = new Subnet()
+                String neutronSubnetId = networkUtils.extractNeutSubId(updateNetworkResponse, subnetId)
+                subnet.setNeutronSubnetId(neutronSubnetId)
+                if(subnetOrchStatus.equals("pending-create") || subnetOrchStatus.equals("PendingCreate") ){
+                    subnet.setOrchestrationStatus("Created")
+                }else{
+                    subnet.setOrchestrationStatus("Active")
+                }
+
+                AAIResourceUri subUri = AAIUriFactory.createResourceUri(AAIObjectType.SUBNET, networkId, subnetId)
+                client.update(subUri, subnet)
+            }
+
+            execution.setVariable(Prefix + "isPONR", true)
+
+        } catch (BpmnError e) {
+            throw e;
+        } catch (NotFoundException e) {
+            String dataErrorMessage = " Response Error from UpdateContrailAAINetwork is 404 (Not Found)."
+            logger.debug(dataErrorMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. callRESTUpdateContrailAAINetwork() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
+        }
 
+    }
 
+    public void prepareUpdateNetworkRequest (DelegateExecution execution) {
 
-	// **************************************************
-	//     Post or Validate Response Section
-	// **************************************************
+        execution.setVariable("prefix", Prefix)
 
-	public void validateUpdateNetworkResponse (DelegateExecution execution) {
+        logger.trace("Inside prepareUpdateNetworkRequest of DoUpdateNetworkInstance ")
 
-		execution.setVariable("prefix", Prefix)
+        try {
 
-		logger.trace("Inside validateUpdateNetworkResponse of DoUpdateNetworkInstance ")
+            // get variables
+            String requestId = execution.getVariable(Prefix + "requestId")
+            String messageId = execution.getVariable(Prefix + "messageId")
+            String source    = execution.getVariable(Prefix + "source")
 
-		try {
-			String returnCode = execution.getVariable(Prefix + "networkReturnCode")
-			String networkResponse = execution.getVariable(Prefix + "updateNetworkResponse")
-			if (networkResponse==null)	{
-				networkResponse="" // reset
-			}
+            String requestInput = execution.getVariable(Prefix + "networkRequest")
+            L3Network queryIdResponse = execution.getVariable(Prefix + "requeryIdAAIResponse")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionPo")
+            String backoutOnFailure = execution.getVariable(Prefix + "rollbackEnabled")
+
+            // Prepare Network request
+            String routeCollection = execution.getVariable(Prefix + "routeCollection")
+            String policyCollection = execution.getVariable(Prefix + "networkCollection")
+            String tableCollection = execution.getVariable(Prefix + "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:", "")
+            logger.debug(buildUpdateNetworkRequestAsString)
+
+            execution.setVariable(Prefix + "updateNetworkRequest", buildUpdateNetworkRequestAsString)
+            logger.debug(" UPDNETI_updateNetworkRequest - " + "\n" +  buildUpdateNetworkRequestAsString)
+
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareUpdateNetworkRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+
+        }
 
-			logger.debug(" Network Adapter update responseCode: " + returnCode)
+    }
 
-			String errorMessage = ""
-			if (returnCode == "200") {
-				execution.setVariable(Prefix + "isNetworkRollbackNeeded", true)
-				logger.debug(networkResponse)
-				execution.setVariable(Prefix + "updateNetworkResponse", networkResponse)
-				logger.debug(" Network Adapter update Success Response - " + "\n" + networkResponse)
+    public void prepareSDNCRequest (DelegateExecution execution) {
 
-				// prepare rollback data
-				String rollbackData = utils.getNodeXml(networkResponse, "rollback", false).replace("tag0:","").replace(":tag0","")
-				rollbackData = rollbackData.replace("rollback>", "networkRollback>")
-  				String rollbackNetwork =
-					"""<rollbackNetworkRequest>
-							${rollbackData}
-						</rollbackNetworkRequest>"""
-				String rollbackNetworkXml = utils.formatXml(rollbackNetwork)
-				execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkXml)
-				logger.debug(" Network Adapter rollback data - " + "\n" + rollbackNetworkXml)
+        execution.setVariable("prefix", Prefix)
 
-			} 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.getNodeText(networkResponse, "message")
-					   errorMessage  = "Received error from Network Adapter: " + errorMessage
-					   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, errorMessage)
+        logger.trace("Inside prepareSDNCRequest of DoUpdateNetworkInstance ")
 
-				   } 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)
+        try {
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String updateNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
 
-				   }
+            String networkId = ""
+            if (utils.nodeExists(updateNetworkInput, "network-id")) {
+                networkId = utils.getNodeText(updateNetworkInput, "network-id")
+            }
+            if (networkId == null) {networkId = ""}
 
-			   } else { // CatchAll exception
-				   String dataErrorMessage  = "Received error from Network Adapter. Return code is: " + returnCode
-				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
+            String serviceInstanceId = utils.getNodeText(updateNetworkInput, "service-instance-id")
 
-			   }
+            AAIResultWrapper wrapper = execution.getVariable(Prefix + "queryIdAAIResponse")
+            L3Network queryAAIResponse = wrapper.asBean(L3Network.class).get()
 
-			}
+            // 1. prepare assign topology via SDNC Adapter SUBFLOW call
+            String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestV2(execution, updateNetworkInput, serviceInstanceId, sdncCallback, "changeassign", "NetworkActivateRequest", cloudRegionId, networkId, queryAAIResponse, null)
 
-		} catch (BpmnError e) {
-			throw e;
+            String sndcTopologyUpdateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
+            logger.debug(sndcTopologyUpdateRequesAsString)
+            execution.setVariable(Prefix + "changeAssignSDNCRequest", sndcTopologyUpdateRequesAsString)
+            logger.debug(" UPDNETI_changeAssignSDNCRequest - " + "\n" +  sndcTopologyUpdateRequesAsString)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. validateUpdateNetworkResponse() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSDNCRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
+        }
 
-	}
+    }
 
-	public void validateSDNCResponse (DelegateExecution execution) {
+    public void validateSDNCResponse (DelegateExecution execution) {
 
-		execution.setVariable("prefix", Prefix)
+        execution.setVariable("prefix", Prefix)
 
-		logger.trace("Inside validateSDNCResponse of DoUpdateNetworkInstance ")
+        logger.trace("Inside validateSDNCResponse of DoUpdateNetworkInstance ")
 
-		String response = execution.getVariable(Prefix + "changeAssignSDNCResponse")
-		WorkflowException workflowException = null
-		try {
-			workflowException = execution.getVariable(Prefix + "WorkflowException")
-			//execution.setVariable("WorkflowException", workflowException)
-		} catch (Exception ex) {
-			logger.debug(" Sdnc 'WorkflowException' object is empty or null. ")
-		}
+        String response = execution.getVariable(Prefix + "changeAssignSDNCResponse")
+        WorkflowException workflowException = null
+        try {
+            workflowException = execution.getVariable(Prefix + "WorkflowException")
+            //execution.setVariable("WorkflowException", workflowException)
+        } catch (Exception ex) {
+            logger.debug(" Sdnc 'WorkflowException' object is empty or null. ")
+        }
 
-		boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
+        boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
 
-		SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-		sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-		// reset variable
-		String changeAssignSDNCResponseDecodeXml = execution.getVariable(Prefix + "changeAssignSDNCResponse")
-		changeAssignSDNCResponseDecodeXml = changeAssignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-		execution.setVariable(Prefix + "changeAssignSDNCResponse", changeAssignSDNCResponseDecodeXml)
-
-		if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, prefix+'sdncResponseSuccess'
-			execution.setVariable(Prefix + "isSdncRollbackNeeded", true)
-			logger.debug("Successfully Validated SDNC Response")
-
-		} else {
-			logger.debug("Did NOT Successfully Validated SDNC Response")
-			throw new BpmnError("MSOWorkflowException")
-		}
-
-	}
-
-
-	public void postProcessResponse (DelegateExecution execution) {
-
-		execution.setVariable("prefix", Prefix)
-
-		logger.trace("Inside postProcessResponse of DoUpdateNetworkInstance ")
-
-		try {
-			logger.debug(" ***** Is Exception Encountered (isException)? : " + execution.getVariable(Prefix + "isException"))
-			if (execution.getVariable(Prefix + "isException") == false) {
-				// set rollback data
-				execution.setVariable("orchestrationStatus", "")
-				execution.setVariable("networkId", execution.getVariable(Prefix + "networkId"))
-				execution.setVariable("networkName", execution.getVariable(Prefix + "networkName"))
-				prepareSuccessRollbackData(execution) // populate rollbackData
-				execution.setVariable("WorkflowException", null)
-				execution.setVariable(Prefix + "Success", true)
-				logger.debug(" ***** postProcessResponse(), GOOD !!!")
-			} else {
-				execution.setVariable(Prefix + "Success", false)
-				execution.setVariable("rollbackData", null)
-				String exceptionMessage = " Exception encountered in MSO Bpmn. "
-				if (execution.getVariable("workflowException") != null) {  // Output of Rollback flow.
-				   logger.debug(" ***** workflowException: " + execution.getVariable("workflowException"))
-				   WorkflowException wfex = execution.getVariable("workflowException")
-				   exceptionMessage = wfex.getErrorMessage()
-   				} else {
-			       if (execution.getVariable(Prefix + "WorkflowException") != null) {
-				      WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
-				      exceptionMessage = pwfex.getErrorMessage()
-			       }
-   				}
-			    // going to the Main flow: a-la-carte or macro
-			    logger.debug(" ***** postProcessResponse(), BAD !!!")
-			    exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-				throw new BpmnError("MSOWorkflowException")
-			}
+        SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
+        sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
+        // reset variable
+        String changeAssignSDNCResponseDecodeXml = execution.getVariable(Prefix + "changeAssignSDNCResponse")
+        changeAssignSDNCResponseDecodeXml = changeAssignSDNCResponseDecodeXml.replace('<?xml version="1.0" encoding="UTF-8"?>', "")
+        execution.setVariable(Prefix + "changeAssignSDNCResponse", changeAssignSDNCResponseDecodeXml)
 
-		} catch(BpmnError b){
-		     logger.debug("Rethrowing MSOWorkflowException")
-		     throw b
+        if (execution.getVariable(Prefix + "sdncResponseSuccess") == true) {  // from sdnc util, prefix+'sdncResponseSuccess'
+            execution.setVariable(Prefix + "isSdncRollbackNeeded", true)
+            logger.debug("Successfully Validated SDNC Response")
 
+        } else {
+            logger.debug("Did NOT Successfully Validated SDNC Response")
+            throw new BpmnError("MSOWorkflowException")
+        }
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+    }
+
+
+    public void postProcessResponse (DelegateExecution execution) {
+
+        execution.setVariable("prefix", Prefix)
+
+        logger.trace("Inside postProcessResponse of DoUpdateNetworkInstance ")
+
+        try {
+            logger.debug(" ***** Is Exception Encountered (isException)? : " + execution.getVariable(Prefix + "isException"))
+            if (execution.getVariable(Prefix + "isException") == false) {
+                // set rollback data
+                execution.setVariable("orchestrationStatus", "")
+                execution.setVariable("networkId", execution.getVariable(Prefix + "networkId"))
+                execution.setVariable("networkName", execution.getVariable(Prefix + "networkName"))
+                prepareSuccessRollbackData(execution) // populate rollbackData
+                execution.setVariable("WorkflowException", null)
+                execution.setVariable(Prefix + "Success", true)
+                logger.debug(" ***** postProcessResponse(), GOOD !!!")
+            } else {
+                execution.setVariable(Prefix + "Success", false)
+                execution.setVariable("rollbackData", null)
+                String exceptionMessage = " Exception encountered in MSO Bpmn. "
+                if (execution.getVariable("workflowException") != null) {  // Output of Rollback flow.
+                    logger.debug(" ***** workflowException: " + execution.getVariable("workflowException"))
+                    WorkflowException wfex = execution.getVariable("workflowException")
+                    exceptionMessage = wfex.getErrorMessage()
+                } else {
+                    if (execution.getVariable(Prefix + "WorkflowException") != null) {
+                        WorkflowException pwfex = execution.getVariable(Prefix + "WorkflowException")
+                        exceptionMessage = pwfex.getErrorMessage()
+                    }
+                }
+                // going to the Main flow: a-la-carte or macro
+                logger.debug(" ***** postProcessResponse(), BAD !!!")
+                exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+                throw new BpmnError("MSOWorkflowException")
+            }
+
+        } catch(BpmnError b){
+            logger.debug("Rethrowing MSOWorkflowException")
+            throw b
+
+
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. postProcessResponse() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 
         }
 
 
-	}
+    }
 
-	public void prepareSDNCRollbackRequest (DelegateExecution execution) {
+    public void prepareSDNCRollbackRequest (DelegateExecution execution) {
 
-		execution.setVariable("prefix", Prefix)
+        execution.setVariable("prefix", Prefix)
 
-		logger.trace("Inside prepareSDNCRollbackRequest of DoUpdateNetworkInstance ")
+        logger.trace("Inside prepareSDNCRollbackRequest of DoUpdateNetworkInstance ")
 
-		try {
-			// for some reason the WorkflowException object is null after the sdnc rollback call task, need to save WorkflowException.
-			execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			// get variables
-			String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
-			String updateNetworkInput = execution.getVariable(Prefix + "networkRequest")
-			String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
-			String changeAssignSDNCResponse = execution.getVariable(Prefix + "changeAssignSDNCResponse")
-			String networkId = utils.getNodeText(changeAssignSDNCResponse, "network-id")
+        try {
+            // for some reason the WorkflowException object is null after the sdnc rollback call task, need to save WorkflowException.
+            execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+            // get variables
+            String sdncCallback = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback",execution)
+            String updateNetworkInput = execution.getVariable(Prefix + "networkRequest")
+            String cloudRegionId = execution.getVariable(Prefix + "cloudRegionSdnc")
+            String changeAssignSDNCResponse = execution.getVariable(Prefix + "changeAssignSDNCResponse")
+            String networkId = utils.getNodeText(changeAssignSDNCResponse, "network-id")
 
-			String serviceInstanceId = utils.getNodeText(updateNetworkInput, "service-instance-id")
+            String serviceInstanceId = utils.getNodeText(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(Prefix + "rollbackSDNCRequest", sndcTopologyRollbackRequestAsString)
-			logger.debug(" Preparing request for SDNC Topology assign's rollback/compensation . . . - " + "\n" +  sndcTopologyRollbackRequestAsString)
+            // 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(Prefix + "rollbackSDNCRequest", sndcTopologyRollbackRequestAsString)
+            logger.debug(" Preparing request for SDNC Topology assign's rollback/compensation . . . - " + "\n" +  sndcTopologyRollbackRequestAsString)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSDNCRollbackRequest() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSDNCRollbackRequest() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		}
+        }
+
+    }
 
-	}
+    public void prepareRollbackData(DelegateExecution execution) {
 
-	public void prepareRollbackData(DelegateExecution execution) {
+        execution.setVariable("prefix",Prefix)
 
-		execution.setVariable("prefix",Prefix)
+        logger.trace("Inside prepareRollbackData() of DoUpdateNetworkInstance ")
 
-		logger.trace("Inside prepareRollbackData() of DoUpdateNetworkInstance ")
+        try {
 
-		try {
+            Map<String, String> rollbackData = new HashMap<String, String>();
+            String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
+            if (rollbackSDNCRequest != null) {
+                if (rollbackSDNCRequest != "") {
+                    rollbackData.put("rollbackSDNCRequest", execution.getVariable(Prefix + "rollbackSDNCRequest"))
+                }
+            }
+            String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+            if (rollbackNetworkRequest != null) {
+                if (rollbackNetworkRequest != "") {
+                    rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
+                }
+            }
+            execution.setVariable("rollbackData", rollbackData)
+            logger.debug("** rollbackData : " + rollbackData)
 
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
-			if (rollbackSDNCRequest != null) {
-				if (rollbackSDNCRequest != "") {
-					rollbackData.put("rollbackSDNCRequest", execution.getVariable(Prefix + "rollbackSDNCRequest"))
-				}
-			}
-			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
-			if (rollbackNetworkRequest != null) {
-				if (rollbackNetworkRequest != "") {
-					rollbackData.put("rollbackNetworkRequest", execution.getVariable(Prefix + "rollbackNetworkRequest"))
-				}
-			}
-			execution.setVariable("rollbackData", rollbackData)
-			logger.debug("** rollbackData : " + rollbackData)
+            execution.setVariable("WorkflowException", execution.getVariable(Prefix + "WorkflowException"))
+            logger.debug("** WorkflowException : " + execution.getVariable("WorkflowException"))
 
-			execution.setVariable("WorkflowException", execution.getVariable(Prefix + "WorkflowException"))
-			logger.debug("** WorkflowException : " + execution.getVariable("WorkflowException"))
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareRollbackData() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareRollbackData() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        }
 
-		}
+    }
 
-	}
+    public void prepareSuccessRollbackData(DelegateExecution execution) {
 
-	public void prepareSuccessRollbackData(DelegateExecution execution) {
+        execution.setVariable("prefix",Prefix)
 
-		execution.setVariable("prefix",Prefix)
+        logger.trace("Inside prepareSuccessRollbackData() of DoUpdateNetworkInstance ")
 
-		logger.trace("Inside prepareSuccessRollbackData() of DoUpdateNetworkInstance ")
+        try {
 
-		try {
+            if (execution.getVariable("sdncVersion") != '1610') {
+                // skip: 1702 for 'changeassign' or equivalent not yet defined in SNDC, so no rollback.
+            } else {
+                prepareSDNCRollbackRequest(execution)
+            }
 
-			if (execution.getVariable("sdncVersion") != '1610') {
-				// skip: 1702 for 'changeassign' or equivalent not yet defined in SNDC, so no rollback.
-			} else {
-				prepareSDNCRollbackRequest(execution)
-			}
+            Map<String, String> rollbackData = new HashMap<String, String>();
+            String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
+            if (rollbackSDNCRequest != null) {
+                if (rollbackSDNCRequest != "") {
+                    rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
+                }
+            }
+            String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
+            if (rollbackNetworkRequest != null) {
+                if (rollbackNetworkRequest != "") {
+                    rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
+                }
+            }
+            execution.setVariable("rollbackData", rollbackData)
 
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			String rollbackSDNCRequest = execution.getVariable(Prefix + "rollbackSDNCRequest")
-			if (rollbackSDNCRequest != null) {
-				if (rollbackSDNCRequest != "") {
-					rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
-				}
-			}
-			String rollbackNetworkRequest = execution.getVariable(Prefix + "rollbackNetworkRequest")
-			if (rollbackNetworkRequest != null) {
-				if (rollbackNetworkRequest != "") {
-					rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
-				}
-			}
-			execution.setVariable("rollbackData", rollbackData)
+            logger.debug("** 'rollbackData' for Full Rollback : " + rollbackData)
+            execution.setVariable("WorkflowException", null)
 
-			logger.debug("** 'rollbackData' for Full Rollback : " + rollbackData)
-			execution.setVariable("WorkflowException", null)
 
+        } catch (Exception ex) {
+            String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSuccessRollbackData() - " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
 
-		} catch (Exception ex) {
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstance flow. prepareSuccessRollbackData() - " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        }
 
-		}
+    }
 
-	}
+    public void setExceptionFlag(DelegateExecution execution){
 
-	public void setExceptionFlag(DelegateExecution execution){
+        execution.setVariable("prefix",Prefix)
 
-		execution.setVariable("prefix",Prefix)
+        logger.trace("Inside setExceptionFlag() of DoUpdateNetworkInstance ")
 
-		logger.trace("Inside setExceptionFlag() of DoUpdateNetworkInstance ")
+        try {
 
-		try {
+            execution.setVariable(Prefix + "isException", true)
 
-			execution.setVariable(Prefix + "isException", true)
+            if (execution.getVariable("SavedWorkflowException1") != null) {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
+            } else {
+                execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
+            }
+            logger.debug(Prefix + "WorkflowException - " +execution.getVariable(Prefix + "WorkflowException"))
 
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			logger.debug(Prefix + "WorkflowException - " +execution.getVariable(Prefix + "WorkflowException"))
+        } catch(Exception ex){
+            String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. setExceptionFlag(): " + ex.getMessage()
+            logger.debug(exceptionMessage)
+            exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
+        }
 
-		} catch(Exception ex){
-			  String exceptionMessage = "Bpmn error encountered in DoUpdateNetworkInstance flow. setExceptionFlag(): " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-		}
+    }
 
-	}
 
+    // *******************************
+    //     Build Error Section
+    // *******************************
 
-	// *******************************
-	//     Build Error Section
-	// *******************************
+    public void processJavaException(DelegateExecution execution){
 
-	public void processJavaException(DelegateExecution execution){
-
-		execution.setVariable("prefix",Prefix)
-		try{
-			logger.debug("Caught a Java Exception")
-			logger.debug("Started processJavaException Method")
-			logger.debug("Variables List: " + execution.getVariables())
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - "  + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
+        execution.setVariable("prefix",Prefix)
+        try{
+            logger.debug("Caught a Java Exception")
+            logger.debug("Started processJavaException Method")
+            logger.debug("Variables List: " + execution.getVariables())
+            execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - "  + Prefix)  // Adding this line temporarily until this flows error handling gets updated
+            exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
 
-		}catch(Exception e){
-			logger.debug("Caught Exception during processJavaException Method: " + e)
-			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")
-		}
-		logger.debug("Completed processJavaException Method")
-	}
+        }catch(Exception e){
+            logger.debug("Caught Exception during processJavaException Method: " + e)
+            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")
+        }
+        logger.debug("Completed processJavaException Method")
+    }
 
 }
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollback.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollback.groovy
deleted file mode 100644
index 371e54ca75..0000000000
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollback.groovy
+++ /dev/null
@@ -1,312 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.onap.so.bpmn.infrastructure.scripts;
-
-import groovy.xml.XmlUtil
-import groovy.json.*
-
-import org.onap.so.bpmn.common.scripts.AaiUtil
-import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
-import org.onap.so.bpmn.common.scripts.ExceptionUtil
-import org.onap.so.bpmn.common.scripts.NetworkUtils
-import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
-import org.onap.so.bpmn.common.scripts.VidUtils
-import org.onap.so.bpmn.core.WorkflowException
-import org.onap.so.bpmn.core.UrnPropertiesReader
-import org.onap.so.bpmn.core.json.JsonUtils
-
-
-import java.util.UUID;
-
-import org.camunda.bpm.engine.delegate.BpmnError
-import org.camunda.bpm.engine.delegate.DelegateExecution
-import org.apache.commons.lang3.*
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.web.util.UriUtils
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-/**
- * This groovy class supports the <class>DoCreateNetworkInstance.bpmn</class> process.
- *
- */
-public class DoUpdateNetworkInstanceRollback extends AbstractServiceTaskProcessor {
-    private static final Logger logger = LoggerFactory.getLogger( DoUpdateNetworkInstanceRollback.class);
-
-	String Prefix="UPDNETIR_"
-   	ExceptionUtil exceptionUtil = new ExceptionUtil()
-	JsonUtils jsonUtil = new JsonUtils()
-	VidUtils vidUtils = new VidUtils(this)
-	NetworkUtils networkUtils = new NetworkUtils()
-	SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-
-	def className = getClass().getSimpleName()
-
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public InitializeProcessVariables(DelegateExecution execution){
-		/* Initialize all the process variables in this block */
-
-		execution.setVariable(Prefix + "rollbackNetworkRequest", null)
-		execution.setVariable(Prefix + "rollbackSDNCRequest", null)
-		execution.setVariable(Prefix + "WorkflowException", null)
-
-		execution.setVariable(Prefix + "rollbackNetworkRequest", "")
-		execution.setVariable(Prefix + "rollbackNetworkResponse", "")
-		execution.setVariable(Prefix + "rollbackNetworkReturnCode", "")
-
-		execution.setVariable(Prefix + "rollbackSDNCRequest", "")
-		execution.setVariable(Prefix + "rollbackSDNCResponse", "")
-		execution.setVariable(Prefix + "rollbackSDNCReturnCode", "")
-
-		execution.setVariable(Prefix + "Success", false)
-		execution.setVariable(Prefix + "fullRollback", false)
-
-	}
-
-	// **************************************************
-	//     Pre or Prepare Request Section
-	// **************************************************
-	/**
-	 * This method is executed during the preProcessRequest task of the <class>DoUpdateNetworkInstanceRollback.bpmn</class> process.
-	 * @param execution
-	 */
-	public void preProcessRequest (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside preProcessRequest() of " + className + ".groovy ")
-
-		try {
-			// initialize flow variables
-			InitializeProcessVariables(execution)
-
-			// GET Incoming request/variables
-			String rollbackNetworkRequest = null
-			String rollbackSDNCRequest = null
-
-			// Partial Rollback
-			Map<String, String> rollbackData = execution.getVariable("rollbackData")
-			if (rollbackData != null && rollbackData instanceof Map) {
-
-					if(rollbackData.containsKey("rollbackNetworkRequest")) {
-						rollbackNetworkRequest = rollbackData["rollbackNetworkRequest"]
-					}
-
-					if(rollbackData.containsKey("rollbackSDNCRequest")) {
-					   rollbackSDNCRequest = rollbackData["rollbackSDNCRequest"]
-					}
-			}
-
-			execution.setVariable(Prefix + "rollbackNetworkRequest", rollbackNetworkRequest)
-			execution.setVariable(Prefix + "rollbackSDNCRequest", rollbackSDNCRequest)
-			logger.debug("'rollbackData': " + '\n' + execution.getVariable("rollbackData"))
-
-			String sdncVersion = execution.getVariable("sdncVersion")
-			logger.debug("sdncVersion? : " + sdncVersion)
-
-			// PO Authorization Info / headers Authorization=
-			String basicAuthValuePO = UrnPropertiesReader.getVariable("mso.adapters.po.auth",execution)
-
-			try {
-				def encodedString = utils.getBasicAuth(basicAuthValuePO, UrnPropertiesReader.getVariable("mso.msoKey", execution))
-				execution.setVariable("BasicAuthHeaderValuePO",encodedString)
-				execution.setVariable("BasicAuthHeaderValueSDNC", encodedString)
-
-			} catch (IOException ex) {
-				String exceptionMessage = "Exception Encountered in DoCreateNetworkInstance, PreProcessRequest() - "
-				String dataErrorMessage = exceptionMessage + " Unable to encode PO/SDNC user/password string - " + ex.getMessage()
-				logger.debug(dataErrorMessage )
-				exceptionUtil.buildAndThrowWorkflowException(execution, 2500, dataErrorMessage)
-			}
-
-			if (execution.getVariable("SavedWorkflowException1") != null) {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("SavedWorkflowException1"))
-			} else {
-				execution.setVariable(Prefix + "WorkflowException", execution.getVariable("WorkflowException"))
-			}
-			logger.debug("*** WorkflowException : " + execution.getVariable(Prefix + "WorkflowException"))
-			if(execution.getVariable(Prefix + "WorkflowException") != null) {
-				// called by: DoCreateNetworkInstance, partial rollback
-				execution.setVariable(Prefix + "fullRollback", false)
-
-			} else {
-			   // called by: Macro - Full Rollback, WorkflowException = null
-			   execution.setVariable(Prefix + "fullRollback", true)
-
-			}
-			logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
-
-
-		} catch (BpmnError e) {
-		throw e;
-
-		} catch (Exception ex) {
-			sendSyncError(execution)
-			// caught exception
-			String exceptionMessage = "Exception Encountered in PreProcessRequest() of " + className + ".groovy ***** : " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
-
-		}
-
-	}
-
-	public void validateRollbackResponses (DelegateExecution execution) {
-
-		execution.setVariable("prefix",Prefix)
-
-		logger.trace("Inside validateRollbackResponses() of DoUpdateNetworkInstanceRollback ")
-
-		try {
-			// validate PO network rollback response
-			String rollbackNetworkErrorMessages = ""
-			String rollbackNetworkReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackNetworkRequest") != null) {
-				rollbackNetworkReturnCode = execution.getVariable(Prefix + "rollbackNetworkReturnCode")
-				String rollbackNetworkResponse = execution.getVariable(Prefix + "rollbackNetworkResponse")
-				logger.debug(" NetworkRollback Code - " + rollbackNetworkReturnCode)
-				logger.debug(" NetworkRollback Response - " + rollbackNetworkResponse)
-				if (rollbackNetworkReturnCode != "200") {
-					rollbackNetworkErrorMessages = " + PO Network rollback failed. "
-				} else {
-					rollbackNetworkErrorMessages = " + PO Network rollback completed."
-				}
-			}
-
-			// validate SDNC rollback response
-			String rollbackSdncErrorMessages = ""
-			String rollbackSDNCReturnCode = "200"
-			if (execution.getVariable(Prefix + "rollbackSDNCRequest") != null) {
-				rollbackSDNCReturnCode = execution.getVariable(Prefix + "rollbackSDNCReturnCode")
-				String rollbackSDNCResponse = execution.getVariable(Prefix + "rollbackSDNCResponse")
-				String rollbackSDNCReturnInnerCode = ""
-				SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils()
-				rollbackSDNCResponse = rollbackSDNCResponse.replace('$', '').replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-				if (rollbackSDNCReturnCode == "200") {
-					if (utils.nodeExists(rollbackSDNCResponse, "response-code")) {
-						rollbackSDNCReturnInnerCode = utils.getNodeText(rollbackSDNCResponse, "response-code")
-						if (rollbackSDNCReturnInnerCode == "200" || rollbackSDNCReturnInnerCode == "" || rollbackSDNCReturnInnerCode == "0") {
-						    rollbackSdncErrorMessages = " + SNDC changeassign rollback completed."
-						} else {
-							rollbackSdncErrorMessages = " + SDNC changeassign rollback failed. "
-						}
-					} else {
-						  rollbackSdncErrorMessages = " + SNDC changeassign rollback completed."
-					}
-				 } else {
-					  rollbackSdncErrorMessages = " + SDNC changeassign rollback failed. "
-			     }
-				logger.debug(" SDNC changeassign rollback Code - " + rollbackSDNCReturnCode)
-				logger.debug(" SDNC changeassign rollback  Response - " + rollbackSDNCResponse)
-			}
-
-			String statusMessage = ""
-			int errorCode = 7000
-			logger.debug("*** fullRollback? : " + execution.getVariable(Prefix + "fullRollback"))
-			if (execution.getVariable(Prefix + "fullRollback") == false) {
-				// original WorkflowException,
-				WorkflowException wfe = execution.getVariable(Prefix + "WorkflowException")
-				if (wfe != null) {
-				   // rollback due to failure in DoCreate - Partial rollback
-				   statusMessage = wfe.getErrorMessage()
-				   errorCode = wfe.getErrorCode()
-				} else {
-				   statusMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-				   errorCode = '7000'
-				}
-
-				// set if all rolledbacks are successful
-				if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
-					execution.setVariable("rolledBack", true)
-
-				} else {
-					execution.setVariable("rolledBack", false)
-
-				}
-
-				statusMessage = statusMessage + rollbackNetworkErrorMessages + rollbackSdncErrorMessages
-				logger.debug("Final DoUpdateNetworkInstanceRollback status message: " + statusMessage)
-				String processKey = getProcessKey(execution);
-				WorkflowException exception = new WorkflowException(processKey, errorCode, statusMessage);
-				execution.setVariable("workflowException", exception);
-
-			} else {
-				// rollback due to failures in Main flow (Macro) - Full rollback
-				// WorkflowException = null
-				if (rollbackNetworkReturnCode == "200" && rollbackSDNCReturnCode == "200") {
-					execution.setVariable("rollbackSuccessful", true)
-					execution.setVariable("rollbackError", false)
-				} else {
-					String exceptionMessage = "Network Update Rollback was not Successful. "
-					logger.debug(exceptionMessage)
-					execution.setVariable("rollbackSuccessful", false)
-					execution.setVariable("rollbackError", true)
-					exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-					throw new BpmnError("MSOWorkflowException")
-				}
-
-			}
-
-
-		} catch (Exception ex) {
-			execution.setVariable("WorkflowException", null)
-			String errorMessage = "See Previous Camunda flows for cause of Error: Undetermined Exception."
-			String exceptionMessage = " Bpmn error encountered in DoUpdateNetworkInstanceRollback flow. validateRollbackResponses() - " + errorMessage + ": " + ex.getMessage()
-			logger.debug(exceptionMessage)
-			exceptionUtil.buildWorkflowException(execution, 7000, exceptionMessage)
-			execution.setVariable("WorkflowException", execution.getVariable("WorkflowException"))
-
-		}
-
-	}
-
-	// *******************************
-	//     Build Error Section
-	// *******************************
-
-
-
-	public void processJavaException(DelegateExecution execution){
-
-		execution.setVariable("prefix",Prefix)
-
-		try{
-			logger.debug("Caught a Java Exception in " + Prefix)
-			logger.debug("Started processJavaException Method")
-			logger.debug("Variables List: " + execution.getVariables())
-			execution.setVariable("UnexpectedError", "Caught a Java Lang Exception - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Caught a Java Lang Exception")
-
-		}catch(Exception e){
-			logger.debug("Caught Exception during processJavaException Method: " + e)
-			execution.setVariable("UnexpectedError", "Exception in processJavaException method - " + Prefix)  // Adding this line temporarily until this flows error handling gets updated
-			exceptionUtil.buildWorkflowException(execution, 500, "Exception in processJavaException method" + Prefix)
-		}
-		logger.trace("Completed processJavaException Method in " + Prefix)
-	}
-
-}
diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy
deleted file mode 100644
index 5e264c0af4..0000000000
--- a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy
+++ /dev/null
@@ -1,343 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.bpmn.infrastructure.scripts
-
-
-import static org.mockito.Mockito.*
-
-import org.camunda.bpm.engine.delegate.BpmnError
-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
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.mockito.MockitoAnnotations
-import org.mockito.runners.MockitoJUnitRunner
-import org.mockito.internal.debugging.MockitoDebuggerImpl
-import org.onap.so.bpmn.common.scripts.MsoUtils
-import org.onap.so.bpmn.core.WorkflowException
-import org.junit.Before
-import org.junit.Rule;
-import org.junit.Test
-import org.junit.Ignore
-import org.junit.runner.RunWith
-
-import static org.junit.Assert.*;
-
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang3.*
-
-
-@RunWith(MockitoJUnitRunner.class)
-class DoDeleteNetworkInstanceRollbackTest  {
-	
-	@Rule
-	public WireMockRule wireMockRule = new WireMockRule(8090);
-	
-		def utils = new MsoUtils()
-		String Prefix="DELNWKIR_"
-
-
-		String rollbackNetworkRequest =
-		"""<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.onap.so/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>
-      <networkCreated>true</networkCreated>
-      <tenantId>7dd5365547234ee8937416c65507d266</tenantId>
-      <cloudSiteId>RDM2WAGPLCP</cloudSiteId>
-      <msoRequest>
-         <requestId>1ef47428-cade-45bd-a103-0751e8b2deb0</requestId>
-         <serviceInstanceId/>
-      </msoRequest>
-   </rollback>
-</NetworkAdapter:rollbackNetwork>"""			
-								
-					String rollbackDeActivateSDNCRequest =
-		"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.onap/so/workflow/schema/v1"
-                                  xmlns:ns5="http://org.onap/so/request/types/v1"
-                                  xmlns:sdncadapter="http://org.onap.so/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>activate</sdncadapter:SvcAction>
-      <sdncadapter:SvcOperation>network-topology-operation</sdncadapter:SvcOperation>
-      <sdncadapter:CallbackUrl>sdncCallback</sdncadapter:CallbackUrl>
-      <sdncadapter:MsoAction>generic-resource</sdncadapter:MsoAction>
-   </sdncadapter:RequestHeader>
-   <aetgt:SDNCRequestData>
-      <request-information>
-         <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>
-         <request-action>CreateNetworkInstance</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-information>
-         <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
-         <network-type>CONTRAIL_EXTERNAL</network-type>
-         <onap-model-information>
-            <model-invariant-uuid>invariant-uuid</model-invariant-uuid>
-            <model-customization-uuid>customization-uuid</model-customization-uuid>
-            <model-uuid>uuid</model-uuid>
-            <model-version>version</model-version>
-            <model-name>CONTRAIL_EXTERNAL</model-name>
-         </onap-model-information>
-      </network-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 rollbackSDNCRequest =
-		"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.onap/so/workflow/schema/v1"
-                                  xmlns:ns5="http://org.onap/so/request/types/v1"
-                                  xmlns:sdncadapter="http://org.onap.so/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>CreateNetworkInstance</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-information>
-         <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
-         <network-type>CONTRAIL_EXTERNAL</network-type>
-         <onap-model-information>
-            <model-invariant-uuid>invariant-uuid</model-invariant-uuid>
-            <model-customization-uuid>customization-uuid</model-customization-uuid>
-            <model-uuid>uuid</model-uuid>
-            <model-version>version</model-version>
-            <model-name>CONTRAIL_EXTERNAL</model-name>
-         </onap-model-information>
-      </network-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>"""			
-		
-// - - - - - - - -
-
-
-	    @Before
-		public void init()
-		{
-			MockitoAnnotations.initMocks(this)
-		}
-		
-		public void initializeVariables (DelegateExecution mockExecution) {
-
-			verify(mockExecution).setVariable(Prefix + "WorkflowException", null)
-		
-			verify(mockExecution).setVariable(Prefix + "rollbackDeactivateSDNCRequest", null)
-			verify(mockExecution).setVariable(Prefix + "rollbackDeactivateSDNCResponse", "")
-			verify(mockExecution).setVariable(Prefix + "rollbackDeactivateSDNCReturnCode", "")
-	
-			verify(mockExecution).setVariable(Prefix + "rollbackNetworkRequest", null)
-			verify(mockExecution).setVariable(Prefix + "rollbackNetworkResponse", "")
-			verify(mockExecution).setVariable(Prefix + "rollbackNetworkReturnCode", "")
-					
-			verify(mockExecution).setVariable(Prefix + "Success", false)
-			verify(mockExecution).setVariable(Prefix + "fullRollback", false)
-			
-		}
-		
-		@Test
-		//@Ignore  
-		public void preProcessRequest() {
-			
-			println "************ preProcessRequest ************* " 
-			
-			WorkflowException workflowException = new WorkflowException("DoCreateNetworkInstance", 2500, "Received error from Network Adapter: JBWEB000065: HTTP Status 500.")
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			rollbackData.put("rollbackDeactivateSDNCRequest", rollbackDeActivateSDNCRequest)
-			rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
-			rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
-					
-			ExecutionEntity mockExecution = setupMock()
-			// Initialize prerequisite variables
-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-			when(mockExecution.getVariable("prefix")).thenReturn(Prefix + "")
-			when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)
-			when(mockExecution.getVariable("rollbackData")).thenReturn(rollbackData)
-			when(mockExecution.getVariable("sdncVersion")).thenReturn("1702")
-			
-			when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
-			when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
-			
-			when(mockExecution.getVariable("mso.adapters.sdnc.endpoint")).thenReturn("http://localhost:8090/SDNCAdapter")
-			when(mockExecution.getVariable("mso.adapters.network.rest.endpoint")).thenReturn("http://localhost:8090/networks/NetworkAdapter")
-			when(mockExecution.getVariable("mso.adapters.sdnc.resource.endpoint")).thenReturn("http://localhost:8090/SDNCAdapterRpc")
-			
-			
-			// preProcessRequest(DelegateExecution execution)						
-			DoDeleteNetworkInstanceRollback DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-			DoDeleteNetworkInstanceRollback.preProcessRequest(mockExecution)
-
-			//verify variable initialization
-			initializeVariables(mockExecution)
-			
-//			verify(mockExecution).getVariable("isDebugLogEnabled")
-			verify(mockExecution).setVariable("prefix", Prefix)
-								
-		}
-		
-
-		@Test
-		//@Ignore
-		public void validateRollbackResponses_Good() {
-			
-			WorkflowException workflowException = new WorkflowException("DoDeleteNetworkInstanceRollback", 2500, "AAI Update Contrail Failed.  Error 404.")
-			WorkflowException expectedWorkflowException = new WorkflowException("DoDeleteNetworkInstanceRollback", 2500, "AAI Update Contrail Failed.  Error 404. + SNDC deactivate rollback completed. + PO Network rollback completed. + SNDC unassign rollback completed.")
-				  
-			println "************ validateRollbackResponses_Good() ************* "
-			ExecutionEntity mockExecution = setupMock()
-			// Initialize prerequisite variables
-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-			when(mockExecution.getVariable("prefix")).thenReturn(Prefix + "")
-
-			when(mockExecution.getVariable(Prefix + "rollbackDeactivateSDNCRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackDeactivateSDNCReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackDeactivateSDNCResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "WorkflowException")).thenReturn(workflowException)
-			when(mockExecution.getVariable(Prefix + "fullRollback")).thenReturn(false)
-									
-			DoDeleteNetworkInstanceRollback DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-			DoDeleteNetworkInstanceRollback.validateRollbackResponses(mockExecution)
-			
-			// verify set prefix = Prefix + ""
-			verify(mockExecution, atLeast(1)).setVariable("prefix", Prefix)
-			verify(mockExecution, atLeast(1)).setVariable("rolledBack", true)
-			verify(mockExecution, atLeast(1)).setVariable("wasDeleted", true)
-			verify(mockExecution).setVariable("WorkflowException", refEq(expectedWorkflowException, any(WorkflowException.class)))
-			//verify(mockExecution).setVariable("WorkflowException", expectedWorkflowException)
-		}
-		
-		@Test
-		//@Ignore
-		public void validateRollbackResponses_FullRollback() {
-			
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			rollbackData.put("rollbackDeactivateSDNCRequest", rollbackDeActivateSDNCRequest)
-			rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
-			rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
-				  
-			println "************ validateRollbackResponses_FullRollback() ************* "
-			ExecutionEntity mockExecution = setupMock()
-			// Initialize prerequisite variables
-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-			when(mockExecution.getVariable("prefix")).thenReturn(Prefix + "")
-
-			when(mockExecution.getVariable(Prefix + "rollbackDeactivateSDNCRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackDeactivateSDNCReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackDeactivateSDNCResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "WorkflowException")).thenReturn(null)
-			when(mockExecution.getVariable(Prefix + "fullRollback")).thenReturn(true)
-			when(mockExecution.getVariable("rollbackData")).thenReturn(rollbackData)
-									
-			DoDeleteNetworkInstanceRollback DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-			DoDeleteNetworkInstanceRollback.validateRollbackResponses(mockExecution)
-			
-			// verify set prefix = Prefix + ""
-			verify(mockExecution, atLeast(1)).setVariable("prefix", Prefix)
-			verify(mockExecution, atLeast(1)).setVariable("rollbackSuccessful", true)
-			verify(mockExecution, atLeast(1)).setVariable("rollbackError", false)
-			
-		}
-		
-		
-		private ExecutionEntity setupMock() {
-			
-			ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
-			when(mockProcessDefinition.getKey()).thenReturn("DoDeleteNetworkInstanceRollback")
-			RepositoryService mockRepositoryService = mock(RepositoryService.class)
-			when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
-			when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("DoDeleteNetworkInstanceRollback")
-			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("DoDeleteNetworkInstanceRollback")
-			when(mockExecution.getProcessInstanceId()).thenReturn("DoDeleteNetworkInstanceRollback")
-			when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
-			when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
-			
-			return mockExecution
-		}
-		
-}
diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy
deleted file mode 100644
index 7bc82c1ccc..0000000000
--- a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy
+++ /dev/null
@@ -1,329 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.onap.so.bpmn.infrastructure.scripts
-
-import static org.mockito.Mockito.*
-
-import org.camunda.bpm.engine.delegate.BpmnError
-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.delegate.DelegateExecution;
-import org.mockito.MockitoAnnotations
-import org.mockito.runners.MockitoJUnitRunner
-import org.onap.so.bpmn.common.scripts.MsoUtils
-import org.onap.so.bpmn.core.WorkflowException
-import org.junit.Before
-import org.junit.Rule;
-import org.junit.Test
-import org.junit.Ignore
-import org.junit.runner.RunWith
-
-import static org.junit.Assert.*;
-
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.commons.lang3.*
-
-
-@RunWith(MockitoJUnitRunner.class)
-class DoUpdateNetworkInstanceRollbackTest  {
-
-		def utils = new MsoUtils()
-		String Prefix="UPDNETIR_"
-
-
-		String rollbackNetworkRequest =
-		"""<NetworkAdapter:rollbackNetwork xmlns:NetworkAdapter="http://org.onap.so/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>
-      <networkCreated>true</networkCreated>
-      <tenantId>7dd5365547234ee8937416c65507d266</tenantId>
-      <cloudSiteId>RDM2WAGPLCP</cloudSiteId>
-      <msoRequest>
-         <requestId>1ef47428-cade-45bd-a103-0751e8b2deb0</requestId>
-         <serviceInstanceId/>
-      </msoRequest>
-   </rollback>
-</NetworkAdapter:rollbackNetwork>"""
-
-					String rollbackActivateSDNCRequest =
-		"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.onap/so/workflow/schema/v1"
-                                  xmlns:ns5="http://org.onap/so/request/types/v1"
-                                  xmlns:sdncadapter="http://org.onap.so/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:MsoAction>generic-resource</sdncadapter:MsoAction>
-   </sdncadapter:RequestHeader>
-   <aetgt:SDNCRequestData>
-      <request-information>
-         <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>
-         <request-action>CreateNetworkInstance</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-information>
-         <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
-         <network-type>CONTRAIL_EXTERNAL</network-type>
-         <onap-model-information>
-            <model-invariant-uuid>invariant-uuid</model-invariant-uuid>
-            <model-customization-uuid>customization-uuid</model-customization-uuid>
-            <model-uuid>uuid</model-uuid>
-            <model-version>version</model-version>
-            <model-name>CONTRAIL_EXTERNAL</model-name>
-         </onap-model-information>
-      </network-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 rollbackSDNCRequest =
-		"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.onap/so/workflow/schema/v1"
-                                  xmlns:ns5="http://org.onap/so/request/types/v1"
-                                  xmlns:sdncadapter="http://org.onap.so/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:MsoAction>generic-resource</sdncadapter:MsoAction>
-   </sdncadapter:RequestHeader>
-   <aetgt:SDNCRequestData>
-      <request-information>
-         <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>
-         <request-action>CreateNetworkInstance</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-information>
-         <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
-         <network-type>CONTRAIL_EXTERNAL</network-type>
-         <onap-model-information>
-            <model-invariant-uuid>invariant-uuid</model-invariant-uuid>
-            <model-customization-uuid>customization-uuid</model-customization-uuid>
-            <model-uuid>uuid</model-uuid>
-            <model-version>version</model-version>
-            <model-name>CONTRAIL_EXTERNAL</model-name>
-         </onap-model-information>
-      </network-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>"""
-
-// - - - - - - - -
-
-
-	    @Before
-		public void init()
-		{
-			MockitoAnnotations.initMocks(this)
-		}
-
-		public void initializeVariables (DelegateExecution mockExecution) {
-
-			verify(mockExecution).setVariable(Prefix + "rollbackNetworkRequest", null)
-			verify(mockExecution).setVariable(Prefix + "rollbackSDNCRequest", null)
-			verify(mockExecution).setVariable(Prefix + "WorkflowException", null)
-
-			verify(mockExecution).setVariable(Prefix + "rollbackNetworkRequest", "")
-			verify(mockExecution).setVariable(Prefix + "rollbackNetworkResponse", "")
-			verify(mockExecution).setVariable(Prefix + "rollbackNetworkReturnCode", "")
-
-			verify(mockExecution).setVariable(Prefix + "rollbackSDNCRequest", "")
-			verify(mockExecution).setVariable(Prefix + "rollbackSDNCResponse", "")
-			verify(mockExecution).setVariable(Prefix + "rollbackSDNCReturnCode", "")
-
-			verify(mockExecution).setVariable(Prefix + "Success", false)
-			verify(mockExecution).setVariable(Prefix + "fullRollback", false)
-
-
-		}
-
-		@Test
-		//@Ignore
-		public void preProcessRequest() {
-
-			println "************ preProcessRequest ************* "
-
-			WorkflowException workflowException = new WorkflowException("DoUpdateNetworkInstanceRollback", 2500, "Received error from Network Adapter: JBWEB000065: HTTP Status 500.")
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
-			rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
-
-			ExecutionEntity mockExecution = setupMock()
-			// Initialize prerequisite variables
-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-			when(mockExecution.getVariable("prefix")).thenReturn(Prefix + "")
-			when(mockExecution.getVariable("WorkflowException")).thenReturn(workflowException)
-			when(mockExecution.getVariable("rollbackData")).thenReturn(rollbackData)
-			when(mockExecution.getVariable("sdncVersion")).thenReturn("1610")
-			when(mockExecution.getVariable("mso.adapters.po.auth")).thenReturn("3141634BF7E070AA289CF2892C986C0B")
-			when(mockExecution.getVariable("mso.msoKey")).thenReturn("07a7159d3bf51a0e53be7a8f89699be7")
-
-			when(mockExecution.getVariable("mso.adapters.sdnc.endpoint")).thenReturn("http://localhost:28090/SDNCAdapter")
-			when(mockExecution.getVariable("mso.adapters.network.rest.endpoint")).thenReturn("http://localhost:28090/networks/NetworkAdapter")
-			when(mockExecution.getVariable("mso.adapters.sdnc.resource.endpoint")).thenReturn("http://localhost:28090/SDNCAdapterRpc")
-
-
-			// preProcessRequest(DelegateExecution execution)
-			DoUpdateNetworkInstanceRollback DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-			DoUpdateNetworkInstanceRollback.preProcessRequest(mockExecution)
-
-//			verify(mockExecution).getVariable("isDebugLogEnabled")
-			verify(mockExecution).setVariable("prefix", Prefix)
-
-			//verify variable initialization
-			initializeVariables(mockExecution)
-
-		}
-
-
-		@Test
-		@Ignore
-		public void validateRollbackResponses_Good() {
-
-			WorkflowException workflowException = new WorkflowException("DoUpdateNetworkInstanceRollback", 2500, "AAI Update Contrail Failed.  Error 404.")
-			WorkflowException expectedWorkflowException = new WorkflowException("DoUpdateNetworkInstanceRollback", 2500, "AAI Update Contrail Failed.  Error 404. + SNDC activate rollback completed. + PO Network rollback completed. + SNDC assign rollback completed.")
-
-			println "************ validateRollbackResponses_Good() ************* "
-			ExecutionEntity mockExecution = setupMock()
-			// Initialize prerequisite variables
-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-			when(mockExecution.getVariable("prefix")).thenReturn(Prefix + "")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "WorkflowException")).thenReturn(workflowException)
-			when(mockExecution.getVariable(Prefix + "fullRollback")).thenReturn(false)
-
-			DoUpdateNetworkInstanceRollback DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-			DoUpdateNetworkInstanceRollback.validateRollbackResponses(mockExecution)
-
-			// verify set prefix = Prefix + ""
-			verify(mockExecution, atLeast(1)).setVariable("prefix", Prefix)
-			verify(mockExecution, atLeast(1)).setVariable("rolledBack", true)
-			verify(mockExecution, atLeast(1)).setVariable("wasDeleted", true)
-			verify(mockExecution).setVariable("WorkflowException", refEq(expectedWorkflowException, any(WorkflowException.class)))
-			//verify(mockExecution).setVariable("WorkflowException", expectedWorkflowException)
-		}
-
-		@Test
-		//@Ignore
-		public void validateRollbackResponses_FullRollback() {
-
-			Map<String, String> rollbackData = new HashMap<String, String>();
-			rollbackData.put("rollbackSDNCRequest", rollbackSDNCRequest)
-			rollbackData.put("rollbackNetworkRequest", rollbackNetworkRequest)
-
-			println "************ validateRollbackResponses_FullRollback() ************* "
-			ExecutionEntity mockExecution = setupMock()
-			// Initialize prerequisite variables
-			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
-			when(mockExecution.getVariable("prefix")).thenReturn(Prefix)
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCRequest")).thenReturn("Good")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackNetworkResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCReturnCode")).thenReturn("200")
-			when(mockExecution.getVariable(Prefix + "rollbackSDNCResponse")).thenReturn("GoodResponse")
-			when(mockExecution.getVariable(Prefix + "WorkflowException")).thenReturn(null)
-			when(mockExecution.getVariable(Prefix + "fullRollback")).thenReturn(true)
-			when(mockExecution.getVariable("rollbackData")).thenReturn(rollbackData)
-
-			DoUpdateNetworkInstanceRollback DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-			DoUpdateNetworkInstanceRollback.validateRollbackResponses(mockExecution)
-
-			// verify set prefix = Prefix + ""
-			verify(mockExecution, atLeast(1)).setVariable("prefix", Prefix)
-			verify(mockExecution, atLeast(1)).setVariable("rollbackSuccessful", true)
-			verify(mockExecution, atLeast(1)).setVariable("rollbackError", false)
-
-		}
-
-
-		private ExecutionEntity setupMock() {
-
-			ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
-			when(mockProcessDefinition.getKey()).thenReturn("DoUpdateNetworkInstanceRollback")
-			RepositoryService mockRepositoryService = mock(RepositoryService.class)
-			when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
-			when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("DoUpdateNetworkInstanceRollback")
-			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("DoUpdateNetworkInstanceRollback")
-			when(mockExecution.getProcessInstanceId()).thenReturn("DoUpdateNetworkInstanceRollback")
-			when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
-			when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
-
-			return mockExecution
-		}
-
-}
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
index 2e5d2e30b1..65a11e24be 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
@@ -1,14 +1,14 @@
 <?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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DeleteVfModuleVolumeInfraV1" name="DeleteVfModuleVolumeInfraV1" isExecutable="true">
     <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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
 deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled)
 
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask" />
     <bpmn2:startEvent id="deleteNetwork_startEvent" name="Start Flow">
@@ -18,24 +18,24 @@ deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled)
     <bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('sendSyncResponse', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('sendSyncResponse', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="sendSyncAckResponse_ScriptTask" targetRef="ScriptTask_callRestCloudRegion" />
     <bpmn2:scriptTask id="ScriptTask_callRestCloudRegion" name="Call REST Query Cloud Region " scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def delVfModuleVol = new DeleteVfModuleVolumeInfraV1()
-delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn2:script>
+delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="prepareVnfAdapterDelete_ScriptTask_1" name="Prepare Vnf Adapter Delete" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="prepareVnfAdapterDelete_ScriptTask_1" targetRef="callVnfAdapterDeleteSubflow_CallActivity" />
     <bpmn2:endEvent id="EndEvent_5">
@@ -48,12 +48,12 @@ deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLo
       <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ExclusiveGateway_3" targetRef="prepareVnfAdapterDelete_ScriptTask_1">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVfModVol_tenantId") == execution.getVariable("DELVfModVol_volumeGroupTenantId")}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELVfModVol_tenantId") == execution.getVariable("DELVfModVol_volumeGroupTenantId")}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ExclusiveGateway_3" targetRef="ScriptTask_2" />
-    <bpmn2:callActivity id="callVnfAdapterDeleteSubflow_CallActivity" name="Call Vnf Adapter Delete subflow" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="callVnfAdapterDeleteSubflow_CallActivity" name="Call Vnf Adapter Delete subflow" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
-        <camunda:in source="DELVfModVol_deleteVnfARequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="DELVfModVol_deleteVnfARequest" target="openstackAdapterTaskRequest" />
         <camunda:out source="WorkflowResponse" target="DELVfModVol_deleteVnfAResponse" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -67,18 +67,18 @@ deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLo
     <bpmn2:scriptTask id="callAAIQuery_scriptTask" name="Query AAI for Volume Group Info" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
 deleteVfMod.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="callAAIQuery_scriptTask" targetRef="ExclusiveGateway_3" />
     <bpmn2:scriptTask id="ScriptTask_2" name="Handle TenantId Mismatch" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_2" targetRef="EndEvent_5" />
     <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_callRestCloudRegion" targetRef="ExclusiveGateway_1" />
@@ -89,7 +89,7 @@ deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ExclusiveGateway_1" targetRef="EndEvent_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ExclusiveGateway_1" targetRef="callAAIQuery_scriptTask">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVfModVol_isCloudRegionGood") == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELVfModVol_isCloudRegionGood") == true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:endEvent id="EndEvent_3">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
@@ -109,9 +109,9 @@ deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled
       <bpmn2:scriptTask id="ScriptTask_4" name="Send Sync Ack Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_responseNotSent</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new  DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('sendSyncError', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('sendSyncError', execution, isDebugLogEnabled)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_responseNotSent" name="No" sourceRef="ExclusiveGateway_synResponseSent" targetRef="ScriptTask_4" />
       <bpmn2:sequenceFlow id="SequenceFlow_responseSent" name="Yes" sourceRef="ExclusiveGateway_synResponseSent" targetRef="prepareFalloutHandler_ScriptTask">
@@ -121,10 +121,10 @@ deleteVfMod.executeMethod('sendSyncError', execution, isDebugLogEnabled)]]></bpm
         <bpmn2:incoming>SequenceFlow_responseSent</bpmn2:incoming>
         <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
 deleteVfMod.executeMethod('prepareFalloutHandler', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="prepareFalloutHandler_ScriptTask" targetRef="faultHandler_CallActivity" />
       <bpmn2:callActivity id="faultHandler_CallActivity" name="Call FalloutHandlerV1" calledElement="FalloutHandler">
@@ -151,27 +151,27 @@ deleteVfMod.executeMethod('prepareFalloutHandler', execution, isDebugLogEnabled)
     <bpmn2:scriptTask id="prepareDBInfraRequest_ScriptTask" name="Prepare DB Infra Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
 deleteVfMod.executeMethod('prepareDBRequest', execution, isDebugLogEnabled)
 
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_37" name="" sourceRef="prepareDBInfraRequest_ScriptTask" targetRef="callDBInfra_ServiceTask" />
     <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Prepare Completion Handler Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
 deleteVfMod.executeMethod('prepareCompletionHandlerRequest', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="callCompleteMsoProcess_CallActivity" />
     <bpmn2:scriptTask id="ScriptTask_3" name="Set Success" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[// The following variable is checked by the unit test
-execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]></bpmn2:script>
+      <bpmn2:script>// The following variable is checked by the unit test
+execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ScriptTask_3" targetRef="EndEvent_2" />
     <bpmn2:callActivity id="callCompleteMsoProcess_CallActivity" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
@@ -197,7 +197,7 @@ execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]></bpmn2
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
+            <camunda:inputParameter name="url">${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}</camunda:inputParameter>
             <camunda:inputParameter name="payload">${DELVfModVol_updateInfraRequest}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -219,9 +219,9 @@ execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]></bpmn2
     <bpmn2:scriptTask id="callRESTDeleteVolGrpId_ScriptTask" name="Call REST Delete AAI Vol Grp Id" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_vnfAdapterCallOK</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('deleteVolGrpId', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('deleteVolGrpId', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="callRESTDeleteVolGrpId_ScriptTask" targetRef="prepareDBInfraRequest_ScriptTask" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="Is call to VNF Adapter OK?" default="SequenceFlow_vnfAdapterCallNotOK">
@@ -243,321 +243,321 @@ deleteVfMod.executeMethod('deleteVolGrpId', execution, isDebugLogEnabled)]]></bp
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteVfModuleVolumeInfraV1">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteNetwork_startEvent">
-        <dc:Bounds x="103" y="94" width="36" height="36" />
+        <dc:Bounds x="223" y="94" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="89" y="135" width="65" height="22" />
+          <dc:Bounds x="216" y="135" width="51" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
-        <dc:Bounds x="355" y="72" width="100" height="80" />
+        <dc:Bounds x="475" y="72" 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="139" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="355" y="112" />
+        <di:waypoint x="259" y="112" />
+        <di:waypoint x="475" y="112" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="116" y="12" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="callAAIQuery_scriptTask">
-        <dc:Bounds x="864" y="72" width="100" height="80" />
+        <dc:Bounds x="984" y="72" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_3" bpmnElement="faultHandler_CallActivity">
-        <dc:Bounds x="438" y="360" width="100" height="80" />
+        <dc:Bounds x="558" y="360" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity">
-        <dc:Bounds x="993" y="985" width="100" height="80" />
+        <dc:Bounds x="1113" y="985" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
-        <dc:Bounds x="37" y="288" width="660" height="337" />
+        <dc:Bounds x="157" y="288" width="660" height="337" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
-        <dc:Bounds x="60" y="383" width="36" height="36" />
+        <dc:Bounds x="180" y="383" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="45" y="424" width="67" height="22" />
+          <dc:Bounds x="173" y="424" width="52" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_79" bpmnElement="prepareFalloutHandler_ScriptTask">
-        <dc:Bounds x="288" y="360" width="100" height="80" />
+        <dc:Bounds x="408" y="360" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
-        <dc:Bounds x="993" y="877" width="100" height="80" />
+        <dc:Bounds x="1113" y="877" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_83" bpmnElement="prepareDBInfraRequest_ScriptTask">
-        <dc:Bounds x="993" y="660" width="100" height="80" />
+        <dc:Bounds x="1113" y="660" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_86" bpmnElement="callDBInfra_ServiceTask">
-        <dc:Bounds x="993" y="769" width="100" height="80" />
+        <dc:Bounds x="1113" y="769" 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="455" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="496" y="112" />
+        <di:waypoint x="575" y="112" />
+        <di:waypoint x="616" y="112" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="486" y="112" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask">
-        <dc:Bounds x="496" y="72" width="100" height="80" />
+        <dc:Bounds x="616" y="72" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ExclusiveGateway_255">
-        <di:waypoint xsi:type="dc:Point" x="96" y="401" />
-        <di:waypoint xsi:type="dc:Point" x="118" y="401" />
-        <di:waypoint xsi:type="dc:Point" x="118" y="400" />
-        <di:waypoint xsi:type="dc:Point" x="144" y="400" />
+        <di:waypoint x="216" y="401" />
+        <di:waypoint x="238" y="401" />
+        <di:waypoint x="238" y="400" />
+        <di:waypoint x="264" y="400" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="99" y="401" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_79" targetElement="_BPMNShape_CallActivity_3">
-        <di:waypoint xsi:type="dc:Point" x="388" y="400" />
-        <di:waypoint xsi:type="dc:Point" x="438" y="400" />
+        <di:waypoint x="508" y="400" />
+        <di:waypoint x="558" y="400" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="413" y="400" width="6" height="6" />
         </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="1043" y="849" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="877" />
+        <di:waypoint x="1163" y="849" />
+        <di:waypoint x="1163" y="877" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1258" y="857" width="6" height="6" />
         </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="1043" y="957" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="985" />
+        <di:waypoint x="1163" y="957" />
+        <di:waypoint x="1163" y="985" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1289" y="898" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTDeleteVolGrpId_ScriptTask">
-        <dc:Bounds x="993" y="528" width="100" height="80" />
+        <dc:Bounds x="1113" y="528" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_83">
-        <di:waypoint xsi:type="dc:Point" x="1043" y="608" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="660" />
+        <di:waypoint x="1163" y="608" />
+        <di:waypoint x="1163" y="660" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1291" y="557" width="6" height="6" />
         </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="1043" y="740" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="769" />
+        <di:waypoint x="1163" y="740" />
+        <di:waypoint x="1163" y="769" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1258" y="751" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_22" bpmnElement="callVnfAdapterDeleteSubflow_CallActivity">
-        <dc:Bounds x="993" y="300" width="100" height="80" />
+        <dc:Bounds x="1113" y="300" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="prepareVnfAdapterDelete_ScriptTask_1">
-        <dc:Bounds x="993" y="180" width="100" height="80" />
+        <dc:Bounds x="1113" y="180" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_CallActivity_22">
-        <di:waypoint xsi:type="dc:Point" x="1043" y="260" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="300" />
+        <di:waypoint x="1163" y="260" />
+        <di:waypoint x="1163" y="300" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1112" y="280" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_CallActivity_22" targetElement="_BPMNShape_ExclusiveGateway_252">
-        <di:waypoint xsi:type="dc:Point" x="1043" y="380" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="401" />
-        <di:waypoint xsi:type="dc:Point" x="1042" y="401" />
-        <di:waypoint xsi:type="dc:Point" x="1042" y="422" />
+        <di:waypoint x="1163" y="380" />
+        <di:waypoint x="1163" y="401" />
+        <di:waypoint x="1162" y="401" />
+        <di:waypoint x="1162" y="422" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1039" y="415" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_163" bpmnElement="EndEvent_1">
-        <dc:Bounds x="588" y="382" width="36" height="36" />
+        <dc:Bounds x="708" y="382" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="606" y="423" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_CallActivity_3" targetElement="_BPMNShape_EndEvent_163">
-        <di:waypoint xsi:type="dc:Point" x="538" y="400" />
-        <di:waypoint xsi:type="dc:Point" x="588" y="400" />
+        <di:waypoint x="658" y="400" />
+        <di:waypoint x="708" y="400" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="558" y="400" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_167" bpmnElement="EndEvent_2">
-        <dc:Bounds x="1025" y="1201" width="36" height="36" />
+        <dc:Bounds x="1145" y="1201" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1029" y="1242" width="29" height="22" />
+          <dc:Bounds x="1154" y="1242" width="20" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_CallActivity_4" targetElement="_BPMNShape_ScriptTask_241">
-        <di:waypoint xsi:type="dc:Point" x="1043" y="1065" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="1093" />
+        <di:waypoint x="1163" y="1065" />
+        <di:waypoint x="1163" y="1093" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1258" y="1083" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_234" bpmnElement="ScriptTask_4">
-        <dc:Bounds x="120" y="492" width="100" height="80" />
+        <dc:Bounds x="240" y="492" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_127" targetElement="_BPMNShape_ScriptTask_251">
-        <di:waypoint xsi:type="dc:Point" x="596" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="623" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="623" y="115" />
-        <di:waypoint xsi:type="dc:Point" x="636" y="115" />
+        <di:waypoint x="716" y="112" />
+        <di:waypoint x="743" y="112" />
+        <di:waypoint x="743" y="115" />
+        <di:waypoint x="756" y="115" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="613" y="112" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_62" targetElement="_BPMNShape_ExclusiveGateway_203">
-        <di:waypoint xsi:type="dc:Point" x="964" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="1017" y="111" />
+        <di:waypoint x="1084" y="112" />
+        <di:waypoint x="1137" y="111" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1067" y="113" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_203" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
-        <dc:Bounds x="1017" y="86" width="50" height="50" />
+        <dc:Bounds x="1137" y="86" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="984" y="60" width="102" height="22" />
+          <dc:Bounds x="1115" y="60" width="81" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_240" bpmnElement="ScriptTask_2">
-        <dc:Bounds x="1104" y="72" width="100" height="80" />
+        <dc:Bounds x="1224" y="72" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_203" targetElement="_BPMNShape_ScriptTask_160">
-        <di:waypoint xsi:type="dc:Point" x="1042" y="136" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="180" />
+        <di:waypoint x="1162" y="136" />
+        <di:waypoint x="1163" y="180" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1040" y="122" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_203" targetElement="_BPMNShape_ScriptTask_240">
-        <di:waypoint xsi:type="dc:Point" x="1067" y="111" />
-        <di:waypoint xsi:type="dc:Point" x="1085" y="111" />
-        <di:waypoint xsi:type="dc:Point" x="1085" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="1104" y="112" />
+        <di:waypoint x="1187" y="111" />
+        <di:waypoint x="1205" y="111" />
+        <di:waypoint x="1205" y="112" />
+        <di:waypoint x="1224" y="112" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1216" y="113" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_178" bpmnElement="EndEvent_5">
-        <dc:Bounds x="1242" y="95" width="36" height="36" />
+        <dc:Bounds x="1362" y="95" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1260" y="136" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_240" targetElement="_BPMNShape_EndEvent_178">
-        <di:waypoint xsi:type="dc:Point" x="1204" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="1222" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="1222" y="113" />
-        <di:waypoint xsi:type="dc:Point" x="1242" y="113" />
+        <di:waypoint x="1324" y="112" />
+        <di:waypoint x="1342" y="112" />
+        <di:waypoint x="1342" y="113" />
+        <di:waypoint x="1362" y="113" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1220" y="113" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_241" bpmnElement="ScriptTask_3">
-        <dc:Bounds x="993" y="1093" width="100" height="80" />
+        <dc:Bounds x="1113" y="1093" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_241" targetElement="_BPMNShape_EndEvent_167">
-        <di:waypoint xsi:type="dc:Point" x="1043" y="1173" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="1201" />
+        <di:waypoint x="1163" y="1173" />
+        <di:waypoint x="1163" y="1201" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1040" y="1320" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_251" bpmnElement="ScriptTask_callRestCloudRegion">
-        <dc:Bounds x="636" y="75" width="100" height="80" />
+        <dc:Bounds x="756" y="75" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_223" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
-        <dc:Bounds x="774" y="89" width="50" height="50" />
+        <dc:Bounds x="894" y="89" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="735" y="40" width="125" height="22" />
+          <dc:Bounds x="879" y="40" width="78" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_215" bpmnElement="EndEvent_3">
-        <dc:Bounds x="781" y="170" width="36" height="36" />
+        <dc:Bounds x="901" y="170" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="799" y="211" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_EndEvent_215">
-        <di:waypoint xsi:type="dc:Point" x="798" y="139" />
-        <di:waypoint xsi:type="dc:Point" x="798" y="153" />
-        <di:waypoint xsi:type="dc:Point" x="799" y="153" />
-        <di:waypoint xsi:type="dc:Point" x="799" y="170" />
+        <di:waypoint x="918" y="139" />
+        <di:waypoint x="918" y="153" />
+        <di:waypoint x="919" y="153" />
+        <di:waypoint x="919" y="170" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="796" y="166" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_251" targetElement="_BPMNShape_ExclusiveGateway_223">
-        <di:waypoint xsi:type="dc:Point" x="736" y="115" />
-        <di:waypoint xsi:type="dc:Point" x="754" y="115" />
-        <di:waypoint xsi:type="dc:Point" x="754" y="114" />
-        <di:waypoint xsi:type="dc:Point" x="774" y="114" />
+        <di:waypoint x="856" y="115" />
+        <di:waypoint x="874" y="115" />
+        <di:waypoint x="874" y="114" />
+        <di:waypoint x="894" y="114" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="752" y="114" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_ScriptTask_62">
-        <di:waypoint xsi:type="dc:Point" x="824" y="114" />
-        <di:waypoint xsi:type="dc:Point" x="844" y="114" />
-        <di:waypoint xsi:type="dc:Point" x="844" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="864" y="112" />
+        <di:waypoint x="944" y="114" />
+        <di:waypoint x="964" y="114" />
+        <di:waypoint x="964" y="112" />
+        <di:waypoint x="984" y="112" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="841" y="113" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_252" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds x="1017" y="422" width="50" height="50" />
+        <dc:Bounds x="1137" y="422" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="960" y="477" width="164" height="22" />
+          <dc:Bounds x="1129" y="477" width="66" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_vnfAdapterCallOK" sourceElement="_BPMNShape_ExclusiveGateway_252" targetElement="_BPMNShape_ScriptTask_134">
-        <di:waypoint xsi:type="dc:Point" x="1042" y="472" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="528" />
+        <di:waypoint x="1162" y="472" />
+        <di:waypoint x="1163" y="528" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1040" y="500" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_236" bpmnElement="EndEvent_6">
-        <dc:Bounds x="1168" y="430" width="36" height="36" />
+        <dc:Bounds x="1288" y="430" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1186" y="471" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_vnfAdapterCallNotOK" sourceElement="_BPMNShape_ExclusiveGateway_252" targetElement="_BPMNShape_EndEvent_236">
-        <di:waypoint xsi:type="dc:Point" x="1067" y="447" />
-        <di:waypoint xsi:type="dc:Point" x="1117" y="447" />
-        <di:waypoint xsi:type="dc:Point" x="1117" y="448" />
-        <di:waypoint xsi:type="dc:Point" x="1168" y="448" />
+        <di:waypoint x="1187" y="447" />
+        <di:waypoint x="1237" y="447" />
+        <di:waypoint x="1237" y="448" />
+        <di:waypoint x="1288" y="448" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_255" bpmnElement="ExclusiveGateway_synResponseSent" isMarkerVisible="true">
-        <dc:Bounds x="144" y="375" width="50" height="50" />
+        <dc:Bounds x="264" y="375" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="106" y="439" width="129" height="22" />
+          <dc:Bounds x="254" y="439" width="73" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_responseNotSent" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ScriptTask_234">
-        <di:waypoint xsi:type="dc:Point" x="169" y="425" />
-        <di:waypoint xsi:type="dc:Point" x="169" y="458" />
-        <di:waypoint xsi:type="dc:Point" x="170" y="458" />
-        <di:waypoint xsi:type="dc:Point" x="170" y="492" />
+        <di:waypoint x="289" y="425" />
+        <di:waypoint x="289" y="458" />
+        <di:waypoint x="290" y="458" />
+        <di:waypoint x="290" y="492" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="159" y="458" width="22" height="22" />
+          <dc:Bounds x="283" y="458" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_responseSent" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ScriptTask_79">
-        <di:waypoint xsi:type="dc:Point" x="194" y="400" />
-        <di:waypoint xsi:type="dc:Point" x="288" y="400" />
+        <di:waypoint x="314" y="400" />
+        <di:waypoint x="408" y="400" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="204" y="400" width="29" height="22" />
+          <dc:Bounds x="330" y="400" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_234" targetElement="_BPMNShape_ScriptTask_79">
-        <di:waypoint xsi:type="dc:Point" x="220" y="532" />
-        <di:waypoint xsi:type="dc:Point" x="254" y="532" />
-        <di:waypoint xsi:type="dc:Point" x="336" y="532" />
-        <di:waypoint xsi:type="dc:Point" x="336" y="508" />
-        <di:waypoint xsi:type="dc:Point" x="336" y="482" />
-        <di:waypoint xsi:type="dc:Point" x="337" y="440" />
+        <di:waypoint x="340" y="532" />
+        <di:waypoint x="374" y="532" />
+        <di:waypoint x="456" y="532" />
+        <di:waypoint x="456" y="508" />
+        <di:waypoint x="456" y="482" />
+        <di:waypoint x="457" y="440" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="317" y="532" width="6" height="6" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
index ce346e13b3..4826d88d8a 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.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: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="_ZBLUcCkQEeaY6ZhIaNLwzg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="_ZBLUcCkQEeaY6ZhIaNLwzg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="UpdateVfModuleVolumeInfraV1" name="UpdateVfModuleVolumeInfraV1" isExecutable="true">
     <bpmn2:endEvent id="EndEvent_4" name="TheEnd">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
@@ -21,7 +21,7 @@
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
+            <camunda:inputParameter name="url">${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}</camunda:inputParameter>
             <camunda:inputParameter name="payload">${UPDVfModVol_updateInfraRequest}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -43,26 +43,26 @@
     <bpmn2:scriptTask id="ScriptTask_prepVnfRest" name="Prepare VNF Adapter Rest Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepVnfAdapterRest', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepVnfAdapterRest', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_prepVnfRest" targetRef="CallActivity_callVNFAdapterRest" />
     <bpmn2:scriptTask id="ScriptTask_prepCompletionHandlerRequest" name="Prep Completion Handler Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_requestId, 'UPDATE', UPDVfModVol_source, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_requestId, 'UPDATE', UPDVfModVol_source, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_prepCompletionHandlerRequest" targetRef="CallActivity_completionHandler" />
-    <bpmn2:callActivity id="CallActivity_callVNFAdapterRest" name="VNFAdapterRest" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="CallActivity_callVNFAdapterRest" name="VNFAdapterRest" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:out source="WorkflowResponse" target="UPDVfModVol_vnfAdapterRestResponse" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
-        <camunda:in source="UPDVfModVol_vnfAdapterRestRequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="UPDVfModVol_vnfAdapterRestRequest" target="openstackAdapterTaskRequest" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
@@ -71,16 +71,16 @@ uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_reques
     <bpmn2:scriptTask id="ScriptTask_prepDbInfraRequest" name="Prep DB Infra Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepDbInfraDbRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepDbInfraDbRequest', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_prepDbInfraRequest" targetRef="ServiceTask_callUpdateInfraDb" />
     <bpmn2:scriptTask id="ScriptTask_postProcessTemp" name="Set Success" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[// The following variable is checked by the unit test
-execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)]]></bpmn2:script>
+      <bpmn2:script>// The following variable is checked by the unit test
+execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_postProcessTemp" targetRef="EndEvent_4" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_2">
@@ -101,9 +101,9 @@ execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)]]></bpmn2:sc
       <bpmn2:scriptTask id="ScriptTask_preFalloutHandler" name="Fallout Handler (prep)" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_preFalloutHandler" targetRef="CallActivity_falloutHandler" />
       <bpmn2:callActivity id="CallActivity_falloutHandler" name="Fallout Handler" calledElement="FalloutHandler">
@@ -134,17 +134,17 @@ uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)]]></bpmn2
     <bpmn2:scriptTask id="ScriptTask_queryAaiForVfModule" name="Query AAI for VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_YesVfModuleRelation</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('queryAAIForVfModule', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('queryAAIForVfModule', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ScriptTask_queryAaiForVfModule" targetRef="ExclusiveGateway_personaModelIdMatch" />
     <bpmn2:scriptTask id="ScriptTask_handlePersonaModelIdMismatch" name="Handle Persona Model ID Mismatch" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_personaModelidMatchNo</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="ScriptTask_handlePersonaModelIdMismatch" targetRef="EndEvent_personaModelIdMismatch" />
     <bpmn2:endEvent id="EndEvent_personaModelIdMismatch">
@@ -154,9 +154,9 @@ uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)
     <bpmn2:scriptTask id="ScriptTask_preProcessRequest" name="Pre-process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_preProcessRequest" targetRef="ScriptTask_sendSynchResponse" />
     <bpmn2:startEvent id="StartEvent_1" name="Start">
@@ -166,9 +166,9 @@ uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:
     <bpmn2:scriptTask id="ScriptTask_sendSynchResponse" name="Send Synch Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_sendSynchResponse" targetRef="ScriptTask_queryAaiGenricVnf" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="VF-MODULE relation?" default="SequenceFlow_noVfModuleRelation">
@@ -177,7 +177,7 @@ uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:
       <bpmn2:outgoing>SequenceFlow_noVfModuleRelation</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_YesVfModuleRelation" name="Yes" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_queryAaiForVfModule">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{UPDVfModVol_relatedVfModuleLink != ''}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{UPDVfModVol_relatedVfModuleLink != ''}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_noVfModuleRelation" name="No" sourceRef="ExclusiveGateway_1" targetRef="ExclusiveGateway_2" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_isTenantMatch" name="TenantId Match?" default="SequenceFlow_NoTenantMatch">
@@ -192,9 +192,9 @@ uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:
     <bpmn2:scriptTask id="ScriptTask_tenantIdMismatch" name="Handle TenantId Mismatch" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_NoTenantMatch</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_tenantIdMismatch" targetRef="EndEvent_2" />
     <bpmn2:endEvent id="EndEvent_2">
@@ -204,17 +204,17 @@ uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></b
     <bpmn2:scriptTask id="ScriptTask_queryAAI" name="Query AAI for Volume Group Info" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_queryAAI" targetRef="ExclusiveGateway_isTenantMatch" />
     <bpmn2:scriptTask id="ScriptTask_queryAaiGenricVnf" name="Query AAI for Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_queryAaiGenricVnf" targetRef="ScriptTask_queryAAI" />
   </bpmn2:process>
@@ -228,10 +228,10 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_StartEvent_62" targetElement="_BPMNShape_ScriptTask_231">
-        <di:waypoint xsi:type="dc:Point" x="227" y="149" />
-        <di:waypoint xsi:type="dc:Point" x="268" y="149" />
-        <di:waypoint xsi:type="dc:Point" x="268" y="150" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="150" />
+        <di:waypoint x="227" y="149" />
+        <di:waypoint x="268" y="149" />
+        <di:waypoint x="268" y="150" />
+        <di:waypoint x="295" y="150" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="248" y="149" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -249,8 +249,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         <dc:Bounds x="454" y="112" width="109" height="76" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_231" targetElement="_BPMNShape_ScriptTask_232">
-        <di:waypoint xsi:type="dc:Point" x="403" y="150" />
-        <di:waypoint xsi:type="dc:Point" x="454" y="150" />
+        <di:waypoint x="403" y="150" />
+        <di:waypoint x="454" y="150" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="418" y="150" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -262,15 +262,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         <dc:Bounds x="868" y="420" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_233" targetElement="_BPMNShape_ServiceTask_101">
-        <di:waypoint xsi:type="dc:Point" x="838" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="868" y="460" />
+        <di:waypoint x="838" y="460" />
+        <di:waypoint x="868" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="853" y="491" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ServiceTask_101" targetElement="_BPMNShape_ScriptTask_234">
-        <di:waypoint xsi:type="dc:Point" x="976" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="1014" y="460" />
+        <di:waypoint x="976" y="460" />
+        <di:waypoint x="1014" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="959" y="497" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -282,15 +282,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         <dc:Bounds x="1162" y="429" width="109" height="61" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_234" targetElement="_BPMNShape_CallActivity_43">
-        <di:waypoint xsi:type="dc:Point" x="1122" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="1162" y="459" />
+        <di:waypoint x="1122" y="460" />
+        <di:waypoint x="1162" y="459" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1134" y="477" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_CallActivity_43" targetElement="_BPMNShape_ScriptTask_230">
-        <di:waypoint xsi:type="dc:Point" x="1270" y="459" />
-        <di:waypoint xsi:type="dc:Point" x="1318" y="460" />
+        <di:waypoint x="1270" y="459" />
+        <di:waypoint x="1318" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1216" y="521" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -308,15 +308,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         <dc:Bounds x="1064" y="112" width="97" height="75" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_235" targetElement="_BPMNShape_ExclusiveGateway_126">
-        <di:waypoint xsi:type="dc:Point" x="850" y="149" />
-        <di:waypoint xsi:type="dc:Point" x="931" y="149" />
+        <di:waypoint x="850" y="149" />
+        <di:waypoint x="931" y="149" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="877" y="149" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_NoTenantMatch" sourceElement="_BPMNShape_ExclusiveGateway_126" targetElement="_BPMNShape_ScriptTask_236">
-        <di:waypoint xsi:type="dc:Point" x="965" y="149" />
-        <di:waypoint xsi:type="dc:Point" x="1064" y="149" />
+        <di:waypoint x="965" y="149" />
+        <di:waypoint x="1064" y="149" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="986" y="149" width="22" height="22" />
         </bpmndi:BPMNLabel>
@@ -328,31 +328,31 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_236" targetElement="_BPMNShape_EndEvent_169">
-        <di:waypoint xsi:type="dc:Point" x="1160" y="149" />
-        <di:waypoint xsi:type="dc:Point" x="1225" y="149" />
+        <di:waypoint x="1160" y="149" />
+        <di:waypoint x="1225" y="149" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1179" y="149" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_tenantIsMatch" sourceElement="_BPMNShape_ExclusiveGateway_126" targetElement="_BPMNShape_ExclusiveGateway_254">
-        <di:waypoint xsi:type="dc:Point" x="948" y="166" />
-        <di:waypoint xsi:type="dc:Point" x="948" y="244" />
+        <di:waypoint x="948" y="166" />
+        <di:waypoint x="948" y="244" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="915" y="173" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_CallActivity_42" targetElement="_BPMNShape_ScriptTask_233">
-        <di:waypoint xsi:type="dc:Point" x="691" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="730" y="460" />
+        <di:waypoint x="691" y="460" />
+        <di:waypoint x="730" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="712" y="531" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_232" targetElement="_BPMNShape_ScriptTask_318">
-        <di:waypoint xsi:type="dc:Point" x="562" y="150" />
-        <di:waypoint xsi:type="dc:Point" x="581" y="150" />
-        <di:waypoint xsi:type="dc:Point" x="581" y="149" />
-        <di:waypoint xsi:type="dc:Point" x="612" y="149" />
+        <di:waypoint x="562" y="150" />
+        <di:waypoint x="581" y="150" />
+        <di:waypoint x="581" y="149" />
+        <di:waypoint x="612" y="149" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="578" y="150" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -361,8 +361,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         <dc:Bounds x="454" y="420" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_CallActivity_42">
-        <di:waypoint xsi:type="dc:Point" x="562" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="460" />
+        <di:waypoint x="562" y="460" />
+        <di:waypoint x="591" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="446" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -383,8 +383,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         <dc:Bounds x="639" y="832" width="109" height="61" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_238" targetElement="_BPMNShape_CallActivity_44">
-        <di:waypoint xsi:type="dc:Point" x="553" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="639" y="862" />
+        <di:waypoint x="553" y="862" />
+        <di:waypoint x="639" y="862" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="573" y="946" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -396,8 +396,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_CallActivity_44" targetElement="_BPMNShape_EndEvent_170">
-        <di:waypoint xsi:type="dc:Point" x="747" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="862" y="862" />
+        <di:waypoint x="747" y="862" />
+        <di:waypoint x="862" y="862" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="765" y="1030" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -409,15 +409,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_ScriptTask_230" targetElement="_BPMNShape_EndEvent_171">
-        <di:waypoint xsi:type="dc:Point" x="1426" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="1461" y="459" />
+        <di:waypoint x="1426" y="460" />
+        <di:waypoint x="1461" y="459" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1442" y="467" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_StartEvent_63" targetElement="_BPMNShape_ScriptTask_238">
-        <di:waypoint xsi:type="dc:Point" x="337" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="445" y="862" />
+        <di:waypoint x="337" y="862" />
+        <di:waypoint x="445" y="862" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="385" y="1030" width="6" height="6" />
         </bpmndi:BPMNLabel>
@@ -429,10 +429,10 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_YesVfModuleRelation" sourceElement="_BPMNShape_ExclusiveGateway_254" targetElement="_BPMNShape_ScriptTask_313">
-        <di:waypoint xsi:type="dc:Point" x="931" y="261" />
-        <di:waypoint xsi:type="dc:Point" x="634" y="261" />
-        <di:waypoint xsi:type="dc:Point" x="634" y="262" />
-        <di:waypoint xsi:type="dc:Point" x="405" y="262" />
+        <di:waypoint x="931" y="261" />
+        <di:waypoint x="634" y="261" />
+        <di:waypoint x="634" y="262" />
+        <di:waypoint x="405" y="262" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="729" y="261" width="29" height="22" />
         </bpmndi:BPMNLabel>
@@ -447,16 +447,16 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_313" targetElement="_BPMNShape_ExclusiveGateway_255">
-        <di:waypoint xsi:type="dc:Point" x="350" y="302" />
-        <di:waypoint xsi:type="dc:Point" x="350" y="329" />
-        <di:waypoint xsi:type="dc:Point" x="350" y="346" />
+        <di:waypoint x="350" y="302" />
+        <di:waypoint x="350" y="329" />
+        <di:waypoint x="350" y="346" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="347" y="318" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_personaModelIdMatchYes" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ExclusiveGateway_256">
-        <di:waypoint xsi:type="dc:Point" x="367" y="363" />
-        <di:waypoint xsi:type="dc:Point" x="491" y="363" />
+        <di:waypoint x="367" y="363" />
+        <di:waypoint x="491" y="363" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="398" y="363" width="29" height="22" />
         </bpmndi:BPMNLabel>
@@ -468,18 +468,18 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_noVfModuleRelation" sourceElement="_BPMNShape_ExclusiveGateway_254" targetElement="_BPMNShape_ExclusiveGateway_256">
-        <di:waypoint xsi:type="dc:Point" x="948" y="278" />
-        <di:waypoint xsi:type="dc:Point" x="948" y="363" />
-        <di:waypoint xsi:type="dc:Point" x="701" y="363" />
-        <di:waypoint xsi:type="dc:Point" x="525" y="363" />
+        <di:waypoint x="948" y="278" />
+        <di:waypoint x="948" y="363" />
+        <di:waypoint x="701" y="363" />
+        <di:waypoint x="525" y="363" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="795" y="363" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_personaModelidMatchNo" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ScriptTask_315">
-        <di:waypoint xsi:type="dc:Point" x="350" y="380" />
-        <di:waypoint xsi:type="dc:Point" x="350" y="401" />
-        <di:waypoint xsi:type="dc:Point" x="351" y="460" />
+        <di:waypoint x="350" y="380" />
+        <di:waypoint x="350" y="401" />
+        <di:waypoint x="351" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="350" y="409" width="22" height="22" />
         </bpmndi:BPMNLabel>
@@ -494,22 +494,22 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_315" targetElement="_BPMNShape_EndEvent_172">
-        <di:waypoint xsi:type="dc:Point" x="351" y="540" />
-        <di:waypoint xsi:type="dc:Point" x="351" y="600" />
+        <di:waypoint x="351" y="540" />
+        <di:waypoint x="351" y="600" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="348" y="560" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ExclusiveGateway_256" targetElement="_BPMNShape_ScriptTask_237">
-        <di:waypoint xsi:type="dc:Point" x="508" y="380" />
-        <di:waypoint xsi:type="dc:Point" x="508" y="420" />
+        <di:waypoint x="508" y="380" />
+        <di:waypoint x="508" y="420" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_318" bpmnElement="ScriptTask_queryAaiGenricVnf">
         <dc:Bounds x="612" y="112" width="97" height="75" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_318" targetElement="_BPMNShape_ScriptTask_235">
-        <di:waypoint xsi:type="dc:Point" x="708" y="149" />
-        <di:waypoint xsi:type="dc:Point" x="742" y="149" />
+        <di:waypoint x="708" y="149" />
+        <di:waypoint x="742" y="149" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
index c049eaafa0..76e6199fa6 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.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: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="2.0.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateNetworkInstance" name="DoCreateNetworkInstance" isExecutable="true">
     <bpmn2:startEvent id="createNetwork_startEvent" name="Start Flow">
       <bpmn2:outgoing>SequenceFlow_1n61wit</bpmn2:outgoing>
@@ -24,8 +24,7 @@ DoCreateNetworkInstance.callRESTQueryAAICloudRegion(execution)</bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
       <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.prepareSDNCRequest(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.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 Assign Response" scriptFormat="groovy">
@@ -78,13 +77,6 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkId(execution)</bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="callAssignSDNCAdapter_CallActivity" targetRef="validateSDNCResponse_ScriptTask" />
-    <bpmn2:scriptTask id="validateCreatePONetwork_ScriptTask" name="Validate Create PO Network" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_59</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
-def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.validateCreateNetworkResponse(execution)</bpmn2:script>
-    </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="isNetworkActive_ExclusiveGateway" name="Is Network Active?" default="isNetworkActiveNo_SequenceFlow">
       <bpmn2:incoming>isAAIQueryNameYes_SequenceFlow</bpmn2:incoming>
       <bpmn2:outgoing>isNetworkActiveYes_SequenceFlow</bpmn2:outgoing>
@@ -149,7 +141,7 @@ DoCreateNetworkInstance.prepareSDNCRollbackRequest(execution)</bpmn2:script>
         <bpmn2:outgoing>isSdncRpc4No_SequenceFlow4</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="isSdncRpc4Yes_SequenceFlow4" name="Yes" sourceRef="isSdncRpc4_ExclusiveGateway4" targetRef="Task_0q6pzpn">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'} </bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="isSdncRpc4No_SequenceFlow4" name="No" sourceRef="isSdncRpc4_ExclusiveGateway4" targetRef="prepareSDNCRollbackRequest_ScriptTask" />
       <bpmn2:scriptTask id="Task_0q6pzpn" name="Prepare RSRC SDNCRollback Request" scriptFormat="groovy">
@@ -163,7 +155,7 @@ DoCreateNetworkInstance.prepareRpcSDNCRollbackRequest(execution)</bpmn2:script>
         <bpmn2:incoming>SequenceFlow_1qwubew</bpmn2:incoming>
       </bpmn2:endEvent>
       <bpmn2:scriptTask id="ScriptTask_0myjg9k" name="Prepare RollbackData" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_15sffxc</bpmn2:incoming>
+        <bpmn2:incoming>Flow_15l1pk2</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_096tad6</bpmn2:outgoing>
         <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
@@ -223,7 +215,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
         <bpmn2:incoming>SequenceFlow_0bwpkkb</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_15sffxc</bpmn2:outgoing>
       </bpmn2:inclusiveGateway>
-      <bpmn2:sequenceFlow id="SequenceFlow_15sffxc" sourceRef="ExclusiveGateway_1qb2vwe" targetRef="ScriptTask_0myjg9k" />
+      <bpmn2:sequenceFlow id="SequenceFlow_15sffxc" sourceRef="ExclusiveGateway_1qb2vwe" targetRef="validateCreatePONetwork_ScriptTask" />
       <bpmn2:inclusiveGateway id="ExclusiveGateway_1bk0tqd">
         <bpmn2:incoming>SequenceFlow_0b8j5rw</bpmn2:incoming>
         <bpmn2:incoming>SequenceFlow_12tlymf</bpmn2:incoming>
@@ -241,19 +233,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
         <bpmn2:outgoing>SequenceFlow_10ttvwn</bpmn2:outgoing>
         <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.setExceptionFlag(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.setExceptionFlag(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_10ttvwn" sourceRef="ScriptTask_0j3058g" targetRef="isRollbackOn_ExclusiveGateway" />
+      <bpmn2:scriptTask id="validateCreatePONetwork_ScriptTask" name="Validate Create PO Network" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_15sffxc</bpmn2:incoming>
+        <bpmn2:outgoing>Flow_15l1pk2</bpmn2:outgoing>
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
+def DoCreateNetworkInstance = new DoCreateNetworkInstance()
+DoCreateNetworkInstance.validateCreateNetworkResponse(execution)</bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="Flow_15l1pk2" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="ScriptTask_0myjg9k" />
       <bpmn2:textAnnotation id="TextAnnotation_1py1p84">
-        <bpmn2:text>  
-Include ONLY inputs/varrables:  
+        <bpmn2:text>Include ONLY inputs/varrables:  
 rollbackData, as Map
 -rollbackSDNCRequest
 -rollbackActivateSDNCRequest
 -rollbackNetworkRequest
-WorkflowException
- </bpmn2:text>
+WorkflowException</bpmn2:text>
       </bpmn2:textAnnotation>
       <bpmn2:association id="Association_0nketgd" sourceRef="CallActivity_1u07hp7" targetRef="TextAnnotation_1py1p84" />
       <bpmn2:textAnnotation id="TextAnnotation_0wjpv6r">
@@ -261,31 +258,7 @@ WorkflowException
       </bpmn2:textAnnotation>
       <bpmn2:association id="Association_0eolbkz" sourceRef="ExclusiveGateway_1bk0tqd" targetRef="TextAnnotation_0wjpv6r" />
     </bpmn2:subProcess>
-    <bpmn2:serviceTask id="callCreateNetwork_ServiceTask" name="Call Create Network">
-      <bpmn2:extensionElements>
-        <camunda:connector>
-          <camunda:inputOutput>
-            <camunda:inputParameter name="payload">${CRENWKI_createNetworkRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="url">${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}
-</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">POST</camunda:inputParameter>
-            <camunda:outputParameter name="CRENWKI_networkReturnCode">${statusCode}</camunda:outputParameter>
-            <camunda:outputParameter name="CRENWKI_createNetworkResponse">${response}</camunda:outputParameter>
-          </camunda:inputOutput>
-          <camunda:connectorId>http-connector</camunda:connectorId>
-        </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="callCreateNetwork_ServiceTask" targetRef="validateCreatePONetwork_ScriptTask" />
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="callRESTReQueryNetworkID_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="Activity_1yoiuwp" targetRef="callRESTReQueryNetworkID_ScriptTask" />
     <bpmn2:scriptTask id="callRESTReQueryNetworkID_ScriptTask" name="Call REST ReQuery Network Id in AAI" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
@@ -349,10 +322,9 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)</bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_61</bpmn2:outgoing>
       <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.prepareCreateNetworkRequest(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.prepareCreateNetworkRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="callCreateNetwork_ServiceTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="Activity_1yoiuwp" />
     <bpmn2:scriptTask id="callRESTQueryNetworkTableRef_ScriptTask" name="Call REST Query Network TableRef in AAI" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
@@ -435,7 +407,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)</bpmn2:script
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="isSdncRpc1No_SequenceFlow1" name="No" sourceRef="isSdncRpc1_ExclusiveGateway1" targetRef="prepareSDNCTopoRequest_ScriptTask" />
     <bpmn2:sequenceFlow id="isSdncRpc1Yes_SequenceFlow1" name="Yes" sourceRef="isSdncRpc1_ExclusiveGateway1" targetRef="Task_10lubzj">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'} </bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:callActivity id="Task_0pbtywn" name="Call SDNC RSRC Assign Adapter V1 " calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -458,7 +430,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)</bpmn2:script
       <bpmn2:outgoing>isSdncRpc2No_SequenceFlow2</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="isSdncRpc2Yes_SequenceFlow2" name="Yes" sourceRef="isSdncRpc2_ExclusiveGateway2" targetRef="Task_1rd6dg6">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'} </bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="isSdncRpc2No_SequenceFlow2" name="No" sourceRef="isSdncRpc2_ExclusiveGateway2" targetRef="Task_0zzobg6" />
     <bpmn2:scriptTask id="Task_10lubzj" name="Prepare Assign SDNC RPC Request" scriptFormat="groovy">
@@ -466,8 +438,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)</bpmn2:script
       <bpmn2:outgoing>SequenceFlow_0j8bxnb</bpmn2:outgoing>
       <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.prepareRpcSDNCRequest(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.prepareRpcSDNCRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:endEvent id="EndEvent_1te02c4">
       <bpmn2:incoming>SequenceFlow_1s8b1m1</bpmn2:incoming>
@@ -500,781 +471,773 @@ DoCreateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
 DoCreateNetworkInstance.getServiceInstance(execution)</bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:textAnnotation id="TextAnnotation_1orb6o6">
-      <bpmn2:text>if '200', Prepare PO Network Rollback</bpmn2:text>
-    </bpmn2:textAnnotation>
-    <bpmn2:association id="Association_0c315jr" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="TextAnnotation_1orb6o6" />
+    <bpmn2:callActivity id="Activity_1yoiuwp" name="Openstack Adapter" calledElement="openstackAdapterTask">
+      <bpmn2:extensionElements>
+        <camunda:in source="CRENWKI_createNetworkRequest" target="openstackAdapterTaskRequest" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="CRENWKI_createNetworkResponse" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
+    </bpmn2:callActivity>
   </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="DoCreateNetworkInstance">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createNetwork_startEvent">
-        <dc:Bounds x="397" y="177" width="36" height="36" />
+        <dc:Bounds x="537" y="317" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="390" y="218" width="49" height="13" />
+          <dc:Bounds x="529" y="358" width="51" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="callAAIQuery_scriptTask">
-        <dc:Bounds x="926" y="-31" width="100" height="80" />
+        <dc:Bounds x="1066" y="109" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_62" bpmnElement="isAAIQueryNameOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="1098" y="-16" width="50" height="50" />
+        <dc:Bounds x="1238" y="124" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1085" y="-56" width="75" height="24" />
+          <dc:Bounds x="1226" y="84" width="74" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_62" targetElement="_BPMNShape_ExclusiveGateway_62">
-        <di:waypoint x="1026" y="8" />
-        <di:waypoint x="1098" y="9" />
+        <di:waypoint x="1166" y="148" />
+        <di:waypoint x="1238" y="149" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1062" y="-6.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateCreatePONetwork_ScriptTask">
-        <dc:Bounds x="1457" y="1258" width="100" height="80" />
+        <dc:Bounds x="828" y="1193" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="isAAIQueryNameNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_InclusiveGateway_4">
-        <di:waypoint x="1123" y="34" />
-        <di:waypoint x="1123" y="116" />
-        <di:waypoint x="1224" y="116" />
+        <di:waypoint x="1263" y="174" />
+        <di:waypoint x="1263" y="256" />
+        <di:waypoint x="1364" y="256" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1131" y="44" width="15" height="14" />
+          <dc:Bounds x="1271" y="184" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="isAAIQueryNameYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_ExclusiveGateway_73">
-        <di:waypoint x="1148" y="9" />
-        <di:waypoint x="1186" y="9" />
-        <di:waypoint x="1186" y="9" />
-        <di:waypoint x="1224" y="9" />
+        <di:waypoint x="1288" y="149" />
+        <di:waypoint x="1326" y="149" />
+        <di:waypoint x="1326" y="149" />
+        <di:waypoint x="1364" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1151" y="14.164179104477611" width="18" height="12" />
+          <dc:Bounds x="1291" y="154" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_83" bpmnElement="callCreateNetwork_ServiceTask">
-        <dc:Bounds x="1454" y="1135" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
-        <dc:Bounds x="1590" y="155" width="100" height="80" />
+        <dc:Bounds x="1730" y="295" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
-        <dc:Bounds x="31" y="608" width="1266" height="686" />
+        <dc:Bounds x="171" y="748" width="1266" height="686" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
-        <dc:Bounds x="107" y="1166" width="36" height="36" />
+        <dc:Bounds x="247" y="1306" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="101" y="1207" width="50" height="12" />
+          <dc:Bounds x="240" y="1347" width="52" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="1615" y="520" width="50" height="50" />
+        <dc:Bounds x="1755" y="660" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1606" y="580" width="67" height="13" />
+          <dc:Bounds x="1746" y="720" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="sdncTopoNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_EndEvent_124">
-        <di:waypoint x="1665" y="545" />
-        <di:waypoint x="1739" y="545" />
+        <di:waypoint x="1805" y="685" />
+        <di:waypoint x="1879" y="685" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1670" y="545.8651480742376" width="14" height="13" />
+          <dc:Bounds x="1810" y="686" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="sdncTopoYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_ScriptTask_133">
-        <di:waypoint x="1615" y="545" />
-        <di:waypoint x="1554" y="546" />
+        <di:waypoint x="1755" y="685" />
+        <di:waypoint x="1694" y="686" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1587" y="549.9992641545633" width="18" height="12" />
+          <dc:Bounds x="1727" y="690" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
-        <dc:Bounds x="1739" y="527" width="36" height="36" />
+        <dc:Bounds x="1879" y="667" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1727" y="576" width="59" height="13" />
+          <dc:Bounds x="1866" y="716" width="61" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callAssignSDNCAdapter_CallActivity">
-        <dc:Bounds x="1590" y="276" width="100" height="80" />
+        <dc:Bounds x="1730" y="416" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_67" targetElement="_BPMNShape_CallActivity_19">
-        <di:waypoint x="1640" y="235" />
-        <di:waypoint x="1640" y="276" />
+        <di:waypoint x="1780" y="375" />
+        <di:waypoint x="1780" y="416" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1655" y="255.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_CallActivity_19" targetElement="_BPMNShape_ScriptTask_131">
-        <di:waypoint x="1640" y="356" />
-        <di:waypoint x="1640" y="395" />
+        <di:waypoint x="1780" y="496" />
+        <di:waypoint x="1780" y="535" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1655" y="375.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50">
-        <di:waypoint x="143" y="1184" />
-        <di:waypoint x="170" y="1184" />
+        <di:waypoint x="283" y="1324" />
+        <di:waypoint x="310" y="1324" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="157" y="1169" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
-        <dc:Bounds x="1590" y="395" width="100" height="80" />
+        <dc:Bounds x="1730" y="535" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_131" targetElement="_BPMNShape_ExclusiveGateway_67">
-        <di:waypoint x="1640" y="475" />
-        <di:waypoint x="1640" y="498" />
-        <di:waypoint x="1640" y="498" />
-        <di:waypoint x="1640" y="520" />
+        <di:waypoint x="1780" y="615" />
+        <di:waypoint x="1780" y="638" />
+        <di:waypoint x="1780" y="638" />
+        <di:waypoint x="1780" y="660" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1655" y="498" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_73" bpmnElement="isNetworkActive_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="1224" y="-16" width="50" height="50" />
+        <dc:Bounds x="1364" y="124" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1221" y="-57" width="56" height="24" />
+          <dc:Bounds x="1363" y="83" width="53" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="isNetworkActiveYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_73">
-        <di:waypoint x="1274" y="9" />
-        <di:waypoint x="1335" y="9" />
+        <di:waypoint x="1414" y="149" />
+        <di:waypoint x="1475" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1275" y="14.380425096632202" width="18" height="12" />
+          <dc:Bounds x="1415" y="154" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_44" bpmnElement="isNetworkActiveNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_73" targetElement="_BPMNShape_InclusiveGateway_4">
-        <di:waypoint x="1249" y="34" />
-        <di:waypoint x="1249" y="91" />
+        <di:waypoint x="1389" y="174" />
+        <di:waypoint x="1389" y="231" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1258" y="37.520779498373976" width="14" height="12" />
+          <dc:Bounds x="1398" y="178" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_45" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_InclusiveGateway_4" targetElement="_BPMNShape_ScriptTask_245">
-        <di:waypoint x="1249" y="141" />
-        <di:waypoint x="1249" y="276" />
+        <di:waypoint x="1389" y="281" />
+        <di:waypoint x="1389" y="416" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1264" y="208.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_4" bpmnElement="InclusiveGateway">
-        <dc:Bounds x="1224" y="91" width="50" height="50" />
+        <dc:Bounds x="1364" y="231" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1306" y="86" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_133" bpmnElement="callRESTQueryNetworkId_ScriptTask">
-        <dc:Bounds x="1454" y="505" width="100" height="80" />
+        <dc:Bounds x="1594" y="645" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTReQueryNetworkID_ScriptTask">
-        <dc:Bounds x="1454" y="1392" width="100" height="80" />
+        <dc:Bounds x="1594" y="1532" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_135" bpmnElement="callRESTUpdateContrailNetwork_ScriptTask">
-        <dc:Bounds x="1454" y="1538" width="100" height="80" />
+        <dc:Bounds x="1594" y="1678" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_135">
-        <di:waypoint x="1504" y="1472" />
-        <di:waypoint x="1504" y="1538" />
+        <di:waypoint x="1644" y="1612" />
+        <di:waypoint x="1644" y="1678" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1519" y="1505" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="callRESTQueryVpnBinding_ScriptTask">
-        <dc:Bounds x="1454" y="627" width="100" height="80" />
+        <dc:Bounds x="1594" y="767" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_215">
-        <di:waypoint x="1504" y="707" />
-        <di:waypoint x="1504" y="727" />
-        <di:waypoint x="1504" y="727" />
-        <di:waypoint x="1504" y="750" />
+        <di:waypoint x="1644" y="847" />
+        <di:waypoint x="1644" y="867" />
+        <di:waypoint x="1644" y="867" />
+        <di:waypoint x="1644" y="890" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1519" y="727" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_49" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ScriptTask_133" targetElement="_BPMNShape_ScriptTask_156">
-        <di:waypoint x="1504" y="585" />
-        <di:waypoint x="1504" y="606" />
-        <di:waypoint x="1504" y="606" />
-        <di:waypoint x="1504" y="627" />
+        <di:waypoint x="1644" y="725" />
+        <di:waypoint x="1644" y="746" />
+        <di:waypoint x="1644" y="746" />
+        <di:waypoint x="1644" y="767" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1519" y="606" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_87" bpmnElement="SequenceFlow_59" sourceElement="_BPMNShape_ServiceTask_83" targetElement="_BPMNShape_ScriptTask_63">
-        <di:waypoint x="1505" y="1215" />
-        <di:waypoint x="1505" y="1237" />
-        <di:waypoint x="1505" y="1237" />
-        <di:waypoint x="1505" y="1258" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1520" y="1237" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="prepareNetworkRequest_ScriptTask">
-        <dc:Bounds x="1454" y="1009" width="100" height="80" />
+        <dc:Bounds x="1594" y="1149" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ServiceTask_83">
-        <di:waypoint x="1504" y="1089" />
-        <di:waypoint x="1504" y="1111" />
-        <di:waypoint x="1504" y="1111" />
-        <di:waypoint x="1504" y="1135" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="Activity_18agmdb_di">
+        <di:waypoint x="1644" y="1229" />
+        <di:waypoint x="1644" y="1275" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1519" y="1111" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="callRESTQueryNetworkPolicy_ScriptTask">
-        <dc:Bounds x="1454" y="750" width="100" height="80" />
+        <dc:Bounds x="1594" y="890" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_60" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ScriptTask_333">
-        <di:waypoint x="1504" y="830" />
-        <di:waypoint x="1504" y="879" />
+        <di:waypoint x="1644" y="970" />
+        <di:waypoint x="1644" y="1019" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1519" y="854.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="isPONR_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="304" y="1060" width="50" height="50" />
+        <dc:Bounds x="444" y="1200" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="248" y="1078" width="46" height="12" />
+          <dc:Bounds x="388" y="1218" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
-        <di:waypoint x="354" y="1085" />
-        <di:waypoint x="457" y="1085" />
-        <di:waypoint x="457" y="1159" />
+        <di:waypoint x="494" y="1225" />
+        <di:waypoint x="597" y="1225" />
+        <di:waypoint x="597" y="1299" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="351" y="1088" width="18" height="12" />
+          <dc:Bounds x="491" y="1228" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_85" bpmnElement="isPONR_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
-        <di:waypoint x="329" y="1060" />
-        <di:waypoint x="329" y="1003" />
+        <di:waypoint x="469" y="1200" />
+        <di:waypoint x="469" y="1143" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="339" y="1051" width="14" height="12" />
+          <dc:Bounds x="479" y="1191" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_217" bpmnElement="sdncOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="527" y="845" width="50" height="50" />
+        <dc:Bounds x="667" y="985" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="585" y="858" width="72" height="24" />
+          <dc:Bounds x="726" y="998" width="70" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="_BPMNShape_ScriptTask_261">
-        <di:waypoint x="552" y="845" />
-        <di:waypoint x="552" y="776" />
-        <di:waypoint x="713" y="776" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="ExclusiveGateway_00dh41t_di">
+        <di:waypoint x="692" y="985" />
+        <di:waypoint x="692" y="916" />
+        <di:waypoint x="853" y="916" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="559" y="829" width="18" height="12" />
+          <dc:Bounds x="699" y="969" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_93" bpmnElement="sdncOk_No_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217">
-        <di:waypoint x="551" y="894" />
-        <di:waypoint x="551" y="978" />
-        <di:waypoint x="713" y="978" />
+        <di:waypoint x="691" y="1034" />
+        <di:waypoint x="691" y="1118" />
+        <di:waypoint x="853" y="1118" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="559" y="895" width="14" height="12" />
+          <dc:Bounds x="699" y="1035" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_245" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
-        <dc:Bounds x="1199" y="276" width="100" height="80" />
+        <dc:Bounds x="1339" y="416" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_53" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_245" targetElement="_BPMNShape_ScriptTask_67">
-        <di:waypoint x="1299" y="316" />
-        <di:waypoint x="1337" y="316" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_53" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_245" targetElement="ExclusiveGateway_1ts3ph0_di">
+        <di:waypoint x="1439" y="456" />
+        <di:waypoint x="1477" y="456" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1318" y="301" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_38" bpmnElement="BoundaryEvent_4">
-        <dc:Bounds x="1672" y="457" width="36" height="36" />
+        <dc:Bounds x="1812" y="597" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1690" y="493" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_69" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_BoundaryEvent_38" targetElement="_BPMNShape_EndEvent_124">
-        <di:waypoint x="1702" y="488" />
-        <di:waypoint x="1745" y="533" />
+        <di:waypoint x="1842" y="628" />
+        <di:waypoint x="1885" y="673" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1724" y="495.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_261" bpmnElement="prepareSDNCRollbackRequest_ScriptTask">
-        <dc:Bounds x="886" y="830" width="100" height="79" />
+        <dc:Bounds x="1026" y="970" 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 x="1507" y="1338" />
-        <di:waypoint x="1505" y="1392" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="Activity_18agmdb_di" targetElement="_BPMNShape_ScriptTask_134">
+        <di:waypoint x="1644" y="1355" />
+        <di:waypoint x="1644" y="1532" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1506" y="1350" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
-        <dc:Bounds x="21" y="381" width="394" height="188" />
+        <dc:Bounds x="161" y="521" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
-        <dc:Bounds x="54" y="458" width="36" height="36" />
+        <dc:Bounds x="194" y="598" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="72" y="499" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="ScriptTask_1">
-        <dc:Bounds x="169" y="436" width="100" height="80" />
+        <dc:Bounds x="309" y="576" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_220" bpmnElement="EndEvent_1">
-        <dc:Bounds x="330" y="458" width="36" height="36" />
+        <dc:Bounds x="470" y="598" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="348" y="499" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_270">
-        <di:waypoint x="90" y="476" />
-        <di:waypoint x="169" y="476" />
+        <di:waypoint x="230" y="616" />
+        <di:waypoint x="309" y="616" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="129" y="476" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_270" targetElement="_BPMNShape_EndEvent_220">
-        <di:waypoint x="269" y="476" />
-        <di:waypoint x="330" y="476" />
+        <di:waypoint x="409" y="616" />
+        <di:waypoint x="470" y="616" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="301" y="476" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="ScriptTask_0z2n0hl_di" targetElement="ExclusiveGateway_0lw40k5_di">
-        <di:waypoint x="809" y="235" />
-        <di:waypoint x="809" y="316" />
-        <di:waypoint x="951" y="316" />
+        <di:waypoint x="949" y="375" />
+        <di:waypoint x="949" y="456" />
+        <di:waypoint x="1091" y="456" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="779" y="275.5" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_333" bpmnElement="callRESTQueryNetworkTableRef_ScriptTask">
-        <dc:Bounds x="1454" y="879" width="100" height="80" />
+        <dc:Bounds x="1594" y="1019" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_333" targetElement="_BPMNShape_ScriptTask_157">
-        <di:waypoint x="1504" y="959" />
-        <di:waypoint x="1504" y="981" />
-        <di:waypoint x="1504" y="981" />
-        <di:waypoint x="1504" y="1009" />
+        <di:waypoint x="1644" y="1099" />
+        <di:waypoint x="1644" y="1121" />
+        <di:waypoint x="1644" y="1121" />
+        <di:waypoint x="1644" y="1149" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1519" y="981" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1n61wit_di" bpmnElement="SequenceFlow_1n61wit">
-        <di:waypoint x="433" y="195" />
-        <di:waypoint x="492" y="195" />
-        <di:waypoint x="492" y="195" />
-        <di:waypoint x="546" y="195" />
+        <di:waypoint x="573" y="335" />
+        <di:waypoint x="632" y="335" />
+        <di:waypoint x="632" y="335" />
+        <di:waypoint x="686" y="335" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="507" y="195" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1jay2gg_di" bpmnElement="ScriptTask_preprocess">
-        <dc:Bounds x="546" y="155" width="100" height="80" />
+        <dc:Bounds x="686" y="295" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ftylq3_di" bpmnElement="SequenceFlow_0ftylq3">
-        <di:waypoint x="646" y="195" />
-        <di:waypoint x="706" y="195" />
-        <di:waypoint x="706" y="195" />
-        <di:waypoint x="759" y="195" />
+        <di:waypoint x="786" y="335" />
+        <di:waypoint x="846" y="335" />
+        <di:waypoint x="846" y="335" />
+        <di:waypoint x="899" y="335" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="676" y="195" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0lw40k5_di" bpmnElement="isNameSent_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="951" y="291" width="50" height="50" />
+        <dc:Bounds x="1091" y="431" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="933" y="349" width="85" height="26" />
+          <dc:Bounds x="1074" y="489" width="84" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0635hhm_di" bpmnElement="isNameSentYes_SequenceFlow">
-        <di:waypoint x="976" y="291" />
-        <di:waypoint x="976" y="170" />
-        <di:waypoint x="976" y="170" />
-        <di:waypoint x="976" y="49" />
+        <di:waypoint x="1116" y="431" />
+        <di:waypoint x="1116" y="310" />
+        <di:waypoint x="1116" y="310" />
+        <di:waypoint x="1116" y="189" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="988" y="275" width="18" height="13" />
+          <dc:Bounds x="1128" y="415" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1sirjgc_di" bpmnElement="isNameSentNo_SequenceFlow">
-        <di:waypoint x="1001" y="316" />
-        <di:waypoint x="1199" y="316" />
+        <di:waypoint x="1141" y="456" />
+        <di:waypoint x="1339" y="456" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1005" y="328" width="14" height="13" />
+          <dc:Bounds x="1145" y="468" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1uxa4p9_di" bpmnElement="Task_1ipbwbj">
-        <dc:Bounds x="1014" y="1538" width="100" height="80" />
+        <dc:Bounds x="1154" y="1678" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0m5hrmn_di" bpmnElement="Task_1rd6dg6">
-        <dc:Bounds x="1183" y="1538" width="100" height="80" />
+        <dc:Bounds x="1323" y="1678" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0n0ptg6_di" bpmnElement="ExclusiveGateway_0n0ptg6" isMarkerVisible="true">
-        <dc:Bounds x="724" y="1553" width="50" height="50" />
+        <dc:Bounds x="864" y="1693" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="644" y="1566" width="68" height="24" />
+          <dc:Bounds x="784" y="1706" width="69" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_13deudk_di" bpmnElement="SequenceFlow_13deudk">
-        <di:waypoint x="1183" y="1578" />
-        <di:waypoint x="1114" y="1578" />
+        <di:waypoint x="1323" y="1718" />
+        <di:waypoint x="1254" y="1718" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1149" y="1563" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_08qibb9_di" bpmnElement="SequenceFlow_08qibb9">
-        <di:waypoint x="1014" y="1578" />
-        <di:waypoint x="953" y="1578" />
+        <di:waypoint x="1154" y="1718" />
+        <di:waypoint x="1093" y="1718" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="984" y="1563" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1t03rs2_di" bpmnElement="SequenceFlow_1t03rs2">
-        <di:waypoint x="853" y="1578" />
-        <di:waypoint x="774" y="1578" />
+        <di:waypoint x="993" y="1718" />
+        <di:waypoint x="914" y="1718" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="814" y="1563" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1jia57e_di" bpmnElement="SequenceFlow_1jia57e">
-        <di:waypoint x="749" y="1553" />
-        <di:waypoint x="749" y="1484" />
+        <di:waypoint x="889" y="1693" />
+        <di:waypoint x="889" y="1624" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="757" y="1537.7047949008065" width="18" height="12" />
+          <dc:Bounds x="897" y="1678" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_18ybfu5_di" bpmnElement="SequenceFlow_18ybfu5">
-        <di:waypoint x="749" y="1603" />
-        <di:waypoint x="749" y="1669" />
+        <di:waypoint x="889" y="1743" />
+        <di:waypoint x="889" y="1809" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="758" y="1603.7606668519034" width="14" height="12" />
+          <dc:Bounds x="898" y="1744" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1v458g5_di" bpmnElement="validateSDNCActivate_Task">
-        <dc:Bounds x="853" y="1538" width="100" height="80" />
+        <dc:Bounds x="993" y="1678" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BoundaryEvent_0pg57au_di" bpmnElement="BoundaryEvent_0vb26bm">
-        <dc:Bounds x="859" y="1600" width="36" height="36" />
+        <dc:Bounds x="999" y="1740" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="877" y="1636" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0s51ns0_di" bpmnElement="SequenceFlow_0s51ns0">
-        <di:waypoint x="877" y="1636" />
-        <di:waypoint x="877" y="1687" />
-        <di:waypoint x="767" y="1687" />
+        <di:waypoint x="1017" y="1776" />
+        <di:waypoint x="1017" y="1827" />
+        <di:waypoint x="907" y="1827" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="892" y="1661.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0h7h49p_di" bpmnElement="EndEvent_13v46cq">
-        <dc:Bounds x="731" y="1669" width="36" height="36" />
+        <dc:Bounds x="871" y="1809" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="711" y="1715" width="76" height="24" />
+          <dc:Bounds x="852" y="1855" width="74" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0f9d94i_di" bpmnElement="isSDNCActivate_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="304" y="953" width="50" height="50" />
+        <dc:Bounds x="444" y="1093" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="210" y="966" width="84" height="24" />
+          <dc:Bounds x="350" y="1106" width="85" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0cly7z2_di" bpmnElement="SequenceFlow_0cly7z2">
-        <di:waypoint x="329" y="953" />
-        <di:waypoint x="329" y="910" />
+        <di:waypoint x="469" y="1093" />
+        <di:waypoint x="469" y="1050" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="335" y="937" width="18" height="12" />
+          <dc:Bounds x="475" y="1077" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_12tlymf_di" bpmnElement="SequenceFlow_12tlymf">
-        <di:waypoint x="354" y="978" />
-        <di:waypoint x="457" y="978" />
-        <di:waypoint x="457" y="895" />
+        <di:waypoint x="494" y="1118" />
+        <di:waypoint x="597" y="1118" />
+        <di:waypoint x="597" y="1035" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="350" y="988" width="14" height="12" />
+          <dc:Bounds x="490" y="1128" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1ts3ph0_di" bpmnElement="isSdncRpc1_ExclusiveGateway1" isMarkerVisible="true">
-        <dc:Bounds x="1337.228" y="291" width="50" height="50" />
+        <dc:Bounds x="1477" y="431" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1401" y="304" width="61" height="24" />
+          <dc:Bounds x="1542" y="444" width="60" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1r5sja0_di" bpmnElement="isSdncRpc1No_SequenceFlow1">
-        <di:waypoint x="1362" y="291" />
-        <di:waypoint x="1362" y="195" />
-        <di:waypoint x="1590" y="195" />
+        <di:waypoint x="1502" y="431" />
+        <di:waypoint x="1502" y="335" />
+        <di:waypoint x="1730" y="335" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1371" y="273" width="14" height="12" />
+          <dc:Bounds x="1511" y="413" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ow57qy_di" bpmnElement="isSdncRpc1Yes_SequenceFlow1">
-        <di:waypoint x="1362" y="341" />
-        <di:waypoint x="1362" y="395" />
+        <di:waypoint x="1502" y="481" />
+        <di:waypoint x="1502" y="535" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1373" y="341" width="18" height="12" />
+          <dc:Bounds x="1513" y="481" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_067czgj_di" bpmnElement="Task_0pbtywn">
-        <dc:Bounds x="1454" y="395" width="100" height="80" />
+        <dc:Bounds x="1594" y="535" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0j8bxnb_di" bpmnElement="SequenceFlow_0j8bxnb">
-        <di:waypoint x="1412" y="435" />
-        <di:waypoint x="1454" y="435" />
+        <di:waypoint x="1552" y="575" />
+        <di:waypoint x="1594" y="575" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1433" y="420" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0d93bqw_di" bpmnElement="SequenceFlow_0d93bqw">
-        <di:waypoint x="1554" y="435" />
-        <di:waypoint x="1590" y="435" />
+        <di:waypoint x="1694" y="575" />
+        <di:waypoint x="1730" y="575" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1572" y="420" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_00dh41t_di" bpmnElement="isSdncRpc4_ExclusiveGateway4" isMarkerVisible="true">
-        <dc:Bounds x="713" y="751" width="50" height="50" />
+        <dc:Bounds x="853" y="891" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="714" y="710" width="61" height="24" />
+          <dc:Bounds x="855" y="850" width="60" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0suu90e_di" bpmnElement="isSdncRpc4Yes_SequenceFlow4">
-        <di:waypoint x="738" y="801" />
-        <di:waypoint x="738" y="830" />
+        <di:waypoint x="878" y="941" />
+        <di:waypoint x="878" y="970" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="743" y="800" width="18" height="12" />
+          <dc:Bounds x="883" y="940" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0xnyl6e_di" bpmnElement="isSdncRpc4No_SequenceFlow4">
-        <di:waypoint x="763" y="776" />
-        <di:waypoint x="936" y="776" />
-        <di:waypoint x="936" y="830" />
+        <di:waypoint x="903" y="916" />
+        <di:waypoint x="1076" y="916" />
+        <di:waypoint x="1076" y="970" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="772" y="755" width="14" height="12" />
+          <dc:Bounds x="912" y="895" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1gghe34_di" bpmnElement="isSdncRpc2_ExclusiveGateway2" isMarkerVisible="true">
-        <dc:Bounds x="1360" y="1553" width="50" height="50" />
+        <dc:Bounds x="1500" y="1693" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1343" y="1619" width="83" height="36" />
+          <dc:Bounds x="1484" y="1759" width="82" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1lphs99_di" bpmnElement="isSdncRpc2Yes_SequenceFlow2">
-        <di:waypoint x="1360" y="1578" />
-        <di:waypoint x="1283" y="1578" />
+        <di:waypoint x="1500" y="1718" />
+        <di:waypoint x="1423" y="1718" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1337" y="1580.0388981849903" width="18" height="12" />
+          <dc:Bounds x="1477" y="1720" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0lk1uut_di" bpmnElement="isSdncRpc2No_SequenceFlow2">
-        <di:waypoint x="1385" y="1553" />
-        <di:waypoint x="1385" y="1444" />
-        <di:waypoint x="799" y="1444" />
+        <di:waypoint x="1525" y="1693" />
+        <di:waypoint x="1525" y="1584" />
+        <di:waypoint x="939" y="1584" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1362" y="1543.660178848007" width="14" height="12" />
+          <dc:Bounds x="1502" y="1684" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1lkq0a3_di" bpmnElement="Task_10lubzj">
-        <dc:Bounds x="1312" y="395" width="100" height="80" />
+        <dc:Bounds x="1452" y="535" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_19o9l99_di" bpmnElement="Task_0q6pzpn">
-        <dc:Bounds x="688" y="830" width="100" height="80" />
+        <dc:Bounds x="828" y="970" 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" />
+        <dc:Bounds x="607" y="1566" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="486" y="1462" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1kpt4kc_di" bpmnElement="EndEvent_1kpt4kc">
-        <dc:Bounds x="1160" y="1075" width="36" height="36" />
+        <dc:Bounds x="1372" y="1215" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1179" y="1111" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0ti2ctu_di" bpmnElement="EndEvent_0ti2ctu">
-        <dc:Bounds x="1486" y="-9" width="36" height="36" />
+        <dc:Bounds x="1626" y="131" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1468" y="38" width="72" height="12" />
+          <dc:Bounds x="1608" y="178" width="73" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1s8b1m1_di" bpmnElement="SequenceFlow_1s8b1m1">
-        <di:waypoint x="699" y="1444" />
-        <di:waypoint x="597" y="1444" />
-        <di:waypoint x="597" y="1444" />
-        <di:waypoint x="503" y="1444" />
+        <di:waypoint x="839" y="1584" />
+        <di:waypoint x="737" y="1584" />
+        <di:waypoint x="737" y="1584" />
+        <di:waypoint x="643" y="1584" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="612" y="1444" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1feo4ms_di" bpmnElement="Task_0zzobg6">
-        <dc:Bounds x="699" y="1404" width="100" height="80" />
+        <dc:Bounds x="839" y="1544" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0myjg9k_di" bpmnElement="ScriptTask_0myjg9k">
-        <dc:Bounds x="688" y="1053" width="100" height="80" />
+        <dc:Bounds x="960" y="1193" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0b8j5rw_di" bpmnElement="SequenceFlow_0b8j5rw">
-        <di:waypoint x="379" y="870" />
-        <di:waypoint x="432" y="870" />
+        <di:waypoint x="519" y="1010" />
+        <di:waypoint x="572" y="1010" />
         <bpmndi:BPMNLabel>
           <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="279" y="830" width="100" height="80" />
+        <dc:Bounds x="419" y="970" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ipz2ze_di" bpmnElement="SequenceFlow_1ipz2ze">
-        <di:waypoint x="1454" y="1578" />
-        <di:waypoint x="1432" y="1578" />
-        <di:waypoint x="1432" y="1578" />
-        <di:waypoint x="1410" y="1578" />
+        <di:waypoint x="1594" y="1718" />
+        <di:waypoint x="1572" y="1718" />
+        <di:waypoint x="1572" y="1718" />
+        <di:waypoint x="1550" y="1718" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1447" y="1578" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1u07hp7_di" bpmnElement="CallActivity_1u07hp7">
-        <dc:Bounds x="841" y="1053" width="100" height="80" />
+        <dc:Bounds x="1090" y="1193" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0vzsyrd_di" bpmnElement="SequenceFlow_0vzsyrd">
-        <di:waypoint x="941" y="1093" />
-        <di:waypoint x="1007" y="1093" />
+        <di:waypoint x="1190" y="1233" />
+        <di:waypoint x="1220" y="1233" />
         <bpmndi:BPMNLabel>
           <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 x="738" y="910" />
-        <di:waypoint x="738" y="953" />
+        <di:waypoint x="878" y="1050" />
+        <di:waypoint x="878" y="1093" />
         <bpmndi:BPMNLabel>
           <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 x="936" y="909" />
-        <di:waypoint x="936" y="978" />
-        <di:waypoint x="763" y="978" />
+        <di:waypoint x="1076" y="1049" />
+        <di:waypoint x="1076" y="1118" />
+        <di:waypoint x="903" y="1118" />
         <bpmndi:BPMNLabel>
           <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 x="788" y="1093" />
-        <di:waypoint x="841" y="1093" />
+        <di:waypoint x="1060" y="1233" />
+        <di:waypoint x="1090" y="1233" />
         <bpmndi:BPMNLabel>
           <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="1036" y="901" width="252" height="119" />
+        <dc:Bounds x="1176" y="1041" width="252" height="119" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Association_0nketgd_di" bpmnElement="Association_0nketgd">
-        <di:waypoint x="941" y="1069" />
-        <di:waypoint x="1041" y="1020" />
+        <di:waypoint x="1187" y="1196" />
+        <di:waypoint x="1230" y="1160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0w2ekuz_di" bpmnElement="ScriptTask_0w2ekuz">
-        <dc:Bounds x="1007" y="1053" width="100" height="80" />
+        <dc:Bounds x="1220" y="1193" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1qwubew_di" bpmnElement="SequenceFlow_1qwubew">
-        <di:waypoint x="1107" y="1093" />
-        <di:waypoint x="1160" y="1093" />
+        <di:waypoint x="1320" y="1233" />
+        <di:waypoint x="1372" y="1233" />
         <bpmndi:BPMNLabel>
           <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="304" y="1159" width="50" height="50" />
+        <dc:Bounds x="444" y="1299" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="290" y="1209" width="78" height="12" />
+          <dc:Bounds x="430" y="1349" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_19kcbiw_di" bpmnElement="isRollbackOn_SequenceFlow_Yes">
-        <di:waypoint x="329" y="1159" />
-        <di:waypoint x="329" y="1110" />
+        <di:waypoint x="469" y="1299" />
+        <di:waypoint x="469" y="1250" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="337" y="1142" width="18" height="12" />
+          <dc:Bounds x="477" y="1282" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0pl3e54_di" bpmnElement="isRollbackOn_SequenceFlow_No">
-        <di:waypoint x="354" y="1184" />
-        <di:waypoint x="432" y="1184" />
+        <di:waypoint x="494" y="1324" />
+        <di:waypoint x="572" y="1324" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="355" y="1190" width="14" height="12" />
+          <dc:Bounds x="495" y="1330" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_0zl5xa8_di" bpmnElement="ExclusiveGateway_1qb2vwe">
-        <dc:Bounds x="713" y="953" width="50" height="50" />
+        <dc:Bounds x="853" y="1093" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <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 x="738" y="1003" />
-        <di:waypoint x="738" y="1053" />
+        <di:waypoint x="878" y="1143" />
+        <di:waypoint x="878" y="1193" />
         <bpmndi:BPMNLabel>
           <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="432" y="845" width="50" height="50" />
+        <dc:Bounds x="572" y="985" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <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 x="482" y="870" />
-        <di:waypoint x="527" y="870" />
+        <di:waypoint x="622" y="1010" />
+        <di:waypoint x="667" y="1010" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="505" y="845" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0p3v749_di" bpmnElement="ScriptTask_0p3v749">
-        <dc:Bounds x="1335" y="-31" width="100" height="80" />
+        <dc:Bounds x="1475" y="109" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_18ylufb_di" bpmnElement="SequenceFlow_18ylufb">
-        <di:waypoint x="1435" y="9" />
-        <di:waypoint x="1486" y="9" />
+        <di:waypoint x="1575" y="149" />
+        <di:waypoint x="1626" y="149" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1461" y="-6" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_1eochiz_di" bpmnElement="ExclusiveGateway_1umhuft">
-        <dc:Bounds x="432" y="1159" width="50" height="50" />
+        <dc:Bounds x="572" y="1299" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <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 x="482" y="1184" />
-        <di:waypoint x="1057" y="1184" />
-        <di:waypoint x="1057" y="1133" />
+        <di:waypoint x="622" y="1324" />
+        <di:waypoint x="1270" y="1324" />
+        <di:waypoint x="1270" y="1273" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="770" y="1169" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="TextAnnotation_1orb6o6_di" bpmnElement="TextAnnotation_1orb6o6">
-        <dc:Bounds x="1606" y="1241" width="233" height="37" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_0c315jr_di" bpmnElement="Association_0c315jr">
-        <di:waypoint x="1557" y="1289" />
-        <di:waypoint x="1621" y="1278" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="TextAnnotation_0wjpv6r_di" bpmnElement="TextAnnotation_0wjpv6r">
-        <dc:Bounds x="341" y="735" width="180" height="36" />
+        <dc:Bounds x="481" y="875" width="180" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Association_0eolbkz_di" bpmnElement="Association_0eolbkz">
-        <di:waypoint x="452" y="850" />
-        <di:waypoint x="435" y="771" />
+        <di:waypoint x="592" y="990" />
+        <di:waypoint x="575" y="911" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0j3058g_di" bpmnElement="ScriptTask_0j3058g">
-        <dc:Bounds x="170" y="1144" width="100" height="80" />
+        <dc:Bounds x="310" y="1284" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_10ttvwn_di" bpmnElement="SequenceFlow_10ttvwn">
-        <di:waypoint x="270" y="1184" />
-        <di:waypoint x="304" y="1184" />
+        <di:waypoint x="410" y="1324" />
+        <di:waypoint x="444" y="1324" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="287" y="1159" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0z2n0hl_di" bpmnElement="callGetServiceInstance">
-        <dc:Bounds x="759" y="155" width="100" height="80" />
+        <dc:Bounds x="899" y="295" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_18agmdb_di" bpmnElement="Activity_1yoiuwp">
+        <dc:Bounds x="1594" y="1275" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_15l1pk2_di" bpmnElement="Flow_15l1pk2">
+        <di:waypoint x="928" y="1233" />
+        <di:waypoint x="960" y="1233" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn
index 6a4861b9a4..5103fa9d0a 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
   <bpmn:process id="DoCreateNetworkInstanceRollback" name="DoCreateNetworkInstanceRollback" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_1krl2dg</bpmn:outgoing>
@@ -7,9 +7,9 @@
     <bpmn:scriptTask id="Task_0whino1" name="PreProcess Incoming Data" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1krl2dg</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0u41iz2</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.preProcessRequest(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_1krl2dg" sourceRef="StartEvent_1" targetRef="Task_0whino1" />
     <bpmn:sequenceFlow id="SequenceFlow_0u41iz2" sourceRef="Task_0whino1" targetRef="ExclusiveGateway_0p5zgdb" />
@@ -72,9 +72,9 @@ DoCreateNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
       <bpmn:incoming>SequenceFlow_0qc4v9t</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_0el8yzs</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0yto4gz</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:exclusiveGateway id="ExclusiveGateway_1n5jck8" name="is SDNC Rollback?" default="SequenceFlow_0qc4v9t">
       <bpmn:incoming>SequenceFlow_1lteduj</bpmn:incoming>
@@ -84,20 +84,20 @@ DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:sc
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="SequenceFlow_1bb7zpp" name="No" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="ExclusiveGateway_0v0en47" />
     <bpmn:sequenceFlow id="SequenceFlow_1mxbdps" name="Yes" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="CallActivity_1x88fsq">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKIR_rollbackActivateSDNCRequest") != null}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CRENWKIR_rollbackActivateSDNCRequest") != null}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_0e1uixp" name="Yes" sourceRef="ExclusiveGateway_0v0en47" targetRef="ServiceTask_0bqh5yl">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKIR_rollbackNetworkRequest") != null}]]></bpmn:conditionExpression>
+    <bpmn:sequenceFlow id="SequenceFlow_0e1uixp" name="Yes" sourceRef="ExclusiveGateway_0v0en47" targetRef="Activity_0620gqx">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CRENWKIR_rollbackNetworkRequest") != null}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_07s5r14" sourceRef="CallActivity_1x88fsq" targetRef="ExclusiveGateway_0v0en47" />
     <bpmn:sequenceFlow id="SequenceFlow_1lteduj" name="No" sourceRef="ExclusiveGateway_0v0en47" targetRef="ExclusiveGateway_1n5jck8" />
     <bpmn:sequenceFlow id="SequenceFlow_0virkpu" name="Yes" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ExclusiveGateway_17g4q5c">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKIR_rollbackSDNCRequest") != null}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CRENWKIR_rollbackSDNCRequest") != null}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_17o4w67" sourceRef="ServiceTask_0bqh5yl" targetRef="ExclusiveGateway_1n5jck8" />
     <bpmn:sequenceFlow id="SequenceFlow_101y57s" name="No" sourceRef="ExclusiveGateway_17g4q5c" targetRef="CallActivity_1xilevb" />
     <bpmn:sequenceFlow id="SequenceFlow_0mw0dgd" name="Yes" sourceRef="ExclusiveGateway_17g4q5c" targetRef="CallActivity_0kbwa1x">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'} </bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:endEvent id="EndEvent_1fvr7ad">
       <bpmn:incoming>SequenceFlow_0yto4gz</bpmn:incoming>
@@ -109,9 +109,9 @@ DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:sc
       <bpmn:scriptTask id="ScriptTask_0by1uwk" name="Log / Print Unexpected Error" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_0xktw7v</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_0soe5t3</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.processJavaException(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:startEvent id="StartEvent_1j0eixl">
         <bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
@@ -137,9 +137,9 @@ DoCreateNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
       <bpmn:scriptTask id="Task_07i164j" name="Catch Exception" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_0q0te67</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_0lomcvn</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 execution.setVariable("workflowException", execution.getVariable("WorkflowException")
-]]></bpmn:script>
+</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:sequenceFlow id="SequenceFlow_0q0te67" sourceRef="StartEvent_1p75ok8" targetRef="Task_07i164j" />
       <bpmn:sequenceFlow id="SequenceFlow_0lomcvn" sourceRef="Task_07i164j" targetRef="EndEvent_1aqh7ih" />
@@ -172,29 +172,41 @@ execution.setVariable("workflowException", execution.getVariable("WorkflowExcept
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="SequenceFlow_1j55a94" sourceRef="BoundaryEvent_1yj6513" targetRef="EndEvent_05tcxw3" />
     <bpmn:sequenceFlow id="SequenceFlow_1yn24xq" sourceRef="BoundaryEvent_1y8kgef" targetRef="EndEvent_05tcxw3" />
-    <bpmn:scriptTask id="ServiceTask_0bqh5yl" name="Call Rollback Network" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_0e1uixp</bpmn:incoming>
+    <bpmn:scriptTask id="ServiceTask_0bqh5yl" name="Set Response" scriptFormat="groovy">
+      <bpmn:incoming>Flow_0t2n952</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_17o4w67</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.callPONetworkAdapter(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.setNetworkAdapterResponseCode(execution)</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:textAnnotation id="TextAnnotation_000ap15">    <bpmn:text><![CDATA[Include ONLY inputs/varrables:  
+    <bpmn:callActivity id="Activity_0620gqx" name="openstack Adapter" calledElement="openstackAdapterTask">
+      <bpmn:extensionElements>
+        <camunda:in source="CRENWKIR_rollbackNetworkRequest" target="openstackAdapterTaskRequest" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="WorkflowResponse" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_0e1uixp</bpmn:incoming>
+      <bpmn:outgoing>Flow_0t2n952</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:sequenceFlow id="Flow_0t2n952" sourceRef="Activity_0620gqx" targetRef="ServiceTask_0bqh5yl" />
+    <bpmn:textAnnotation id="TextAnnotation_000ap15">
+      <bpmn:text>Include ONLY inputs/varrables:  
 rollbackData, as Map
 -rollbackSDNCRequest
 -rollbackActivateSDNCRequest
 -rollbackNetworkRequest
 WorkflowException
  
-]]></bpmn:text>
-</bpmn:textAnnotation>
+</bpmn:text>
+    </bpmn:textAnnotation>
     <bpmn:association id="Association_0ybkmal" sourceRef="Task_0whino1" targetRef="TextAnnotation_000ap15" />
-    <bpmn:textAnnotation id="TextAnnotation_0vwyo82">    <bpmn:text><![CDATA[set value for:
+    <bpmn:textAnnotation id="TextAnnotation_0vwyo82">
+      <bpmn:text>set value for:
 WorkflowException
 rolledBack
 wasDeleted
-]]></bpmn:text>
-</bpmn:textAnnotation>
+</bpmn:text>
+    </bpmn:textAnnotation>
     <bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" />
   </bpmn:process>
   <bpmn:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
@@ -202,316 +214,321 @@ wasDeleted
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateNetworkInstanceRollback">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="214" y="240" width="36" height="36" />
+        <dc:Bounds x="374" y="100" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="232" y="276" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1dqe09s_di" bpmnElement="Task_0whino1">
-        <dc:Bounds x="333" y="218" width="100" height="80" />
+        <dc:Bounds x="493" y="78" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1krl2dg_di" bpmnElement="SequenceFlow_1krl2dg">
-        <di:waypoint xsi:type="dc:Point" x="250" y="258" />
-        <di:waypoint xsi:type="dc:Point" x="333" y="258" />
+        <di:waypoint x="410" y="118" />
+        <di:waypoint x="493" y="118" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="292" y="243" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0u41iz2_di" bpmnElement="SequenceFlow_0u41iz2">
-        <di:waypoint xsi:type="dc:Point" x="433" y="258" />
-        <di:waypoint xsi:type="dc:Point" x="556" y="258" />
-        <di:waypoint xsi:type="dc:Point" x="556" y="347" />
+        <di:waypoint x="593" y="118" />
+        <di:waypoint x="716" y="118" />
+        <di:waypoint x="716" y="207" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="495" y="243" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1x88fsq_di" bpmnElement="CallActivity_1x88fsq">
-        <dc:Bounds x="506" y="481" width="100" height="80" />
+        <dc:Bounds x="666" y="341" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0kbwa1x_di" bpmnElement="CallActivity_0kbwa1x">
-        <dc:Bounds x="972" y="481" width="100" height="80" />
+        <dc:Bounds x="1132" y="341" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0p5zgdb_di" bpmnElement="ExclusiveGateway_0p5zgdb" isMarkerVisible="true">
-        <dc:Bounds x="531" y="347" width="50" height="50" />
+        <dc:Bounds x="691" y="207" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="439" y="360" width="79" height="24" />
+          <dc:Bounds x="600" y="220" width="77" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0v0en47_di" bpmnElement="ExclusiveGateway_0v0en47" isMarkerVisible="true">
-        <dc:Bounds x="697" y="347" width="50" height="50" />
+        <dc:Bounds x="857" y="207" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="685" y="312" width="74" height="24" />
+          <dc:Bounds x="847" y="172" width="71" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_000ap15_di" bpmnElement="TextAnnotation_000ap15">
-        <dc:Bounds x="112" y="355" width="277" height="115" />
+        <dc:Bounds x="272" y="215" width="277" height="115" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Association_0ybkmal_di" bpmnElement="Association_0ybkmal">
-        <di:waypoint xsi:type="dc:Point" x="349" y="298" />
-        <di:waypoint xsi:type="dc:Point" x="300" y="355" />
+        <di:waypoint x="509" y="158" />
+        <di:waypoint x="460" y="215" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1xilevb_di" bpmnElement="CallActivity_1xilevb">
-        <dc:Bounds x="972" y="608" width="100" height="80" />
+        <dc:Bounds x="1132" y="468" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_17g4q5c_di" bpmnElement="ExclusiveGateway_17g4q5c" isMarkerVisible="true">
-        <dc:Bounds x="879" y="496" width="50" height="50" />
+        <dc:Bounds x="1039" y="356" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="914" y="460" width="82" height="12" />
+          <dc:Bounds x="1074" y="320" width="83" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1ggaxfu_di" bpmnElement="ScriptTask_1ggaxfu">
-        <dc:Bounds x="1123" y="332" width="100" height="80" />
+        <dc:Bounds x="1283" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1n5jck8_di" bpmnElement="ExclusiveGateway_1n5jck8" isMarkerVisible="true">
-        <dc:Bounds x="879" y="347" width="50" height="50" />
+        <dc:Bounds x="1039" y="207" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="880" y="308" width="48" height="24" />
+          <dc:Bounds x="1040" y="168" width="49" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_0vwyo82_di" bpmnElement="TextAnnotation_0vwyo82">
-        <dc:Bounds x="1287" y="410" width="165" height="60" />
+        <dc:Bounds x="1447" y="270" width="165" height="60" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Association_1gx121b_di" bpmnElement="Association_1gx121b">
-        <di:waypoint xsi:type="dc:Point" x="1223" y="389" />
-        <di:waypoint xsi:type="dc:Point" x="1287" y="412" />
+        <di:waypoint x="1383" y="249" />
+        <di:waypoint x="1447" y="272" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1bb7zpp_di" bpmnElement="SequenceFlow_1bb7zpp">
-        <di:waypoint xsi:type="dc:Point" x="581" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="697" y="372" />
+        <di:waypoint x="741" y="232" />
+        <di:waypoint x="857" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="582" y="349.27450980392155" width="14" height="12" />
+          <dc:Bounds x="742" y="209" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1mxbdps_di" bpmnElement="SequenceFlow_1mxbdps">
-        <di:waypoint xsi:type="dc:Point" x="556" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="556" y="481" />
+        <di:waypoint x="716" y="257" />
+        <di:waypoint x="716" y="341" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="560" y="397.10731155015196" width="18" height="12" />
+          <dc:Bounds x="720" y="257" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0e1uixp_di" bpmnElement="SequenceFlow_0e1uixp">
-        <di:waypoint xsi:type="dc:Point" x="722" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="722" y="439" />
-        <di:waypoint xsi:type="dc:Point" x="722" y="439" />
-        <di:waypoint xsi:type="dc:Point" x="722" y="481" />
+        <di:waypoint x="882" y="257" />
+        <di:waypoint x="882" y="290" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="730" y="395" width="18" height="12" />
+          <dc:Bounds x="890" y="253" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_07s5r14_di" bpmnElement="SequenceFlow_07s5r14">
-        <di:waypoint xsi:type="dc:Point" x="606" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="647" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="647" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="697" y="372" />
+        <di:waypoint x="766" y="381" />
+        <di:waypoint x="807" y="381" />
+        <di:waypoint x="807" y="232" />
+        <di:waypoint x="857" y="232" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="662" y="446.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1lteduj_di" bpmnElement="SequenceFlow_1lteduj">
-        <di:waypoint xsi:type="dc:Point" x="747" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="879" y="372" />
+        <di:waypoint x="907" y="232" />
+        <di:waypoint x="1039" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="750" y="350.14631933618307" width="14" height="12" />
+          <dc:Bounds x="910" y="210" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0virkpu_di" bpmnElement="SequenceFlow_0virkpu">
-        <di:waypoint xsi:type="dc:Point" x="904" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="904" y="496" />
+        <di:waypoint x="1064" y="257" />
+        <di:waypoint x="1064" y="356" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="914" y="392.7469456247061" width="18" height="12" />
+          <dc:Bounds x="1074" y="253" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17o4w67_di" bpmnElement="SequenceFlow_17o4w67">
-        <di:waypoint xsi:type="dc:Point" x="772" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="817" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="817" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="879" y="372" />
+        <di:waypoint x="932" y="451" />
+        <di:waypoint x="977" y="451" />
+        <di:waypoint x="977" y="232" />
+        <di:waypoint x="1039" y="232" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="832" y="446.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_101y57s_di" bpmnElement="SequenceFlow_101y57s">
-        <di:waypoint xsi:type="dc:Point" x="904" y="546" />
-        <di:waypoint xsi:type="dc:Point" x="904" y="648" />
-        <di:waypoint xsi:type="dc:Point" x="972" y="648" />
+        <di:waypoint x="1064" y="406" />
+        <di:waypoint x="1064" y="508" />
+        <di:waypoint x="1132" y="508" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="913" y="544" width="14" height="12" />
+          <dc:Bounds x="1073" y="404" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0mw0dgd_di" bpmnElement="SequenceFlow_0mw0dgd">
-        <di:waypoint xsi:type="dc:Point" x="929" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="972" y="521" />
+        <di:waypoint x="1089" y="381" />
+        <di:waypoint x="1132" y="381" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="930" y="498" width="18" height="12" />
+          <dc:Bounds x="1090" y="358" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_1fvr7ad_di" bpmnElement="EndEvent_1fvr7ad">
-        <dc:Bounds x="1278" y="255" width="36" height="36" />
+        <dc:Bounds x="1438" y="115" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1296" y="291" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qc4v9t_di" bpmnElement="SequenceFlow_0qc4v9t">
-        <di:waypoint xsi:type="dc:Point" x="929" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="1123" y="372" />
+        <di:waypoint x="1089" y="232" />
+        <di:waypoint x="1283" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="941" y="351.1191898360114" width="14" height="12" />
+          <dc:Bounds x="1101" y="211" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0790olb_di" bpmnElement="SequenceFlow_0790olb">
-        <di:waypoint xsi:type="dc:Point" x="1072" y="648" />
-        <di:waypoint xsi:type="dc:Point" x="1173" y="648" />
-        <di:waypoint xsi:type="dc:Point" x="1173" y="546" />
+        <di:waypoint x="1232" y="508" />
+        <di:waypoint x="1333" y="508" />
+        <di:waypoint x="1333" y="406" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1123" y="633" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1rrutp3_di" bpmnElement="SequenceFlow_1rrutp3">
-        <di:waypoint xsi:type="dc:Point" x="1072" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="1148" y="521" />
+        <di:waypoint x="1232" y="381" />
+        <di:waypoint x="1308" y="381" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1110" y="506" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
-        <dc:Bounds x="-6" y="665" width="394" height="188" />
+        <dc:Bounds x="154" y="525" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
-        <dc:Bounds x="142" y="720" width="100" height="80" />
+        <dc:Bounds x="302" y="580" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
-        <dc:Bounds x="27" y="742" width="36" height="36" />
+        <dc:Bounds x="187" y="602" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="45" y="783" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
-        <dc:Bounds x="303" y="742" width="36" height="36" />
+        <dc:Bounds x="463" y="602" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="321" y="783" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
-        <di:waypoint xsi:type="dc:Point" x="63" y="760" />
-        <di:waypoint xsi:type="dc:Point" x="142" y="760" />
+        <di:waypoint x="223" y="620" />
+        <di:waypoint x="302" y="620" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="105" y="760" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
-        <di:waypoint xsi:type="dc:Point" x="242" y="760" />
-        <di:waypoint xsi:type="dc:Point" x="303" y="760" />
+        <di:waypoint x="402" y="620" />
+        <di:waypoint x="463" y="620" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="277" y="760" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_0dot6c9_di" bpmnElement="ExclusiveGateway_0b9kbop">
-        <dc:Bounds x="1148" y="496" width="50" height="50" />
+        <dc:Bounds x="1308" y="356" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1173" y="546" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0el8yzs_di" bpmnElement="SequenceFlow_0el8yzs">
-        <di:waypoint xsi:type="dc:Point" x="1173" y="496" />
-        <di:waypoint xsi:type="dc:Point" x="1173" y="412" />
+        <di:waypoint x="1333" y="356" />
+        <di:waypoint x="1333" y="272" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1188" y="444" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yto4gz_di" bpmnElement="SequenceFlow_0yto4gz">
-        <di:waypoint xsi:type="dc:Point" x="1173" y="332" />
-        <di:waypoint xsi:type="dc:Point" x="1173" y="273" />
-        <di:waypoint xsi:type="dc:Point" x="1278" y="273" />
+        <di:waypoint x="1333" y="192" />
+        <di:waypoint x="1333" y="133" />
+        <di:waypoint x="1438" y="133" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1188" y="302.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_1laq87i_di" bpmnElement="SubProcess_0y6ppiy" isExpanded="true">
-        <dc:Bounds x="2" y="886" width="382" height="213" />
+        <dc:Bounds x="162" y="746" width="382" height="213" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1aqh7ih_di" bpmnElement="EndEvent_1aqh7ih">
-        <dc:Bounds x="305" y="964" width="36" height="36" />
+        <dc:Bounds x="465" y="824" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="323" y="1000" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0gg2fk5_di" bpmnElement="Task_07i164j">
-        <dc:Bounds x="132" y="942" width="100" height="80" />
+        <dc:Bounds x="292" y="802" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0q0te67_di" bpmnElement="SequenceFlow_0q0te67">
-        <di:waypoint xsi:type="dc:Point" x="68" y="982" />
-        <di:waypoint xsi:type="dc:Point" x="132" y="982" />
+        <di:waypoint x="228" y="842" />
+        <di:waypoint x="292" y="842" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="100" y="967" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0lomcvn_di" bpmnElement="SequenceFlow_0lomcvn">
-        <di:waypoint xsi:type="dc:Point" x="232" y="982" />
-        <di:waypoint xsi:type="dc:Point" x="305" y="982" />
+        <di:waypoint x="392" y="842" />
+        <di:waypoint x="465" y="842" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="269" y="957" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BoundaryEvent_0i4ili6_di" bpmnElement="BoundaryEvent_0dnnott">
-        <dc:Bounds x="588" y="543" width="36" height="36" />
+        <dc:Bounds x="748" y="403" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="606" y="579" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ctlrql_di" bpmnElement="SequenceFlow_0ctlrql">
-        <di:waypoint xsi:type="dc:Point" x="612" y="577" />
-        <di:waypoint xsi:type="dc:Point" x="631" y="622" />
+        <di:waypoint x="772" y="437" />
+        <di:waypoint x="791" y="482" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="622" y="584.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_1ra7y1s_di" bpmnElement="EndEvent_0n9y395">
-        <dc:Bounds x="621" y="620" width="36" height="36" />
+        <dc:Bounds x="781" y="480" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="639" y="656" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_0a7qaw9_di" bpmnElement="StartEvent_1p75ok8">
-        <dc:Bounds x="32" y="964" width="36" height="36" />
+        <dc:Bounds x="192" y="824" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="50" y="1000" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BoundaryEvent_13arr8o_di" bpmnElement="BoundaryEvent_1yj6513">
-        <dc:Bounds x="1054" y="543" width="36" height="36" />
+        <dc:Bounds x="1214" y="403" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1072" y="579" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BoundaryEvent_0qs2m90_di" bpmnElement="BoundaryEvent_1y8kgef">
-        <dc:Bounds x="1054" y="590" width="36" height="36" />
+        <dc:Bounds x="1214" y="450" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1072" y="626" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0tnenxe_di" bpmnElement="EndEvent_05tcxw3">
-        <dc:Bounds x="1116" y="573" width="36" height="36" />
+        <dc:Bounds x="1276" y="433" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1134" y="609" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1j55a94_di" bpmnElement="SequenceFlow_1j55a94">
-        <di:waypoint xsi:type="dc:Point" x="1088" y="569" />
-        <di:waypoint xsi:type="dc:Point" x="1118" y="584" />
+        <di:waypoint x="1248" y="429" />
+        <di:waypoint x="1278" y="444" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1103" y="561.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yn24xq_di" bpmnElement="SequenceFlow_1yn24xq">
-        <di:waypoint xsi:type="dc:Point" x="1088" y="599" />
-        <di:waypoint xsi:type="dc:Point" x="1116" y="591" />
+        <di:waypoint x="1248" y="459" />
+        <di:waypoint x="1276" y="451" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1102" y="580" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0c5jqhn_di" bpmnElement="ServiceTask_0bqh5yl">
-        <dc:Bounds x="672" y="481" width="100" height="80" />
+        <dc:Bounds x="832" y="411" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0txfb5e_di" bpmnElement="Activity_0620gqx">
+        <dc:Bounds x="832" y="290" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0t2n952_di" bpmnElement="Flow_0t2n952">
+        <di:waypoint x="882" y="370" />
+        <di:waypoint x="882" y="411" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file
+</bpmn:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn
index 0d1b970c62..74e0600f4f 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.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: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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateVfModule" name="DoCreateVfModule" isExecutable="true">
     <bpmn2:startEvent id="StartEvent_1" name="Start">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -37,7 +37,7 @@
       <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="IsVolumeGroupNameSpecified" targetRef="ConfirmVolumeName">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupName") != null && execution.getVariable("DCVFM_volumeGroupName") != "" }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupName") != null &amp;&amp; execution.getVariable("DCVFM_volumeGroupName") != "" }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="IsVolumeGroupNameSpecified" targetRef="ExclusiveGateway_4" />
     <bpmn2:callActivity id="ConfirmVolumeName" name="Confirm Volume Group Name" calledElement="ConfirmVolumeGroupName">
@@ -76,19 +76,19 @@
     <bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="PostProcess SDNC Assign  Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1nh92s8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 
 String response = execution.getVariable("DCVFM_assignSDNCAdapterResponse")
 
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "assign")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "assign")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCAssignRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterVDModuleTopologyAssign" />
     <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="CallSDNCAdapterVDModuleTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />
@@ -96,9 +96,9 @@ doCreateVfModule.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_0p61zug</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0aegg0r</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyGET" name="Call SDNC Adapter: VF Module Topology GET" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -118,12 +118,12 @@ doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")]]></bpmn2:scrip
     <bpmn2:scriptTask id="PostProcessSDNCGetRequest" name="PostProcess SDNC GET Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 
 String response = execution.getVariable("DCVFM_getSDNCAdapterResponse")
 
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "get")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="UpdateAAIVfModule_1" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
       <bpmn2:extensionElements>
@@ -138,16 +138,16 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
     <bpmn2:scriptTask id="PreProcessUpdateAAIVfModule_1" name="PreProcess Update AAIVfModule" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1avfxsz</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="PreProcessSDNCActivateRequest" name="PreProcess SDNC Activate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCActivateRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyActivate" name="Call SDNC Adapter: VF Module Topology Activate" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -165,12 +165,12 @@ doCreateVfModule.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PostProcessSDNCActivateRequest" name="PostProcess SDNC Activate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
       
       String response = execution.getVariable("DCVFM_activateSDNCAdapterResponse")
       
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "activate")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_5" name="Is volume_group_id specified?" default="SequenceFlow_30">
       <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
@@ -195,9 +195,9 @@ doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2
     <bpmn2:scriptTask id="PrepareCreateAAIVfModuleVolumeGroupRequest" name="Prepare CreateAAIVfModuleVolumeGroup Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]></bpmn2:script>
+doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CreateAAIVfModuleVolumeGroup" name="CreateAAIVfModuleVolumeGroup" calledElement="CreateAAIVfModuleVolumeGroup">
       <bpmn2:extensionElements>
@@ -220,13 +220,13 @@ doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]></bpmn2
     <bpmn2:scriptTask id="PreProcessVNFAdapterRequest" name="PreProcess VNF Adapter Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessVNFAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:callActivity id="CallVNFAdapterVFModuleCreate" name="Call VNF Adapter to create VF Module" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="CallVNFAdapterVFModuleCreate" name="Call VNF Adapter to create VF Module" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_createVnfARequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="DCVFM_createVnfARequest" target="openstackAdapterTaskRequest" />
         <camunda:out source="WorkflowResponse" target="DCVFM_createVnfAResponse" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -239,9 +239,9 @@ doCreateVfModule.preProcessVNFAdapterRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNF Adapter Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1ushk1d</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+doCreateVfModule.postProcessVNFAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="To UpdateAndActivate">
       <bpmn2:incoming>SequenceFlow_0xfanpi</bpmn2:incoming>
@@ -265,9 +265,9 @@ doCreateVfModule.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PostProcessCreateAAIVfModule" name="PostProcess CreateAAIVfModule" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessCreateAAIVfModule(execution)]]></bpmn2:script>
+doCreateVfModule.postProcessCreateAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="PostProcessCreateAAIVfModule" targetRef="IsBaseVfModule" />
     <bpmn2:exclusiveGateway id="IsBaseVfModule" name="Is Base VF Module?" default="SequenceFlow_36">
@@ -277,22 +277,22 @@ doCreateVfModule.postProcessCreateAAIVfModule(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_36" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule" />
     <bpmn2:sequenceFlow id="SequenceFlow_39" name="yes" sourceRef="IsBaseVfModule" targetRef="ExclusiveGateway_2">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_isBaseVfModule") == "true"</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:scriptTask id="QueryAAIVfModule" name="Query AAI Vf Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_36</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
+doCreateVfModule.queryAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_37" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_2" />
     <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
+doCreateVfModule.setSuccessIndicator(execution, true)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_1" />
     <bpmn2:endEvent id="EndEvent_1">
@@ -302,20 +302,20 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
     <bpmn2:scriptTask id="QueryCloudRegion" name="Query Cloud Region" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_40</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_43</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
+return doCreateVfModule.queryCloudRegion(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_40" name="yes" sourceRef="IsVolumeGroupIdSpecified" targetRef="QueryCloudRegion">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupId") != null &amp;&amp; execution.getVariable("DCVFM_volumeGroupId") != "" }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_43" name="" sourceRef="QueryCloudRegion" targetRef="ConfirmVolumeGroupTenant" />
     <bpmn2:scriptTask id="PreProcessRequest" name="Pre-Process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="PreProcessRequest" targetRef="ExclusiveGateway_19933zh" />
     <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1" name="To DoCreateVfModule">
@@ -352,16 +352,16 @@ doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_1ushk1d" sourceRef="PostProcessVNFAdapterRequest" targetRef="ExclusiveGateway_183x8vk" />
     <bpmn2:sequenceFlow id="SequenceFlow_0ery1pk" name="yes" sourceRef="ExclusiveGateway_183x8vk" targetRef="CreateNetworkPoliciesInAAI">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList") != null && !execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList").isEmpty()]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList") != null &amp;&amp; !execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList").isEmpty()</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_0xfanpi" name="no" sourceRef="ExclusiveGateway_183x8vk" targetRef="IntermediateThrowEvent_2" />
     <bpmn2:sequenceFlow id="SequenceFlow_0abffyj" sourceRef="CreateNetworkPoliciesInAAI" targetRef="IntermediateThrowEvent_2" />
     <bpmn2:scriptTask id="CreateNetworkPoliciesInAAI" name="Create Network Policies In AAI" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0ery1pk</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0abffyj</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>
+doCreateVfModule.createNetworkPoliciesInAAI(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_0f54imv" name="need to update VNF in AAI?" default="SequenceFlow_1k5uku2">
       <bpmn2:incoming>SequenceFlow_0363dz7</bpmn2:incoming>
@@ -374,7 +374,7 @@ doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_1avfxsz</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_0bi38s7" name="yes" sourceRef="ExclusiveGateway_0f54imv" targetRef="PreProcessUpdateAAIGenericVnf">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[!execution.getVariable("DCVFM_oamManagementV4Address").isEmpty() || !execution.getVariable("DCVFM_oamManagementV6Address").isEmpty()]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">!execution.getVariable("DCVFM_oamManagementV4Address").isEmpty() || !execution.getVariable("DCVFM_oamManagementV6Address").isEmpty()</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1qm81ym" sourceRef="PreProcessUpdateAAIGenericVnf" targetRef="UpdateAAIGenericVNFTask" />
     <bpmn2:sequenceFlow id="SequenceFlow_112los9" sourceRef="UpdateAAIGenericVNFTask" targetRef="ExclusiveGateway_1edqxlf" />
@@ -384,9 +384,9 @@ doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PreProcessUpdateAAIGenericVnf" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0bi38s7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1qm81ym</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+doCreateVfModule.prepUpdateAAIGenericVnf(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="UpdateAAIGenericVNFTask" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">
       <bpmn2:extensionElements>
@@ -401,16 +401,16 @@ doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_0zcfn2x" name="no" sourceRef="ExclusiveGateway_2" targetRef="IntermediateThrowEvent_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_0m382su" name="yes" sourceRef="ExclusiveGateway_2" targetRef="PreProcessSDNCVnfGetRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_sdncVersion" ) == '1707'}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_sdncVersion" ) == '1707'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_0g270u0" sourceRef="PreProcessSDNCVnfGetRequest" targetRef="CallSDNCAdapterVNFTopologyGET" />
     <bpmn2:sequenceFlow id="SequenceFlow_1yrlvgb" sourceRef="CallSDNCAdapterVNFTopologyGET" targetRef="PostProcessSDNCVnfGetRequest" />
     <bpmn2:scriptTask id="PreProcessSDNCVnfGetRequest" name="PreProcess SDNC VNF Topology GET Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0m382su</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0g270u0</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallSDNCAdapterVNFTopologyGET" name="Call SDNC Adapter: VNF Topology GET" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -428,12 +428,12 @@ doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')]]></bpmn2:script>
     <bpmn2:scriptTask id="PostProcessSDNCVnfGetRequest" name="PostProcess SDNC VNF Toplogy GET request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1yrlvgb</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_170kw7h</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 
 String response = execution.getVariable("DCVFM_getVnfSDNCAdapterResponse")
 
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "get")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_170kw7h" sourceRef="PostProcessSDNCVnfGetRequest" targetRef="IntermediateThrowEvent_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_1f53tby" sourceRef="Task_0kuj2a1" targetRef="IntermediateThrowEvent_1" />
@@ -445,7 +445,7 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_0270n5c" name="yes" sourceRef="ExclusiveGateway_0ffvqla" targetRef="IntermediateThrowEvent_1" />
     <bpmn2:sequenceFlow id="SequenceFlow_05og7iw" name="no" sourceRef="ExclusiveGateway_0ffvqla" targetRef="Task_0kuj2a1">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_vfModuleName") == null}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_vfModuleName") == null}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:callActivity id="Task_0kuj2a1" name="Generate VF Module Name" calledElement="GenerateVfModuleName">
       <bpmn2:extensionElements>
@@ -486,16 +486,16 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
       <bpmn2:scriptTask id="PreProcessRollback" name="Pre Process Rollback" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_04bd5in</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1i1q78e</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessRollback(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessRollback(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:scriptTask id="PostProcessRollback" name="Post Process Rollback" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_0112l2c</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0z2rczk</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessRollback(execution)]]></bpmn2:script>
+doCreateVfModule.postProcessRollback(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_02lc25j" sourceRef="StartEvent_18lzc5m" targetRef="ExclusiveGateway_039bib8" />
       <bpmn2:sequenceFlow id="SequenceFlow_0z2rczk" sourceRef="PostProcessRollback" targetRef="EndEvent_0wsdptv" />
@@ -508,14 +508,14 @@ doCreateVfModule.postProcessRollback(execution)]]></bpmn2:script>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_04bd5in" name="no" sourceRef="ExclusiveGateway_039bib8" targetRef="PreProcessRollback" />
       <bpmn2:sequenceFlow id="SequenceFlow_1nh7m8d" name="yes" sourceRef="ExclusiveGateway_039bib8" targetRef="Task_1fm09pi">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("disableRollback" )  == true}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("disableRollback" )  == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:scriptTask id="Task_1fm09pi" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_1nh7m8d</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1pgo10r</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
+doCreateVfModule.processBPMNException(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_1pgo10r" sourceRef="Task_1fm09pi" targetRef="EndEvent_0wsdptv" />
     </bpmn2:subProcess>
@@ -525,7 +525,7 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_006rnym</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="ExclusiveGateway_5" targetRef="PrepareCreateAAIVfModuleVolumeGroupRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupId") != null &amp;&amp; execution.getVariable("DCVFM_volumeGroupId") != "" }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_19933zh" name="Is aLaCarte?" default="SequenceFlow_1y1ttqe">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
@@ -540,18 +540,18 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_0lilmm3" name="no" sourceRef="ExclusiveGateway_02fd6gx" targetRef="ExclusiveGateway_0ffvqla" />
     <bpmn2:sequenceFlow id="SequenceFlow_1y8q87e" name="yes" sourceRef="ExclusiveGateway_19933zh" targetRef="Task_14n44kb">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_aLaCarte") == true]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_aLaCarte") == true</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1sf1091" sourceRef="Task_14n44kb" targetRef="ExclusiveGateway_02fd6gx" />
     <bpmn2:sequenceFlow id="SequenceFlow_17cp3tn" name="yes" sourceRef="ExclusiveGateway_0jw7ymg" targetRef="Task_0kqh1of">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_twoPhaseDesign") == true]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_twoPhaseDesign") == true</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:endEvent id="EndEvent_0pd6bbj">
       <bpmn2:incoming>SequenceFlow_00bh7m7</bpmn2:incoming>
       <bpmn2:terminateEventDefinition />
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_15i583d" name="yes" sourceRef="ExclusiveGateway_02fd6gx" targetRef="ExclusiveGateway_1f6x9ii">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_orchestrationStatus") == "PendingActivation" || execution.getVariable("DCVFM_orchestrationStatus") == "Assigned"]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_orchestrationStatus") == "PendingActivation" || execution.getVariable("DCVFM_orchestrationStatus") == "Assigned"</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_0gsliyw" name="Is aLaCarte?" default="SequenceFlow_1iyt5i4">
       <bpmn2:incoming>SequenceFlow_1nh92s8</bpmn2:incoming>
@@ -559,7 +559,7 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_1iyt5i4</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_16mgvsd" name="yes" sourceRef="ExclusiveGateway_0gsliyw" targetRef="Task_08tnqe1">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_aLaCarte") == true]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_aLaCarte") == true</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1nh92s8" sourceRef="PostProcessSDNCAssignRequest" targetRef="ExclusiveGateway_0gsliyw" />
     <bpmn2:sequenceFlow id="SequenceFlow_0cc17yk" sourceRef="Task_08tnqe1" targetRef="ExclusiveGateway_0jw7ymg" />
@@ -581,30 +581,30 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_0kqh1of" name="PrepareUpdateAAIVfModulePendingActivation" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_17cp3tn</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ynd0iy</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'PendingActivation')]]></bpmn2:script>
+doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'PendingActivation')</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="Task_08tnqe1" name="Query Catalog DB" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_16mgvsd</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0cc17yk</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryCatalogDB(execution)]]></bpmn2:script>
+doCreateVfModule.queryCatalogDB(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="Task_14n44kb" name="Query AAI for Orchestration Status" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1y8q87e</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1sf1091</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryAAIVfModuleForStatus(execution)]]></bpmn2:script>
+doCreateVfModule.queryAAIVfModuleForStatus(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="Task_16p51r4" name="Set Success Indicator 1st Phase" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1mnipp8</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_00bh7m7</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
+doCreateVfModule.setSuccessIndicator(execution, true)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1f6x9ii" name="Is volume_group_id specified for stage 2?" default="SequenceFlow_0tfrcnc">
       <bpmn2:incoming>SequenceFlow_15i583d</bpmn2:incoming>
@@ -613,7 +613,7 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_0tfrcnc" name="no" sourceRef="ExclusiveGateway_1f6x9ii" targetRef="ExclusiveGateway_09r5rvt" />
     <bpmn2:sequenceFlow id="SequenceFlow_0oadvvx" name="yes" sourceRef="ExclusiveGateway_1f6x9ii" targetRef="Task_0dx8gpp">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupId") != null &amp;&amp; execution.getVariable("DCVFM_volumeGroupId") != "" }</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_09r5rvt">
       <bpmn2:incoming>SequenceFlow_0tfrcnc</bpmn2:incoming>
@@ -629,7 +629,7 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_0p3cspl</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_0xed5sn" name="yes" sourceRef="ExclusiveGateway_04msdir" targetRef="ExclusiveGateway_1biy4yg">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_isBaseVfModule") == "true"</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_0p3cspl" name="no" sourceRef="ExclusiveGateway_04msdir" targetRef="Task_0cdjxcd" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1biy4yg">
@@ -642,9 +642,9 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_0dx8gpp" name="Query Cloud Region For Stage 2" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0oadvvx</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_03batve</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
+return doCreateVfModule.queryCloudRegion(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="Task_0e8s9xm" name="Confirm Volume Group Tenant" calledElement="ConfirmVolumeGroupTenant">
       <bpmn2:extensionElements>
@@ -663,17 +663,17 @@ return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_0cdjxcd" name="Query AAI Vf Module for Stage 2" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0p3cspl</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1k7xbcu</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
+doCreateVfModule.queryAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="Task_19zw1li" name="PrepareUpdateAAIVfModuleAssign" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_006rnym</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1iyt5i4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0thm33s</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned')]]></bpmn2:script>
+doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned')</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="Task_01b1fio" name="Update AAI VF Module Assigned" calledElement="UpdateAAIVfModule">
       <bpmn2:extensionElements>
@@ -693,983 +693,983 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned')
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModule">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="StartEvent_1">
-        <dc:Bounds x="38" y="153" width="36" height="36" />
+        <dc:Bounds x="258" y="403" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="44" y="189" width="23" height="12" />
+          <dc:Bounds x="263" y="439" width="25" height="14" />
         </bpmndi:BPMNLabel>
       </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="74" y="171" />
-        <di:waypoint xsi:type="dc:Point" x="147" y="171" />
+        <di:waypoint x="294" y="421" />
+        <di:waypoint x="367" y="421" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="99" y="171" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_124" bpmnElement="PreProcessRequest">
-        <dc:Bounds x="147" y="131" width="100" height="80" />
+        <dc:Bounds x="367" y="381" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_1">
-        <dc:Bounds x="36" y="376" width="36" height="36" />
+        <dc:Bounds x="256" y="626" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="0" y="417" width="114" height="22" />
+          <dc:Bounds x="235" y="667" width="85" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_22" bpmnElement="IntermediateThrowEvent_1">
-        <dc:Bounds x="828" y="153" width="36" height="36" />
+        <dc:Bounds x="1048" y="403" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="869" y="173" width="86" height="36" />
+          <dc:Bounds x="1090" y="423" width="85" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="CallSDNCAdapterVDModuleTopologyAssign">
-        <dc:Bounds x="266" y="672" width="121" height="94" />
+        <dc:Bounds x="486" y="922" width="121" height="94" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="CallSDNCAdapterVFModuleTopologyGET">
-        <dc:Bounds x="254" y="1029" width="133" height="97" />
+        <dc:Bounds x="474" y="1279" width="133" height="97" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="IsVolumeGroupIdSpecified" isMarkerVisible="true">
-        <dc:Bounds x="144" y="368" width="50" height="50" />
+        <dc:Bounds x="364" y="618" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="89" y="347" width="178" height="22" />
+          <dc:Bounds x="356" y="597" width="84" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ConfirmVolumeGroupTenant">
-        <dc:Bounds x="209" y="528" width="118" height="89" />
+        <dc:Bounds x="429" y="778" width="118" height="89" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_91" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
-        <dc:Bounds x="559" y="368" width="50" height="50" />
+        <dc:Bounds x="779" y="618" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="584" y="423" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ExclusiveGateway_91">
-        <di:waypoint xsi:type="dc:Point" x="194" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="559" y="393" />
+        <di:waypoint x="414" y="643" />
+        <di:waypoint x="779" y="643" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="209" y="393" width="20" height="22" />
+          <dc:Bounds x="433" y="643" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="CallVNFAdapterVFModuleCreate">
-        <dc:Bounds x="746" y="1031" width="121" height="97" />
+        <dc:Bounds x="966" y="1281" width="121" height="97" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="UpdateAAIVfModule_1">
-        <dc:Bounds x="717" y="1211" width="117" height="97" />
+        <dc:Bounds x="937" y="1461" width="117" height="97" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_175" bpmnElement="CallSDNCAdapterVFModuleTopologyActivate">
-        <dc:Bounds x="1039" y="1209" width="119" height="99" />
+        <dc:Bounds x="1259" y="1459" width="119" height="99" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_92" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">
-        <dc:Bounds x="1384" y="1234" width="50" height="50" />
+        <dc:Bounds x="1604" y="1484" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1381" y="1206" width="86" height="36" />
+          <dc:Bounds x="1602" y="1456" width="84" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="CreateAAIVfModuleVolumeGroup">
-        <dc:Bounds x="1688" y="1204" width="121" height="112" />
+        <dc:Bounds x="1908" y="1454" width="121" height="112" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_93" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">
-        <dc:Bounds x="1813" y="1072" width="50" height="50" />
+        <dc:Bounds x="2033" y="1322" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1838" y="1127" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_176" targetElement="_BPMNShape_ExclusiveGateway_93">
-        <di:waypoint xsi:type="dc:Point" x="1808" y="1260" />
-        <di:waypoint xsi:type="dc:Point" x="1838" y="1260" />
-        <di:waypoint xsi:type="dc:Point" x="1838" y="1162" />
-        <di:waypoint xsi:type="dc:Point" x="1838" y="1122" />
+        <di:waypoint x="2028" y="1510" />
+        <di:waypoint x="2058" y="1510" />
+        <di:waypoint x="2058" y="1412" />
+        <di:waypoint x="2058" y="1372" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1834" y="1260" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_ExclusiveGateway_93">
-        <di:waypoint xsi:type="dc:Point" x="1409" y="1234" />
-        <di:waypoint xsi:type="dc:Point" x="1409" y="1097" />
-        <di:waypoint xsi:type="dc:Point" x="1813" y="1097" />
+        <di:waypoint x="1629" y="1484" />
+        <di:waypoint x="1629" y="1347" />
+        <di:waypoint x="2033" y="1347" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1419" y="1143.6746987951808" width="12" height="12" />
+          <dc:Bounds x="1639" y="1394" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_IntermediateCatchEvent_24" targetElement="_BPMNShape_ExclusiveGateway_90">
-        <di:waypoint xsi:type="dc:Point" x="72" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="120" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="120" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="144" y="393" />
+        <di:waypoint x="292" y="644" />
+        <di:waypoint x="340" y="644" />
+        <di:waypoint x="340" y="643" />
+        <di:waypoint x="364" y="643" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="117" y="394" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_101" bpmnElement="IsVolumeGroupNameSpecified" isMarkerVisible="true">
-        <dc:Bounds x="360" y="547" width="50" height="50" />
+        <dc:Bounds x="580" y="797" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="309" y="496" width="200" height="22" />
+          <dc:Bounds x="585" y="746" width="88" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_ExclusiveGateway_101">
-        <di:waypoint xsi:type="dc:Point" x="327" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="360" y="572" />
+        <di:waypoint x="547" y="822" />
+        <di:waypoint x="580" y="822" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="338" y="572" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_Task_3" bpmnElement="ConfirmVolumeName">
-        <dc:Bounds x="453" y="528" width="109" height="89" />
+        <dc:Bounds x="673" y="778" width="109" height="89" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_Task_3">
-        <di:waypoint xsi:type="dc:Point" x="410" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="453" y="572" />
+        <di:waypoint x="630" y="822" />
+        <di:waypoint x="673" y="822" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="410" y="576" width="27" height="22" />
+          <dc:Bounds x="635" y="826" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_ExclusiveGateway_91">
-        <di:waypoint xsi:type="dc:Point" x="385" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="385" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="559" y="393" />
+        <di:waypoint x="605" y="797" />
+        <di:waypoint x="605" y="643" />
+        <di:waypoint x="779" y="643" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="392" y="450" width="20" height="22" />
+          <dc:Bounds x="616" y="700" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_Task_3" targetElement="_BPMNShape_ExclusiveGateway_91">
-        <di:waypoint xsi:type="dc:Point" x="561" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="584" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="584" y="418" />
+        <di:waypoint x="781" y="822" />
+        <di:waypoint x="804" y="822" />
+        <di:waypoint x="804" y="668" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="581" y="492" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_124" targetElement="_BPMNShape_IntermediateThrowEvent_22">
-        <di:waypoint xsi:type="dc:Point" x="247" y="171" />
-        <di:waypoint xsi:type="dc:Point" x="302" y="171" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_124" targetElement="ExclusiveGateway_19933zh_di">
+        <di:waypoint x="467" y="421" />
+        <di:waypoint x="522" y="421" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="275" y="156" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_91" targetElement="_BPMNShape_ScriptTask_156">
-        <di:waypoint xsi:type="dc:Point" x="609" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="628" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="628" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="696" y="394" />
+        <di:waypoint x="829" y="643" />
+        <di:waypoint x="848" y="643" />
+        <di:waypoint x="848" y="644" />
+        <di:waypoint x="916" y="644" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="636" y="394" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_178" bpmnElement="PreProcessSDNCAssignRequest">
-        <dc:Bounds x="109" y="674" width="121" height="94" />
+        <dc:Bounds x="329" y="924" width="121" height="94" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="PostProcessSDNCAssignRequest">
-        <dc:Bounds x="435" y="674" width="121" height="94" />
+        <dc:Bounds x="655" y="924" width="121" height="94" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_44" bpmnElement="IntermediateThrowEvent_3">
-        <dc:Bounds x="2193" y="376" width="36" height="36" />
+        <dc:Bounds x="2413" y="626" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2181" y="417" width="60" height="12" />
+          <dc:Bounds x="2402" y="667" width="59" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_29" bpmnElement="IntermediateCatchEvent_2">
-        <dc:Bounds x="24" y="706" width="36" height="36" />
+        <dc:Bounds x="244" y="956" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="13" y="747" width="58" height="22" />
+          <dc:Bounds x="239" y="997" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_IntermediateCatchEvent_29" targetElement="_BPMNShape_ScriptTask_178">
-        <di:waypoint xsi:type="dc:Point" x="60" y="724" />
-        <di:waypoint xsi:type="dc:Point" x="81" y="724" />
-        <di:waypoint xsi:type="dc:Point" x="81" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="109" y="721" />
+        <di:waypoint x="280" y="974" />
+        <di:waypoint x="301" y="974" />
+        <di:waypoint x="301" y="971" />
+        <di:waypoint x="329" y="971" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="78" y="722" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_178" targetElement="_BPMNShape_ScriptTask_157">
-        <di:waypoint xsi:type="dc:Point" x="229" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="248" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="248" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="266" y="719" />
+        <di:waypoint x="449" y="971" />
+        <di:waypoint x="468" y="971" />
+        <di:waypoint x="468" y="969" />
+        <di:waypoint x="486" y="969" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ScriptTask_179">
-        <di:waypoint xsi:type="dc:Point" x="386" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="411" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="411" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="435" y="721" />
+        <di:waypoint x="606" y="969" />
+        <di:waypoint x="631" y="969" />
+        <di:waypoint x="631" y="971" />
+        <di:waypoint x="655" y="971" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_213" bpmnElement="PreProcessSDNCGetRequest">
-        <dc:Bounds x="98" y="1031" width="121" height="94" />
+        <dc:Bounds x="318" y="1281" width="121" height="94" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_214" bpmnElement="PostProcessSDNCGetRequest">
-        <dc:Bounds x="434" y="1031" width="121" height="94" />
+        <dc:Bounds x="654" y="1281" width="121" height="94" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_213" targetElement="_BPMNShape_ScriptTask_158">
-        <di:waypoint xsi:type="dc:Point" x="218" y="1078" />
-        <di:waypoint xsi:type="dc:Point" x="236" y="1078" />
-        <di:waypoint xsi:type="dc:Point" x="236" y="1077" />
-        <di:waypoint xsi:type="dc:Point" x="254" y="1077" />
+        <di:waypoint x="438" y="1328" />
+        <di:waypoint x="456" y="1328" />
+        <di:waypoint x="456" y="1327" />
+        <di:waypoint x="474" y="1327" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="251" y="1068" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_ScriptTask_214">
-        <di:waypoint xsi:type="dc:Point" x="386" y="1077" />
-        <di:waypoint xsi:type="dc:Point" x="409" y="1077" />
-        <di:waypoint xsi:type="dc:Point" x="409" y="1078" />
-        <di:waypoint xsi:type="dc:Point" x="434" y="1078" />
+        <di:waypoint x="606" y="1327" />
+        <di:waypoint x="629" y="1327" />
+        <di:waypoint x="629" y="1328" />
+        <di:waypoint x="654" y="1328" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="410" y="1078" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="PreProcessUpdateAAIVfModule_1">
-        <dc:Bounds x="558" y="1211" width="118" height="97" />
+        <dc:Bounds x="778" y="1461" width="118" height="97" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_Task_33" bpmnElement="PreProcessSDNCActivateRequest">
-        <dc:Bounds x="884" y="1210" width="118" height="98" />
+        <dc:Bounds x="1104" y="1460" width="118" height="98" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_Task_4" bpmnElement="PostProcessSDNCActivateRequest">
-        <dc:Bounds x="1201" y="1211" width="121" height="95" />
+        <dc:Bounds x="1421" y="1461" width="121" height="95" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ScriptTask_174">
-        <di:waypoint xsi:type="dc:Point" x="676" y="1259" />
-        <di:waypoint xsi:type="dc:Point" x="717" y="1259" />
+        <di:waypoint x="896" y="1509" />
+        <di:waypoint x="937" y="1509" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="697" y="1234" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_174" targetElement="_BPMNShape_Task_33">
-        <di:waypoint xsi:type="dc:Point" x="833" y="1259" />
-        <di:waypoint xsi:type="dc:Point" x="884" y="1259" />
+        <di:waypoint x="1053" y="1509" />
+        <di:waypoint x="1104" y="1509" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="859" y="1234" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_Task_33" targetElement="_BPMNShape_ScriptTask_175">
-        <di:waypoint xsi:type="dc:Point" x="1002" y="1259" />
-        <di:waypoint xsi:type="dc:Point" x="1020" y="1259" />
-        <di:waypoint xsi:type="dc:Point" x="1020" y="1258" />
-        <di:waypoint xsi:type="dc:Point" x="1039" y="1258" />
+        <di:waypoint x="1222" y="1509" />
+        <di:waypoint x="1240" y="1509" />
+        <di:waypoint x="1240" y="1508" />
+        <di:waypoint x="1259" y="1508" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1035" y="1249" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_175" targetElement="_BPMNShape_Task_4">
-        <di:waypoint xsi:type="dc:Point" x="1157" y="1258" />
-        <di:waypoint xsi:type="dc:Point" x="1201" y="1258" />
+        <di:waypoint x="1377" y="1508" />
+        <di:waypoint x="1421" y="1508" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1179" y="1233" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_Task_4" targetElement="_BPMNShape_ExclusiveGateway_92">
-        <di:waypoint xsi:type="dc:Point" x="1321" y="1258" />
-        <di:waypoint xsi:type="dc:Point" x="1353" y="1258" />
-        <di:waypoint xsi:type="dc:Point" x="1353" y="1259" />
-        <di:waypoint xsi:type="dc:Point" x="1384" y="1259" />
+        <di:waypoint x="1541" y="1508" />
+        <di:waypoint x="1573" y="1508" />
+        <di:waypoint x="1573" y="1509" />
+        <di:waypoint x="1604" y="1509" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1368" y="1249" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_175" bpmnElement="EndEvent_1">
-        <dc:Bounds x="2107" y="1079" width="36" height="36" />
+        <dc:Bounds x="2327" y="1329" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="2125" y="1120" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ExclusiveGateway_93" targetElement="_BPMNShape_ScriptTask_218">
-        <di:waypoint xsi:type="dc:Point" x="1863" y="1097" />
-        <di:waypoint xsi:type="dc:Point" x="1929" y="1096" />
+        <di:waypoint x="2083" y="1347" />
+        <di:waypoint x="2149" y="1346" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1896" y="1082" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_45" bpmnElement="IntermediateThrowEvent_2">
-        <dc:Bounds x="1281" y="1060" width="36" height="36" />
+        <dc:Bounds x="1501" y="1310" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1257" y="1101" width="84" height="36" />
+          <dc:Bounds x="1477" y="1351" width="85" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_30" bpmnElement="IntermediateCatchEvent_3">
-        <dc:Bounds x="-27" y="1241" width="36" height="36" />
+        <dc:Bounds x="193" y="1491" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-35" y="1282" width="84" height="24" />
+          <dc:Bounds x="185" y="1532" width="85" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_Task_7" bpmnElement="PrepareCreateAAIVfModuleVolumeGroupRequest">
-        <dc:Bounds x="1502" y="1204" width="121" height="112" />
+        <dc:Bounds x="1722" y="1454" width="121" height="112" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_Task_7" targetElement="_BPMNShape_ScriptTask_176">
-        <di:waypoint xsi:type="dc:Point" x="1623" y="1260" />
-        <di:waypoint xsi:type="dc:Point" x="1688" y="1260" />
+        <di:waypoint x="1843" y="1510" />
+        <di:waypoint x="1908" y="1510" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1656" y="1245" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_Task_25" bpmnElement="PreProcessVNFAdapterRequest">
-        <dc:Bounds x="583" y="1031" width="121" height="96" />
+        <dc:Bounds x="803" y="1281" width="121" height="96" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_Task_35" bpmnElement="PostProcessVNFAdapterRequest">
-        <dc:Bounds x="907" y="1033" width="116" height="92" />
+        <dc:Bounds x="1127" y="1283" width="116" height="92" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ScriptTask_214" targetElement="_BPMNShape_Task_25">
-        <di:waypoint xsi:type="dc:Point" x="554" y="1078" />
-        <di:waypoint xsi:type="dc:Point" x="569" y="1078" />
-        <di:waypoint xsi:type="dc:Point" x="569" y="1079" />
-        <di:waypoint xsi:type="dc:Point" x="583" y="1079" />
+        <di:waypoint x="774" y="1328" />
+        <di:waypoint x="789" y="1328" />
+        <di:waypoint x="789" y="1329" />
+        <di:waypoint x="803" y="1329" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="584" y="1069" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_Task_25" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="703" y="1079" />
-        <di:waypoint xsi:type="dc:Point" x="746" y="1079" />
+        <di:waypoint x="923" y="1329" />
+        <di:waypoint x="966" y="1329" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="725" y="1054" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_Task_35">
-        <di:waypoint xsi:type="dc:Point" x="866" y="1079" />
-        <di:waypoint xsi:type="dc:Point" x="907" y="1079" />
+        <di:waypoint x="1086" y="1329" />
+        <di:waypoint x="1127" y="1329" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="887" y="1054" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="QueryAAIVfModule">
-        <dc:Bounds x="1224" y="516" width="125" height="92" />
+        <dc:Bounds x="1444" y="766" width="125" height="92" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_211" bpmnElement="IsBaseVfModule" isMarkerVisible="true">
-        <dc:Bounds x="1128" y="368" width="50" height="50" />
+        <dc:Bounds x="1348" y="618" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1092" y="336" width="124" height="22" />
+          <dc:Bounds x="1347" y="586" width="55" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_212" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds x="1408" y="368" width="50" height="50" />
+        <dc:Bounds x="1628" y="618" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1395" y="329" width="75" height="36" />
+          <dc:Bounds x="1616" y="579" width="73" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ScriptTask_215">
-        <di:waypoint xsi:type="dc:Point" x="1153" y="418" />
-        <di:waypoint xsi:type="dc:Point" x="1153" y="562" />
-        <di:waypoint xsi:type="dc:Point" x="1224" y="562" />
+        <di:waypoint x="1373" y="668" />
+        <di:waypoint x="1373" y="812" />
+        <di:waypoint x="1444" y="812" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1122" y="450" width="20" height="22" />
+          <dc:Bounds x="1346" y="700" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ExclusiveGateway_212">
-        <di:waypoint xsi:type="dc:Point" x="1178" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1408" y="393" />
+        <di:waypoint x="1398" y="643" />
+        <di:waypoint x="1628" y="643" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1285" y="393" width="27" height="22" />
+          <dc:Bounds x="1510" y="643" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_216" bpmnElement="PostProcessCreateAAIVfModule">
-        <dc:Bounds x="897" y="348" width="125" height="92" />
+        <dc:Bounds x="1117" y="598" width="125" height="92" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_216" targetElement="_BPMNShape_ExclusiveGateway_211">
-        <di:waypoint xsi:type="dc:Point" x="1021" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="1075" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="1075" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1128" y="393" />
+        <di:waypoint x="1241" y="644" />
+        <di:waypoint x="1295" y="644" />
+        <di:waypoint x="1295" y="643" />
+        <di:waypoint x="1348" y="643" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1072" y="394" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_37" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ExclusiveGateway_212">
-        <di:waypoint xsi:type="dc:Point" x="1348" y="562" />
-        <di:waypoint xsi:type="dc:Point" x="1378" y="562" />
-        <di:waypoint xsi:type="dc:Point" x="1378" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1408" y="393" />
+        <di:waypoint x="1568" y="812" />
+        <di:waypoint x="1598" y="812" />
+        <di:waypoint x="1598" y="643" />
+        <di:waypoint x="1628" y="643" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1393" y="468" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_218" bpmnElement="ScriptTask_setSuccess">
-        <dc:Bounds x="1929" y="1049" width="128" height="95" />
+        <dc:Bounds x="2149" y="1299" width="128" height="95" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_218" targetElement="_BPMNShape_EndEvent_175">
-        <di:waypoint xsi:type="dc:Point" x="2057" y="1097" />
-        <di:waypoint xsi:type="dc:Point" x="2107" y="1096" />
+        <di:waypoint x="2277" y="1347" />
+        <di:waypoint x="2327" y="1346" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="2082" y="1082" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_254" bpmnElement="QueryCloudRegion">
-        <dc:Bounds x="101" y="440" width="134" height="81" />
+        <dc:Bounds x="321" y="690" width="134" height="81" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_40" bpmnElement="SequenceFlow_40" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ScriptTask_254">
-        <di:waypoint xsi:type="dc:Point" x="169" y="418" />
-        <di:waypoint xsi:type="dc:Point" x="169" y="429" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="429" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="440" />
+        <di:waypoint x="389" y="668" />
+        <di:waypoint x="389" y="679" />
+        <di:waypoint x="388" y="679" />
+        <di:waypoint x="388" y="690" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="180" y="417" width="27" height="22" />
+          <dc:Bounds x="405" y="667" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_43" bpmnElement="SequenceFlow_43" sourceElement="_BPMNShape_ScriptTask_254" targetElement="_BPMNShape_ScriptTask_172">
-        <di:waypoint xsi:type="dc:Point" x="168" y="520" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="524" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="581" />
-        <di:waypoint xsi:type="dc:Point" x="208" y="581" />
-        <di:waypoint xsi:type="dc:Point" x="209" y="581" />
+        <di:waypoint x="388" y="770" />
+        <di:waypoint x="388" y="774" />
+        <di:waypoint x="388" y="831" />
+        <di:waypoint x="428" y="831" />
+        <di:waypoint x="429" y="831" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="165" y="574" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="CreateAAIVfModule">
-        <dc:Bounds x="696" y="348" width="121" height="92" />
+        <dc:Bounds x="916" y="598" width="121" height="92" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_216">
-        <di:waypoint xsi:type="dc:Point" x="816" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="897" y="394" />
+        <di:waypoint x="1036" y="644" />
+        <di:waypoint x="1117" y="644" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="857" y="369" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_183x8vk_di" bpmnElement="ExclusiveGateway_183x8vk" isMarkerVisible="true">
-        <dc:Bounds x="1076" y="1055" width="50" height="50" />
+        <dc:Bounds x="1296" y="1305" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1056" y="1105" width="89" height="36" />
+          <dc:Bounds x="1281" y="1355" width="79" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ushk1d_di" bpmnElement="SequenceFlow_1ushk1d">
-        <di:waypoint xsi:type="dc:Point" x="1023" y="1079" />
-        <di:waypoint xsi:type="dc:Point" x="1076" y="1080" />
+        <di:waypoint x="1243" y="1329" />
+        <di:waypoint x="1296" y="1330" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1050" y="1065" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ery1pk_di" bpmnElement="SequenceFlow_0ery1pk">
-        <di:waypoint xsi:type="dc:Point" x="1101" y="1055" />
-        <di:waypoint xsi:type="dc:Point" x="1101" y="979" />
-        <di:waypoint xsi:type="dc:Point" x="1147" y="979" />
+        <di:waypoint x="1321" y="1305" />
+        <di:waypoint x="1321" y="1229" />
+        <di:waypoint x="1367" y="1229" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1054" y="1267" width="18" height="12" />
+          <dc:Bounds x="1275" y="1517" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0xfanpi_di" bpmnElement="SequenceFlow_0xfanpi">
-        <di:waypoint xsi:type="dc:Point" x="1126" y="1080" />
-        <di:waypoint xsi:type="dc:Point" x="1281" y="1078" />
+        <di:waypoint x="1346" y="1330" />
+        <di:waypoint x="1501" y="1328" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1198" y="1054" width="12" height="12" />
+          <dc:Bounds x="1418" y="1304" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0abffyj_di" bpmnElement="SequenceFlow_0abffyj">
-        <di:waypoint xsi:type="dc:Point" x="1247" y="979" />
-        <di:waypoint xsi:type="dc:Point" x="1299" y="979" />
-        <di:waypoint xsi:type="dc:Point" x="1299" y="1060" />
+        <di:waypoint x="1467" y="1229" />
+        <di:waypoint x="1519" y="1229" />
+        <di:waypoint x="1519" y="1310" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1273" y="964" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1dv7amn_di" bpmnElement="CreateNetworkPoliciesInAAI">
-        <dc:Bounds x="1147" y="939" width="100" height="80" />
+        <dc:Bounds x="1367" y="1189" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0f54imv_di" bpmnElement="ExclusiveGateway_0f54imv" isMarkerVisible="true">
-        <dc:Bounds x="64" y="1235" width="50" height="50" />
+        <dc:Bounds x="284" y="1485" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="51" y="1200" width="75" height="24" />
+          <dc:Bounds x="272" y="1450" width="74" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1edqxlf_di" bpmnElement="ExclusiveGateway_1edqxlf" isMarkerVisible="true">
-        <dc:Bounds x="432" y="1235" width="50" height="50" />
+        <dc:Bounds x="652" y="1485" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="457" y="1285" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0bi38s7_di" bpmnElement="SequenceFlow_0bi38s7">
-        <di:waypoint xsi:type="dc:Point" x="89" y="1285" />
-        <di:waypoint xsi:type="dc:Point" x="89" y="1438" />
-        <di:waypoint xsi:type="dc:Point" x="142" y="1438" />
+        <di:waypoint x="309" y="1535" />
+        <di:waypoint x="309" y="1688" />
+        <di:waypoint x="362" y="1688" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="95" y="1362" width="18" height="12" />
+          <dc:Bounds x="316" y="1612" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1qm81ym_di" bpmnElement="SequenceFlow_1qm81ym">
-        <di:waypoint xsi:type="dc:Point" x="242" y="1438" />
-        <di:waypoint xsi:type="dc:Point" x="278" y="1438" />
-        <di:waypoint xsi:type="dc:Point" x="278" y="1438" />
-        <di:waypoint xsi:type="dc:Point" x="314" y="1438" />
+        <di:waypoint x="462" y="1688" />
+        <di:waypoint x="498" y="1688" />
+        <di:waypoint x="498" y="1688" />
+        <di:waypoint x="534" y="1688" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="293" y="1438" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_112los9_di" bpmnElement="SequenceFlow_112los9">
-        <di:waypoint xsi:type="dc:Point" x="414" y="1438" />
-        <di:waypoint xsi:type="dc:Point" x="457" y="1438" />
-        <di:waypoint xsi:type="dc:Point" x="457" y="1285" />
+        <di:waypoint x="634" y="1688" />
+        <di:waypoint x="677" y="1688" />
+        <di:waypoint x="677" y="1535" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="436" y="1423" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1k5uku2_di" bpmnElement="SequenceFlow_1k5uku2">
-        <di:waypoint xsi:type="dc:Point" x="114" y="1260" />
-        <di:waypoint xsi:type="dc:Point" x="432" y="1260" />
+        <di:waypoint x="334" y="1510" />
+        <di:waypoint x="652" y="1510" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="267" y="1245" width="12" height="12" />
+          <dc:Bounds x="487" y="1495" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1avfxsz_di" bpmnElement="SequenceFlow_1avfxsz">
-        <di:waypoint xsi:type="dc:Point" x="482" y="1260" />
-        <di:waypoint xsi:type="dc:Point" x="520" y="1260" />
-        <di:waypoint xsi:type="dc:Point" x="520" y="1260" />
-        <di:waypoint xsi:type="dc:Point" x="558" y="1260" />
+        <di:waypoint x="702" y="1510" />
+        <di:waypoint x="740" y="1510" />
+        <di:waypoint x="740" y="1510" />
+        <di:waypoint x="778" y="1510" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="535" y="1260" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0363dz7_di" bpmnElement="SequenceFlow_0363dz7">
-        <di:waypoint xsi:type="dc:Point" x="9" y="1259" />
-        <di:waypoint xsi:type="dc:Point" x="64" y="1260" />
+        <di:waypoint x="229" y="1509" />
+        <di:waypoint x="284" y="1510" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="37" y="1235" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0o3bcyq_di" bpmnElement="PreProcessUpdateAAIGenericVnf">
-        <dc:Bounds x="142" y="1399" width="100" height="80" />
+        <dc:Bounds x="362" y="1649" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0j45ic9_di" bpmnElement="UpdateAAIGenericVNFTask">
-        <dc:Bounds x="314" y="1398" width="100" height="80" />
+        <dc:Bounds x="534" y="1648" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0zcfn2x_di" bpmnElement="SequenceFlow_0zcfn2x">
-        <di:waypoint xsi:type="dc:Point" x="1458" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="2193" y="394" />
+        <di:waypoint x="1678" y="643" />
+        <di:waypoint x="2413" y="644" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1822" y="368.5010168687388" width="12" height="12" />
+          <dc:Bounds x="2042" y="619" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0m382su_di" bpmnElement="SequenceFlow_0m382su">
-        <di:waypoint xsi:type="dc:Point" x="1433" y="418" />
-        <di:waypoint xsi:type="dc:Point" x="1433" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="1666" y="521" />
+        <di:waypoint x="1653" y="668" />
+        <di:waypoint x="1653" y="771" />
+        <di:waypoint x="1886" y="771" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1363.5900806639468" y="422.98801391242307" width="19" height="12" />
+          <dc:Bounds x="1585" y="673" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0g270u0_di" bpmnElement="SequenceFlow_0g270u0">
-        <di:waypoint xsi:type="dc:Point" x="1766" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="1816" y="521" />
+        <di:waypoint x="1986" y="771" />
+        <di:waypoint x="2036" y="771" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1791" y="506" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yrlvgb_di" bpmnElement="SequenceFlow_1yrlvgb">
-        <di:waypoint xsi:type="dc:Point" x="1916" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="1969" y="521" />
+        <di:waypoint x="2136" y="771" />
+        <di:waypoint x="2189" y="771" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1943" y="506" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1j22oyj_di" bpmnElement="PreProcessSDNCVnfGetRequest">
-        <dc:Bounds x="1666" y="481" width="100" height="80" />
+        <dc:Bounds x="1886" y="731" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_10t4tix_di" bpmnElement="CallSDNCAdapterVNFTopologyGET">
-        <dc:Bounds x="1816" y="481" width="100" height="80" />
+        <dc:Bounds x="2036" y="731" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_09wgk9p_di" bpmnElement="PostProcessSDNCVnfGetRequest">
-        <dc:Bounds x="1969" y="481" width="100" height="80" />
+        <dc:Bounds x="2189" y="731" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_170kw7h_di" bpmnElement="SequenceFlow_170kw7h">
-        <di:waypoint xsi:type="dc:Point" x="2069" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="2131" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="2131" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="2193" y="394" />
+        <di:waypoint x="2289" y="771" />
+        <di:waypoint x="2351" y="771" />
+        <di:waypoint x="2351" y="644" />
+        <di:waypoint x="2413" y="644" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="2146" y="447.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1f53tby_di" bpmnElement="SequenceFlow_1f53tby">
-        <di:waypoint xsi:type="dc:Point" x="776" y="282" />
-        <di:waypoint xsi:type="dc:Point" x="846" y="282" />
-        <di:waypoint xsi:type="dc:Point" x="846" y="189" />
+        <di:waypoint x="996" y="532" />
+        <di:waypoint x="1066" y="532" />
+        <di:waypoint x="1066" y="439" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="811" y="267" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0ffvqla_di" bpmnElement="ExclusiveGateway_0ffvqla" isMarkerVisible="true">
-        <dc:Bounds x="592" y="146" width="50" height="50" />
+        <dc:Bounds x="812" y="396" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="574" y="98" width="86" height="36" />
+          <dc:Bounds x="795" y="348" width="84" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0270n5c_di" bpmnElement="SequenceFlow_0270n5c">
-        <di:waypoint xsi:type="dc:Point" x="642" y="171" />
-        <di:waypoint xsi:type="dc:Point" x="828" y="171" />
+        <di:waypoint x="862" y="421" />
+        <di:waypoint x="1048" y="421" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="699" y="145" width="18" height="12" />
+          <dc:Bounds x="920" y="395" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_05og7iw_di" bpmnElement="SequenceFlow_05og7iw">
-        <di:waypoint xsi:type="dc:Point" x="617" y="196" />
-        <di:waypoint xsi:type="dc:Point" x="617" y="282" />
-        <di:waypoint xsi:type="dc:Point" x="676" y="282" />
+        <di:waypoint x="837" y="446" />
+        <di:waypoint x="837" y="532" />
+        <di:waypoint x="896" y="532" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="626" y="239" width="12" height="12" />
+          <dc:Bounds x="846" y="489" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_14nvmgk_di" bpmnElement="Task_0kuj2a1">
-        <dc:Bounds x="676" y="242" width="100" height="80" />
+        <dc:Bounds x="896" y="492" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_0ltzufk_di" bpmnElement="SubProcess_0ltzufk" isExpanded="true">
-        <dc:Bounds x="-52" y="1578" width="1047" height="338" />
+        <dc:Bounds x="168" y="1828" width="1047" height="338" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_18lzc5m_di" bpmnElement="StartEvent_18lzc5m">
-        <dc:Bounds x="91" y="1682" width="36" height="36" />
+        <dc:Bounds x="311" y="1932" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="109" y="1723" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0wsdptv_di" bpmnElement="EndEvent_0wsdptv">
-        <dc:Bounds x="859" y="1682" width="36" height="36" />
+        <dc:Bounds x="1079" y="1932" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="877" y="1723" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1ehr5kq_di" bpmnElement="CallDoCreateVfModuleRollback">
-        <dc:Bounds x="507" y="1660" width="100" height="80" />
+        <dc:Bounds x="727" y="1910" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0upatdd_di" bpmnElement="PreProcessRollback">
-        <dc:Bounds x="327" y="1660" width="100" height="80" />
+        <dc:Bounds x="547" y="1910" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0o1zc29_di" bpmnElement="PostProcessRollback">
-        <dc:Bounds x="692" y="1660" width="100" height="80" />
+        <dc:Bounds x="912" y="1910" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_02lc25j_di" bpmnElement="SequenceFlow_02lc25j">
-        <di:waypoint xsi:type="dc:Point" x="127" y="1700" />
-        <di:waypoint xsi:type="dc:Point" x="194" y="1700" />
+        <di:waypoint x="347" y="1950" />
+        <di:waypoint x="414" y="1950" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="161" y="1685" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0z2rczk_di" bpmnElement="SequenceFlow_0z2rczk">
-        <di:waypoint xsi:type="dc:Point" x="792" y="1700" />
-        <di:waypoint xsi:type="dc:Point" x="824" y="1700" />
-        <di:waypoint xsi:type="dc:Point" x="824" y="1700" />
-        <di:waypoint xsi:type="dc:Point" x="859" y="1700" />
+        <di:waypoint x="1012" y="1950" />
+        <di:waypoint x="1044" y="1950" />
+        <di:waypoint x="1044" y="1950" />
+        <di:waypoint x="1079" y="1950" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="839" y="1700" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1i1q78e_di" bpmnElement="SequenceFlow_1i1q78e">
-        <di:waypoint xsi:type="dc:Point" x="427" y="1700" />
-        <di:waypoint xsi:type="dc:Point" x="507" y="1700" />
+        <di:waypoint x="647" y="1950" />
+        <di:waypoint x="727" y="1950" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="467" y="1685" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0112l2c_di" bpmnElement="SequenceFlow_0112l2c">
-        <di:waypoint xsi:type="dc:Point" x="607" y="1700" />
-        <di:waypoint xsi:type="dc:Point" x="692" y="1700" />
+        <di:waypoint x="827" y="1950" />
+        <di:waypoint x="912" y="1950" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="650" y="1685" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_039bib8_di" bpmnElement="ExclusiveGateway_039bib8" isMarkerVisible="true">
-        <dc:Bounds x="194" y="1675" width="50" height="50" />
+        <dc:Bounds x="414" y="1925" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="175" y="1647" width="87" height="12" />
+          <dc:Bounds x="394" y="1897" width="89" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_04bd5in_di" bpmnElement="SequenceFlow_04bd5in">
-        <di:waypoint xsi:type="dc:Point" x="244" y="1700" />
-        <di:waypoint xsi:type="dc:Point" x="327" y="1700" />
+        <di:waypoint x="464" y="1950" />
+        <di:waypoint x="547" y="1950" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="280" y="1685" width="12" height="12" />
+          <dc:Bounds x="500" y="1935" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1nh7m8d_di" bpmnElement="SequenceFlow_1nh7m8d">
-        <di:waypoint xsi:type="dc:Point" x="219" y="1725" />
-        <di:waypoint xsi:type="dc:Point" x="219" y="1824" />
-        <di:waypoint xsi:type="dc:Point" x="507" y="1824" />
+        <di:waypoint x="439" y="1975" />
+        <di:waypoint x="439" y="2074" />
+        <di:waypoint x="727" y="2074" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="225" y="1775" width="18" height="12" />
+          <dc:Bounds x="446" y="2025" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_05v20n0_di" bpmnElement="Task_1fm09pi">
-        <dc:Bounds x="507" y="1784" width="100" height="80" />
+        <dc:Bounds x="727" y="2034" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1pgo10r_di" bpmnElement="SequenceFlow_1pgo10r">
-        <di:waypoint xsi:type="dc:Point" x="607" y="1824" />
-        <di:waypoint xsi:type="dc:Point" x="877" y="1824" />
-        <di:waypoint xsi:type="dc:Point" x="877" y="1718" />
+        <di:waypoint x="827" y="2074" />
+        <di:waypoint x="1097" y="2074" />
+        <di:waypoint x="1097" y="1968" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="742" y="1809" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0jw7ymg_di" bpmnElement="ExclusiveGateway_0jw7ymg" isMarkerVisible="true">
-        <dc:Bounds x="803" y="696" width="50" height="50" />
+        <dc:Bounds x="1023" y="946" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="797" y="653" width="61" height="24" />
+          <dc:Bounds x="1018" y="903" width="59" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_Task_7">
-        <di:waypoint xsi:type="dc:Point" x="1434" y="1259" />
-        <di:waypoint xsi:type="dc:Point" x="1502" y="1260" />
+        <di:waypoint x="1654" y="1509" />
+        <di:waypoint x="1722" y="1510" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1454" y="1264.6906474820144" width="18" height="12" />
+          <dc:Bounds x="1675" y="1515" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_19933zh_di" bpmnElement="ExclusiveGateway_19933zh" isMarkerVisible="true">
-        <dc:Bounds x="302" y="146" width="50" height="50" />
+        <dc:Bounds x="522" y="396" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="295" y="196" width="63" height="12" />
+          <dc:Bounds x="515" y="446" width="63" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1y1ttqe_di" bpmnElement="SequenceFlow_1y1ttqe">
-        <di:waypoint xsi:type="dc:Point" x="352" y="171" />
-        <di:waypoint xsi:type="dc:Point" x="592" y="171" />
+        <di:waypoint x="572" y="421" />
+        <di:waypoint x="812" y="421" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="379" y="147" width="12" height="12" />
+          <dc:Bounds x="599" y="397" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_02fd6gx_di" bpmnElement="ExclusiveGateway_02fd6gx" isMarkerVisible="true">
-        <dc:Bounds x="447" y="-1" width="50" height="50" />
+        <dc:Bounds x="667" y="249" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="427" y="-48" width="89" height="36" />
+          <dc:Bounds x="647" y="202" width="89" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0lilmm3_di" bpmnElement="SequenceFlow_0lilmm3">
-        <di:waypoint xsi:type="dc:Point" x="472" y="49" />
-        <di:waypoint xsi:type="dc:Point" x="472" y="171" />
-        <di:waypoint xsi:type="dc:Point" x="592" y="171" />
+        <di:waypoint x="692" y="299" />
+        <di:waypoint x="692" y="421" />
+        <di:waypoint x="812" y="421" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="482" y="100" width="12" height="12" />
+          <dc:Bounds x="702" y="350" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1y8q87e_di" bpmnElement="SequenceFlow_1y8q87e">
-        <di:waypoint xsi:type="dc:Point" x="327" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="327" y="64" />
+        <di:waypoint x="547" y="396" />
+        <di:waypoint x="547" y="314" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="333" y="95" width="18" height="12" />
+          <dc:Bounds x="554" y="345" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1sf1091_di" bpmnElement="SequenceFlow_1sf1091">
-        <di:waypoint xsi:type="dc:Point" x="377" y="24" />
-        <di:waypoint xsi:type="dc:Point" x="447" y="24" />
+        <di:waypoint x="597" y="274" />
+        <di:waypoint x="667" y="274" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="412" y="9" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17cp3tn_di" bpmnElement="SequenceFlow_17cp3tn">
-        <di:waypoint xsi:type="dc:Point" x="853" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="901" y="720" />
+        <di:waypoint x="1073" y="971" />
+        <di:waypoint x="1121" y="970" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="866" y="694.5" width="18" height="12" />
+          <dc:Bounds x="1087" y="945" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0b33fd2_di" bpmnElement="EndEvent_0pd6bbj">
-        <dc:Bounds x="1367" y="701" width="36" height="36" />
+        <dc:Bounds x="1587" y="951" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1385" y="737" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_15i583d_di" bpmnElement="SequenceFlow_15i583d">
-        <di:waypoint xsi:type="dc:Point" x="497" y="24" />
-        <di:waypoint xsi:type="dc:Point" x="559" y="24" />
+        <di:waypoint x="717" y="274" />
+        <di:waypoint x="779" y="274" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="513" y="3.588067006526856" width="18" height="12" />
+          <dc:Bounds x="734" y="254" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0gsliyw_di" bpmnElement="ExclusiveGateway_0gsliyw" isMarkerVisible="true">
-        <dc:Bounds x="592" y="694" width="50" height="50" />
+        <dc:Bounds x="812" y="944" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="585" y="656" width="63" height="12" />
+          <dc:Bounds x="805" y="906" width="63" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_16mgvsd_di" bpmnElement="SequenceFlow_16mgvsd">
-        <di:waypoint xsi:type="dc:Point" x="642" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="668" y="719" />
+        <di:waypoint x="862" y="969" />
+        <di:waypoint x="888" y="969" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="641" y="696" width="18" height="12" />
+          <dc:Bounds x="862" y="946" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1nh92s8_di" bpmnElement="SequenceFlow_1nh92s8">
-        <di:waypoint xsi:type="dc:Point" x="556" y="720" />
-        <di:waypoint xsi:type="dc:Point" x="592" y="719" />
+        <di:waypoint x="776" y="970" />
+        <di:waypoint x="812" y="969" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="574" y="694.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0cc17yk_di" bpmnElement="SequenceFlow_0cc17yk">
-        <di:waypoint xsi:type="dc:Point" x="768" y="720" />
-        <di:waypoint xsi:type="dc:Point" x="803" y="721" />
+        <di:waypoint x="988" y="970" />
+        <di:waypoint x="1023" y="971" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="786" y="705.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1iyt5i4_di" bpmnElement="SequenceFlow_1iyt5i4">
-        <di:waypoint xsi:type="dc:Point" x="617" y="744" />
-        <di:waypoint xsi:type="dc:Point" x="617" y="799" />
-        <di:waypoint xsi:type="dc:Point" x="98" y="799" />
-        <di:waypoint xsi:type="dc:Point" x="98" y="881" />
-        <di:waypoint xsi:type="dc:Point" x="119" y="881" />
+        <di:waypoint x="837" y="994" />
+        <di:waypoint x="837" y="1049" />
+        <di:waypoint x="318" y="1049" />
+        <di:waypoint x="318" y="1131" />
+        <di:waypoint x="339" y="1131" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="466" y="776.3184256922661" width="12" height="12" />
+          <dc:Bounds x="686" y="1026" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_006rnym_di" bpmnElement="SequenceFlow_006rnym">
-        <di:waypoint xsi:type="dc:Point" x="828" y="746" />
-        <di:waypoint xsi:type="dc:Point" x="828" y="815" />
-        <di:waypoint xsi:type="dc:Point" x="169" y="815" />
-        <di:waypoint xsi:type="dc:Point" x="169" y="841" />
+        <di:waypoint x="1048" y="996" />
+        <di:waypoint x="1048" y="1065" />
+        <di:waypoint x="389" y="1065" />
+        <di:waypoint x="389" y="1091" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="807" y="762.4025974025974" width="12" height="12" />
+          <dc:Bounds x="1027" y="1012" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ynd0iy_di" bpmnElement="SequenceFlow_0ynd0iy">
-        <di:waypoint xsi:type="dc:Point" x="1001" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="1057" y="719" />
+        <di:waypoint x="1221" y="969" />
+        <di:waypoint x="1277" y="969" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1029" y="704" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_00bh7m7_di" bpmnElement="SequenceFlow_00bh7m7">
-        <di:waypoint xsi:type="dc:Point" x="1312" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="1367" y="719" />
+        <di:waypoint x="1532" y="969" />
+        <di:waypoint x="1587" y="969" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1340" y="704" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1mnipp8_di" bpmnElement="SequenceFlow_1mnipp8">
-        <di:waypoint xsi:type="dc:Point" x="1157" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="1212" y="719" />
+        <di:waypoint x="1377" y="969" />
+        <di:waypoint x="1432" y="969" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1185" y="704" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1bvhxkk_di" bpmnElement="Task_08z2aai">
-        <dc:Bounds x="1057" y="679" width="100" height="80" />
+        <dc:Bounds x="1277" y="929" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_05mwaoo_di" bpmnElement="Task_0kqh1of">
-        <dc:Bounds x="901" y="679" width="100" height="80" />
+        <dc:Bounds x="1121" y="929" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_059xue9_di" bpmnElement="Task_08tnqe1">
-        <dc:Bounds x="668" y="679" width="100" height="80" />
+        <dc:Bounds x="888" y="929" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1k3dub4_di" bpmnElement="Task_14n44kb">
-        <dc:Bounds x="277" y="-16" width="100" height="80" />
+        <dc:Bounds x="497" y="234" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0okxyur_di" bpmnElement="Task_16p51r4">
-        <dc:Bounds x="1212" y="679" width="100" height="80" />
+        <dc:Bounds x="1432" y="929" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1f6x9ii_di" bpmnElement="ExclusiveGateway_1f6x9ii" isMarkerVisible="true">
-        <dc:Bounds x="559" y="-1" width="50" height="50" />
+        <dc:Bounds x="779" y="249" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="539" y="49" width="89" height="48" />
+          <dc:Bounds x="762" y="299" width="84" height="53" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0tfrcnc_di" bpmnElement="SequenceFlow_0tfrcnc">
-        <di:waypoint xsi:type="dc:Point" x="609" y="24" />
-        <di:waypoint xsi:type="dc:Point" x="946" y="24" />
+        <di:waypoint x="829" y="274" />
+        <di:waypoint x="1166" y="274" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="772" y="9" width="12" height="12" />
+          <dc:Bounds x="992" y="259" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0oadvvx_di" bpmnElement="SequenceFlow_0oadvvx">
-        <di:waypoint xsi:type="dc:Point" x="584" y="-1" />
-        <di:waypoint xsi:type="dc:Point" x="584" y="-63" />
-        <di:waypoint xsi:type="dc:Point" x="616" y="-63" />
+        <di:waypoint x="804" y="249" />
+        <di:waypoint x="804" y="187" />
+        <di:waypoint x="836" y="187" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="590" y="-42" width="18" height="12" />
+          <dc:Bounds x="811" y="208" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_09r5rvt_di" bpmnElement="ExclusiveGateway_09r5rvt" isMarkerVisible="true">
-        <dc:Bounds x="946" y="-1" width="50" height="50" />
+        <dc:Bounds x="1166" y="249" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="971" y="49" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1qzw172_di" bpmnElement="SequenceFlow_1qzw172">
-        <di:waypoint xsi:type="dc:Point" x="996" y="24" />
-        <di:waypoint xsi:type="dc:Point" x="1074" y="24" />
+        <di:waypoint x="1216" y="274" />
+        <di:waypoint x="1294" y="274" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1035" y="9" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_03batve_di" bpmnElement="SequenceFlow_03batve">
-        <di:waypoint xsi:type="dc:Point" x="716" y="-63" />
-        <di:waypoint xsi:type="dc:Point" x="796" y="-63" />
+        <di:waypoint x="936" y="187" />
+        <di:waypoint x="1016" y="187" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="756" y="-78" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0c6p4aa_di" bpmnElement="SequenceFlow_0c6p4aa">
-        <di:waypoint xsi:type="dc:Point" x="896" y="-63" />
-        <di:waypoint xsi:type="dc:Point" x="971" y="-63" />
-        <di:waypoint xsi:type="dc:Point" x="971" y="-1" />
+        <di:waypoint x="1116" y="187" />
+        <di:waypoint x="1191" y="187" />
+        <di:waypoint x="1191" y="249" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="934" y="-78" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_04msdir_di" bpmnElement="ExclusiveGateway_04msdir" isMarkerVisible="true">
-        <dc:Bounds x="1074" y="-1" width="50" height="50" />
+        <dc:Bounds x="1294" y="249" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1057" y="49" width="84" height="36" />
+          <dc:Bounds x="1278" y="299" width="82" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0xed5sn_di" bpmnElement="SequenceFlow_0xed5sn">
-        <di:waypoint xsi:type="dc:Point" x="1124" y="24" />
-        <di:waypoint xsi:type="dc:Point" x="1338" y="24" />
+        <di:waypoint x="1344" y="274" />
+        <di:waypoint x="1558" y="274" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1222" y="9" width="18" height="12" />
+          <dc:Bounds x="1443" y="259" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0p3cspl_di" bpmnElement="SequenceFlow_0p3cspl">
-        <di:waypoint xsi:type="dc:Point" x="1099" y="-1" />
-        <di:waypoint xsi:type="dc:Point" x="1099" y="-63" />
-        <di:waypoint xsi:type="dc:Point" x="1190" y="-63" />
+        <di:waypoint x="1319" y="249" />
+        <di:waypoint x="1319" y="187" />
+        <di:waypoint x="1410" y="187" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1108" y="-41.26315789473686" width="12" height="12" />
+          <dc:Bounds x="1328" y="209" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1biy4yg_di" bpmnElement="ExclusiveGateway_1biy4yg" isMarkerVisible="true">
-        <dc:Bounds x="1338" y="-1" width="50" height="50" />
+        <dc:Bounds x="1558" y="249" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1363" y="49" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0p61zug_di" bpmnElement="SequenceFlow_0p61zug">
-        <di:waypoint xsi:type="dc:Point" x="1388" y="24" />
-        <di:waypoint xsi:type="dc:Point" x="1436" y="24" />
-        <di:waypoint xsi:type="dc:Point" x="1436" y="-170" />
-        <di:waypoint xsi:type="dc:Point" x="-60" y="-170" />
-        <di:waypoint xsi:type="dc:Point" x="-60" y="1078" />
-        <di:waypoint xsi:type="dc:Point" x="98" y="1078" />
+        <di:waypoint x="1608" y="274" />
+        <di:waypoint x="1656" y="274" />
+        <di:waypoint x="1656" y="80" />
+        <di:waypoint x="160" y="80" />
+        <di:waypoint x="160" y="1328" />
+        <di:waypoint x="318" y="1328" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="688" y="-185" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1k7xbcu_di" bpmnElement="SequenceFlow_1k7xbcu">
-        <di:waypoint xsi:type="dc:Point" x="1290" y="-63" />
-        <di:waypoint xsi:type="dc:Point" x="1363" y="-63" />
-        <di:waypoint xsi:type="dc:Point" x="1363" y="-1" />
+        <di:waypoint x="1510" y="187" />
+        <di:waypoint x="1583" y="187" />
+        <di:waypoint x="1583" y="249" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1327" y="-78" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0ti2a86_di" bpmnElement="Task_0dx8gpp">
-        <dc:Bounds x="616" y="-103" width="100" height="80" />
+        <dc:Bounds x="836" y="147" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1r5f381_di" bpmnElement="Task_0e8s9xm">
-        <dc:Bounds x="796" y="-103" width="100" height="80" />
+        <dc:Bounds x="1016" y="147" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0fajmo7_di" bpmnElement="Task_0cdjxcd">
-        <dc:Bounds x="1190" y="-103" width="100" height="80" />
+        <dc:Bounds x="1410" y="147" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_065935d_di" bpmnElement="Task_19zw1li">
-        <dc:Bounds x="119" y="841" width="100" height="80" />
+        <dc:Bounds x="339" y="1091" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_11w102e_di" bpmnElement="Task_01b1fio">
-        <dc:Bounds x="285" y="841" width="100" height="80" />
+        <dc:Bounds x="505" y="1091" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0thm33s_di" bpmnElement="SequenceFlow_0thm33s">
-        <di:waypoint xsi:type="dc:Point" x="219" y="881" />
-        <di:waypoint xsi:type="dc:Point" x="285" y="881" />
+        <di:waypoint x="439" y="1131" />
+        <di:waypoint x="505" y="1131" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="252" y="856" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0aegg0r_di" bpmnElement="SequenceFlow_0aegg0r">
-        <di:waypoint xsi:type="dc:Point" x="385" y="881" />
-        <di:waypoint xsi:type="dc:Point" x="438" y="881" />
-        <di:waypoint xsi:type="dc:Point" x="438" y="953" />
-        <di:waypoint xsi:type="dc:Point" x="159" y="953" />
-        <di:waypoint xsi:type="dc:Point" x="159" y="1031" />
+        <di:waypoint x="605" y="1131" />
+        <di:waypoint x="658" y="1131" />
+        <di:waypoint x="658" y="1203" />
+        <di:waypoint x="379" y="1203" />
+        <di:waypoint x="379" y="1281" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="453" y="917" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn
index e9675b89f8..699ee5bcd1 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.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: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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateVfModuleRollback" name="DoCreateVfModuleRollback" isExecutable="true">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -21,7 +21,7 @@
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_6" name="yes" sourceRef="ExclusiveGateway_1" targetRef="InvokePrepareUpdateAAIVfModule">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFMR_rollbackPrepareUpdateVfModule") == "true" &&  !(execution.getVariable('aLaCarte') == true && execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true")]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFMR_rollbackPrepareUpdateVfModule") == "true" &amp;&amp;  !(execution.getVariable('aLaCarte') == true &amp;&amp; execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true")</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="InvokePrepareUpdateAAIVfModule" targetRef="ExclusiveGateway_2" />
     <bpmn2:sequenceFlow id="SequenceFlow_9" name="no" sourceRef="ExclusiveGateway_1" targetRef="ExclusiveGateway_2" />
@@ -34,15 +34,15 @@
     <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1p0v6yk</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script>
+dcvfmr.prepVNFAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapter" />
-    <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;VNFAdapterTask" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;VNFAdapterTask" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:in source="vnfAdapterTaskRequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="vnfAdapterTaskRequest" target="openstackAdapterTaskRequest" />
         <camunda:out source="WorkflowResponse" target="DoDVfMod_DoCreateVfModuleRollbackResponse" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -51,15 +51,15 @@ dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_08aruzz</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_10" name="yes" sourceRef="ExclusiveGateway_2" targetRef="PrepareSDNCDeactivateRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true" && execution.getVariable("sdncVersion") == "1707"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true" &amp;&amp; execution.getVariable("sdncVersion") == "1707"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_15" name="no" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_1938vz9" />
     <bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
+dcvfmr.prepUpdateAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="UpdateAAIVfModulePrep" targetRef="InvokeUpdateAAIVfModule" />
     <bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke&#10;UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
@@ -78,7 +78,7 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_13" name="yes" sourceRef="ExclusiveGateway_3" targetRef="UpdateAAIVfModulePrep">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackUpdateAAIVfModule") == "true"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackUpdateAAIVfModule") == "true"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_17" name="no" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_4" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_4" name="Rollback SDNC Request?" default="SequenceFlow_20">
@@ -88,15 +88,15 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="ExclusiveGateway_4" targetRef="ExclusiveGateway_1h87hhh">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" || execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" || execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_20" name="no" sourceRef="ExclusiveGateway_4" targetRef="ExclusiveGateway_5" />
     <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1rpg6ac</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
+dcvfmr.prepSDNCAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="InvokeSDNCAdapterV1_2" />
     <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke&#10;SDNCAdapterV1" calledElement="sdncAdapter">
@@ -121,7 +121,7 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="ExclusiveGateway_5" targetRef="SetSuccessfulRollbackStatus" />
     <bpmn2:sequenceFlow id="SequenceFlow_24" name="yes" sourceRef="ExclusiveGateway_5" targetRef="DeleteAAIVfModulePrep">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackCreateAAIVfModule") == "true"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackCreateAAIVfModule") == "true"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke&#10;DeleteAAIVfModule" calledElement="DeleteAAIVfModule">
       <bpmn2:extensionElements>
@@ -141,18 +141,18 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
+dcvfmr.prepDeleteAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="DeleteAAIVfModulePrep" targetRef="InvokeDeleteAAIVfModule" />
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="InvokeSDNCAdapterV1_2" targetRef="ScriptTask_1" />
     <bpmn2:scriptTask id="ScriptTask_1" name="Validate SDNC Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)]]></bpmn2:script>
+dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_1" targetRef="ExclusiveGateway_5" />
     <bpmn2:subProcess id="SubProcess_1" name="Rollback Error Handling" triggeredByEvent="true">
@@ -168,18 +168,18 @@ dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)]
       <bpmn2:scriptTask id="LogSaveWorkflowException" name="Log and Save Workflow Exception" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_02fx6z6</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
 dcvfmr.logWorkflowException(execution, 'DoCreateVfModuleRollback caught an event')
-dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></bpmn2:script>
+dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_02fx6z6" sourceRef="SetFailedRollbackStatus" targetRef="LogSaveWorkflowException" />
       <bpmn2:scriptTask id="SetFailedRollbackStatus" name="Set Failed Rollback Status" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_02fx6z6</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.setFailedRollbackStatus(execution)]]></bpmn2:script>
+dcvfmr.setFailedRollbackStatus(execution)</bpmn2:script>
       </bpmn2:scriptTask>
     </bpmn2:subProcess>
     <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="SubProcess_1">
@@ -193,9 +193,9 @@ dcvfmr.setFailedRollbackStatus(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessRequest(execution)]]></bpmn2:script>
+dcvfmr.preProcessRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="InitializeVariables" targetRef="ExclusiveGateway_1yozzae" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_0a0hroy" name="Rollback Update AAI Generic VNF?" default="SequenceFlow_185bo77">
@@ -207,16 +207,16 @@ dcvfmr.preProcessRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_08csf14" name="Delete Network Policies from AAI" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0unumxv</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0djpj3r</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.deleteNetworkPoliciesFromAAI(execution)]]></bpmn2:script>
+dcvfmr.deleteNetworkPoliciesFromAAI(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="Task_18r7u02" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_111l1he</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ca4brn</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+dcvfmr.preProcessUpdateAAIGenericVnf(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="Task_01ajtiy" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">
       <bpmn2:extensionElements>
@@ -238,12 +238,12 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_185bo77" name="no" sourceRef="ExclusiveGateway_0a0hroy" targetRef="ExclusiveGateway_0uvarlv" />
     <bpmn2:sequenceFlow id="SequenceFlow_111l1he" name="yes" sourceRef="ExclusiveGateway_0a0hroy" targetRef="Task_18r7u02">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackUpdateVnfAAI") == "true"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackUpdateVnfAAI") == "true"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_0ca4brn" sourceRef="Task_18r7u02" targetRef="Task_01ajtiy" />
     <bpmn2:sequenceFlow id="SequenceFlow_19r2uus" sourceRef="Task_01ajtiy" targetRef="ExclusiveGateway_0uvarlv" />
     <bpmn2:sequenceFlow id="SequenceFlow_1p0v6yk" name="yes&#10;&#10;" sourceRef="ExclusiveGateway_0uvarlv" targetRef="VNFAdapterPrep">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackVnfAdapterCreate") == "true"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackVnfAdapterCreate") == "true"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_03i4czf" name="no" sourceRef="ExclusiveGateway_0uvarlv" targetRef="ExclusiveGateway_0ahc44p" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1yozzae" name="Skip Rollback?" default="SequenceFlow_11er1t8">
@@ -253,7 +253,7 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_11er1t8" name="no" sourceRef="ExclusiveGateway_1yozzae" targetRef="ExclusiveGateway_1" />
     <bpmn2:sequenceFlow id="SequenceFlow_0ggp8wz" name="yes" sourceRef="ExclusiveGateway_1yozzae" targetRef="EndEvent_9">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("skipRollback" )  == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("skipRollback" )  == true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1938vz9" name="Rollback Network Policies Creation?" default="SequenceFlow_0n58kg1">
       <bpmn2:incoming>SequenceFlow_06rm0hg</bpmn2:incoming>
@@ -264,9 +264,9 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PrepareSDNCDeactivateRequest" name="Prepare SDNC Deactivate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ugalf8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
+dcvfmr.preProcessSDNCDeactivateRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallSDNCDeactivate" name="Call SDNC Adapter Deactivate" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -284,26 +284,26 @@ dcvfmr.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PostProcessSDNCDeactivateRequest" name="PostProcess SDNC Deactivate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0n78x37</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_06rm0hg</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
 String response = execution.getVariable("DCVFMR_deactivateSDNCAdapterResponse")
-dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
+dcvfmr.sdncValidateResponse(execution, response)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0ugalf8" sourceRef="PrepareSDNCDeactivateRequest" targetRef="CallSDNCDeactivate" />
     <bpmn2:sequenceFlow id="SequenceFlow_0n78x37" sourceRef="CallSDNCDeactivate" targetRef="PostProcessSDNCDeactivateRequest" />
     <bpmn2:sequenceFlow id="SequenceFlow_06rm0hg" sourceRef="PostProcessSDNCDeactivateRequest" targetRef="ExclusiveGateway_1938vz9" />
     <bpmn2:sequenceFlow id="SequenceFlow_0n58kg1" name="no" sourceRef="ExclusiveGateway_1938vz9" targetRef="ExclusiveGateway_0a0hroy" />
     <bpmn2:sequenceFlow id="SequenceFlow_0unumxv" name="yes" sourceRef="ExclusiveGateway_1938vz9" targetRef="Task_08csf14">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackCreateNetworkPoliciesAAI") == "true"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackCreateNetworkPoliciesAAI") == "true"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1iufuuu" sourceRef="PrepareSDNCUnassignRequest" targetRef="CallSDNCAdapterUnassign" />
     <bpmn2:sequenceFlow id="SequenceFlow_1l4n37b" sourceRef="CallSDNCAdapterUnassign" targetRef="PostProcessSDNCUnassignRequest" />
     <bpmn2:scriptTask id="PrepareSDNCUnassignRequest" name="Prepare SDNC Unassign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_16ghmax</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1iufuuu</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
+dcvfmr.preProcessSDNCUnassignRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallSDNCAdapterUnassign" name="Call SDNC Adapter Unassign" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -321,10 +321,10 @@ dcvfmr.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PostProcessSDNCUnassignRequest" name="PostProcess SDNC Unassign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1l4n37b</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12otwa4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
 String response = execution.getVariable("DCVFMR_unassignSDNCAdapterResponse")
-dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
+dcvfmr.sdncValidateResponse(execution, response)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1h87hhh" name="Rollback 1707 SDNC Activate?" default="SequenceFlow_1rpg6ac">
       <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
@@ -333,7 +333,7 @@ dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_1rpg6ac" name="no" sourceRef="ExclusiveGateway_1h87hhh" targetRef="SDNCAdapterPrep2" />
     <bpmn2:sequenceFlow id="SequenceFlow_16ghmax" name="yes" sourceRef="ExclusiveGateway_1h87hhh" targetRef="PrepareSDNCUnassignRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" && execution.getVariable("sdncVersion") == "1707"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" &amp;&amp; execution.getVariable("sdncVersion") == "1707"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_12otwa4" sourceRef="PostProcessSDNCUnassignRequest" targetRef="ExclusiveGateway_5" />
     <bpmn2:sequenceFlow id="SequenceFlow_1h8ve60" sourceRef="SetSuccessfulRollbackStatus" targetRef="EndEvent_9" />
@@ -342,9 +342,9 @@ dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_17it51d</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1h8ve60</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script>
+dcvfmr.setSuccessfulRollbackStatus(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_0ahc44p" name="Set AAI Status to Assigned?" default="SequenceFlow_1gcfdej">
       <bpmn2:incoming>SequenceFlow_03i4czf</bpmn2:incoming>
@@ -354,7 +354,7 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_1gcfdej" name="no" sourceRef="ExclusiveGateway_0ahc44p" targetRef="ExclusiveGateway_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_17ne2iz" name="yes" sourceRef="ExclusiveGateway_0ahc44p" targetRef="Task_1sqxedz">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable('aLaCarte') == true && execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true"]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable('aLaCarte') == true &amp;&amp; execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true"</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_17it51d" sourceRef="Task_0k9gnp2" targetRef="SetSuccessfulRollbackStatus" />
     <bpmn2:sequenceFlow id="SequenceFlow_0fvuowt" sourceRef="Task_1sqxedz" targetRef="Task_0k9gnp2" />
@@ -370,9 +370,9 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_1sqxedz" name="UpdateAAIVfModule To Assigned Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_17ne2iz</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0fvuowt</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)]]></bpmn2:script>
+dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_08aruzz" sourceRef="InvokeVNFAdapter" targetRef="ExclusiveGateway_0ahc44p" />
   </bpmn2:process>
@@ -381,593 +381,593 @@ dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)]]></bpmn2:script>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModuleRollback">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
-        <dc:Bounds x="13" y="100" width="36" height="36" />
+        <dc:Bounds x="203" y="210" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="31" y="141" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">
-        <dc:Bounds x="115" y="78" width="100" height="80" />
+        <dc:Bounds x="305" y="188" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">
-        <di:waypoint xsi:type="dc:Point" x="49" y="118" />
-        <di:waypoint xsi:type="dc:Point" x="115" y="118" />
+        <di:waypoint x="239" y="228" />
+        <di:waypoint x="305" y="228" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="82" y="103" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="InvokePrepareUpdateAAIVfModule">
-        <dc:Bounds x="725" y="23" width="100" height="80" />
+        <dc:Bounds x="915" y="133" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="VNFAdapterPrep">
-        <dc:Bounds x="104" y="763" width="100" height="80" />
+        <dc:Bounds x="294" y="873" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapter">
-        <dc:Bounds x="262" y="763" width="100" height="80" />
+        <dc:Bounds x="452" y="873" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ScriptTask_170" targetElement="_BPMNShape_CallActivity_13">
-        <di:waypoint xsi:type="dc:Point" x="204" y="803" />
-        <di:waypoint xsi:type="dc:Point" x="262" y="803" />
+        <di:waypoint x="394" y="913" />
+        <di:waypoint x="452" y="913" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="225" y="803" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_171" bpmnElement="UpdateAAIVfModulePrep">
-        <dc:Bounds x="732" y="758" width="100" height="80" />
+        <dc:Bounds x="922" y="868" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_14" bpmnElement="InvokeUpdateAAIVfModule">
-        <dc:Bounds x="912" y="758" width="100" height="80" />
+        <dc:Bounds x="1102" y="868" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2">
-        <dc:Bounds x="187" y="995" width="100" height="80" />
+        <dc:Bounds x="377" y="1105" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="InvokeSDNCAdapterV1_2">
-        <dc:Bounds x="327" y="995" width="100" height="80" />
+        <dc:Bounds x="517" y="1105" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="DeleteAAIVfModulePrep">
-        <dc:Bounds x="704" y="998" width="100" height="80" />
+        <dc:Bounds x="894" y="1108" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_16" bpmnElement="InvokeDeleteAAIVfModule">
-        <dc:Bounds x="860" y="998" width="100" height="80" />
+        <dc:Bounds x="1050" y="1108" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_CallActivity_15">
-        <di:waypoint xsi:type="dc:Point" x="287" y="1035" />
-        <di:waypoint xsi:type="dc:Point" x="327" y="1035" />
+        <di:waypoint x="477" y="1145" />
+        <di:waypoint x="517" y="1145" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="307" y="1035" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_CallActivity_16">
-        <di:waypoint xsi:type="dc:Point" x="804" y="1038" />
-        <di:waypoint xsi:type="dc:Point" x="860" y="1038" />
+        <di:waypoint x="994" y="1148" />
+        <di:waypoint x="1050" y="1148" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="820" y="1038" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_169" bpmnElement="EndEvent_9">
-        <dc:Bounds x="1159" y="1105" width="36" height="36" />
+        <dc:Bounds x="1349" y="1215" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1177" y="1146" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_CallActivity_16" targetElement="_BPMNShape_EndEvent_169">
-        <di:waypoint xsi:type="dc:Point" x="960" y="1038" />
-        <di:waypoint xsi:type="dc:Point" x="1078" y="1038" />
-        <di:waypoint xsi:type="dc:Point" x="1078" y="1083" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_CallActivity_16" targetElement="ScriptTask_0lrbhgj_di">
+        <di:waypoint x="1150" y="1148" />
+        <di:waypoint x="1268" y="1148" />
+        <di:waypoint x="1268" y="1193" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1019" y="1023" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_223" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
-        <dc:Bounds x="538" y="93" width="50" height="50" />
+        <dc:Bounds x="728" y="203" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="519" y="152" width="88" height="36" />
+          <dc:Bounds x="708" y="262" width="90" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ExclusiveGateway_223">
-        <di:waypoint xsi:type="dc:Point" x="215" y="118" />
-        <di:waypoint xsi:type="dc:Point" x="278" y="118" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_22" targetElement="ExclusiveGateway_1yozzae_di">
+        <di:waypoint x="405" y="228" />
+        <di:waypoint x="468" y="228" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="247" y="103" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_224" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds x="912" y="92" width="50" height="50" />
+        <dc:Bounds x="1102" y="202" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="897" y="152" width="79" height="24" />
+          <dc:Bounds x="1087" y="262" width="80" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_223">
-        <di:waypoint xsi:type="dc:Point" x="563" y="93" />
-        <di:waypoint xsi:type="dc:Point" x="563" y="63" />
-        <di:waypoint xsi:type="dc:Point" x="725" y="63" />
+        <di:waypoint x="753" y="203" />
+        <di:waypoint x="753" y="173" />
+        <di:waypoint x="915" y="173" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="573" y="39.419820324530114" width="18" height="12" />
+          <dc:Bounds x="764" y="149" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ExclusiveGateway_224">
-        <di:waypoint xsi:type="dc:Point" x="825" y="63" />
-        <di:waypoint xsi:type="dc:Point" x="862" y="63" />
-        <di:waypoint xsi:type="dc:Point" x="937" y="63" />
-        <di:waypoint xsi:type="dc:Point" x="937" y="92" />
+        <di:waypoint x="1015" y="173" />
+        <di:waypoint x="1052" y="173" />
+        <di:waypoint x="1127" y="173" />
+        <di:waypoint x="1127" y="202" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="888" y="63" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_ExclusiveGateway_224">
-        <di:waypoint xsi:type="dc:Point" x="588" y="118" />
-        <di:waypoint xsi:type="dc:Point" x="912" y="117" />
+        <di:waypoint x="778" y="228" />
+        <di:waypoint x="1102" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="743" y="117.50867542935495" width="12" height="12" />
+          <dc:Bounds x="933" y="228" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ScriptTask_170">
-        <di:waypoint xsi:type="dc:Point" x="937" y="142" />
-        <di:waypoint xsi:type="dc:Point" x="937" y="229" />
-        <di:waypoint xsi:type="dc:Point" x="29" y="229" />
-        <di:waypoint xsi:type="dc:Point" x="29" y="321" />
-        <di:waypoint xsi:type="dc:Point" x="203" y="321" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="ScriptTask_17dmaj7_di">
+        <di:waypoint x="1127" y="252" />
+        <di:waypoint x="1127" y="339" />
+        <di:waypoint x="219" y="339" />
+        <di:waypoint x="219" y="431" />
+        <di:waypoint x="393" y="431" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="501" y="235" width="18" height="12" />
+          <dc:Bounds x="692" y="345" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_225" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
-        <dc:Bounds x="594" y="837" width="50" height="50" />
+        <dc:Bounds x="784" y="947" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="578" y="892" width="83" height="24" />
+          <dc:Bounds x="769" y="1002" width="81" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_171">
-        <di:waypoint xsi:type="dc:Point" x="644" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="665" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="665" y="798" />
-        <di:waypoint xsi:type="dc:Point" x="732" y="798" />
+        <di:waypoint x="834" y="972" />
+        <di:waypoint x="855" y="972" />
+        <di:waypoint x="855" y="908" />
+        <di:waypoint x="922" y="908" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="687" y="803" width="18" height="12" />
+          <dc:Bounds x="878" y="913" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_171" targetElement="_BPMNShape_CallActivity_14">
-        <di:waypoint xsi:type="dc:Point" x="832" y="798" />
-        <di:waypoint xsi:type="dc:Point" x="912" y="798" />
+        <di:waypoint x="1022" y="908" />
+        <di:waypoint x="1102" y="908" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="843" y="798" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_226" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
-        <dc:Bounds x="1092" y="837" width="50" height="50" />
+        <dc:Bounds x="1282" y="947" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1078" y="892" width="79" height="24" />
+          <dc:Bounds x="1269" y="1002" width="77" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ExclusiveGateway_225">
-        <di:waypoint xsi:type="dc:Point" x="962" y="117" />
-        <di:waypoint xsi:type="dc:Point" x="1025" y="117" />
-        <di:waypoint xsi:type="dc:Point" x="1025" y="212" />
-        <di:waypoint xsi:type="dc:Point" x="19" y="212" />
-        <di:waypoint xsi:type="dc:Point" x="19" y="382" />
-        <di:waypoint xsi:type="dc:Point" x="922" y="382" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="ExclusiveGateway_1938vz9_di">
+        <di:waypoint x="1152" y="227" />
+        <di:waypoint x="1215" y="227" />
+        <di:waypoint x="1215" y="322" />
+        <di:waypoint x="209" y="322" />
+        <di:waypoint x="209" y="492" />
+        <di:waypoint x="1112" y="492" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="501" y="187" width="12" height="12" />
+          <dc:Bounds x="691" y="297" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ExclusiveGateway_226">
-        <di:waypoint xsi:type="dc:Point" x="644" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="1092" y="862" />
+        <di:waypoint x="834" y="972" />
+        <di:waypoint x="1282" y="972" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="855" y="862" width="12" height="12" />
+          <dc:Bounds x="1045" y="972" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_CallActivity_14" targetElement="_BPMNShape_ExclusiveGateway_226">
-        <di:waypoint xsi:type="dc:Point" x="1012" y="798" />
-        <di:waypoint xsi:type="dc:Point" x="1117" y="798" />
-        <di:waypoint xsi:type="dc:Point" x="1117" y="837" />
+        <di:waypoint x="1202" y="908" />
+        <di:waypoint x="1307" y="908" />
+        <di:waypoint x="1307" y="947" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1090" y="798" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ScriptTask_172">
-        <di:waypoint xsi:type="dc:Point" x="1117" y="887" />
-        <di:waypoint xsi:type="dc:Point" x="1117" y="958" />
-        <di:waypoint xsi:type="dc:Point" x="34" y="958" />
-        <di:waypoint xsi:type="dc:Point" x="34" y="1103" />
-        <di:waypoint xsi:type="dc:Point" x="56" y="1103" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="ExclusiveGateway_1h87hhh_di">
+        <di:waypoint x="1307" y="997" />
+        <di:waypoint x="1307" y="1068" />
+        <di:waypoint x="224" y="1068" />
+        <di:waypoint x="224" y="1213" />
+        <di:waypoint x="246" y="1213" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="262" y="958" width="18" height="12" />
+          <dc:Bounds x="453" y="1068" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_227" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">
-        <dc:Bounds x="589" y="1098" width="50" height="50" />
+        <dc:Bounds x="779" y="1208" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="578" y="1153" width="71" height="24" />
+          <dc:Bounds x="769" y="1263" width="70" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ExclusiveGateway_227">
-        <di:waypoint xsi:type="dc:Point" x="1092" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="1029" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="1029" y="942" />
-        <di:waypoint xsi:type="dc:Point" x="25" y="942" />
-        <di:waypoint xsi:type="dc:Point" x="25" y="1246" />
-        <di:waypoint xsi:type="dc:Point" x="614" y="1246" />
-        <di:waypoint xsi:type="dc:Point" x="614" y="1148" />
+        <di:waypoint x="1282" y="972" />
+        <di:waypoint x="1219" y="972" />
+        <di:waypoint x="1219" y="1052" />
+        <di:waypoint x="215" y="1052" />
+        <di:waypoint x="215" y="1356" />
+        <di:waypoint x="804" y="1356" />
+        <di:waypoint x="804" y="1258" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="976" y="912" width="12" height="12" />
+          <dc:Bounds x="1166" y="1022" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_EndEvent_169">
-        <di:waypoint xsi:type="dc:Point" x="639" y="1123" />
-        <di:waypoint xsi:type="dc:Point" x="1028" y="1123" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="ScriptTask_0lrbhgj_di">
+        <di:waypoint x="829" y="1233" />
+        <di:waypoint x="1218" y="1233" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="811" y="1123" width="12" height="12" />
+          <dc:Bounds x="1001" y="1233" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="639" y="1123" />
-        <di:waypoint xsi:type="dc:Point" x="664" y="1123" />
-        <di:waypoint xsi:type="dc:Point" x="664" y="1067" />
-        <di:waypoint xsi:type="dc:Point" x="664" y="1038" />
-        <di:waypoint xsi:type="dc:Point" x="704" y="1038" />
+        <di:waypoint x="829" y="1233" />
+        <di:waypoint x="854" y="1233" />
+        <di:waypoint x="854" y="1177" />
+        <di:waypoint x="854" y="1148" />
+        <di:waypoint x="894" y="1148" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="679" y="1044" width="18" height="12" />
+          <dc:Bounds x="870" y="1154" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_255" bpmnElement="ScriptTask_1">
-        <dc:Bounds x="461" y="995" width="100" height="80" />
+        <dc:Bounds x="651" y="1105" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_CallActivity_15" targetElement="_BPMNShape_ScriptTask_255">
-        <di:waypoint xsi:type="dc:Point" x="427" y="1035" />
-        <di:waypoint xsi:type="dc:Point" x="461" y="1035" />
+        <di:waypoint x="617" y="1145" />
+        <di:waypoint x="651" y="1145" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="446" y="1035" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_255" targetElement="_BPMNShape_ExclusiveGateway_227">
-        <di:waypoint xsi:type="dc:Point" x="561" y="1035" />
-        <di:waypoint xsi:type="dc:Point" x="614" y="1035" />
-        <di:waypoint xsi:type="dc:Point" x="614" y="1098" />
+        <di:waypoint x="751" y="1145" />
+        <di:waypoint x="804" y="1145" />
+        <di:waypoint x="804" y="1208" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="614" y="1040" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_22" bpmnElement="SubProcess_1" isExpanded="true">
-        <dc:Bounds x="27" y="1464" width="699" height="159" />
+        <dc:Bounds x="217" y="1574" width="699" height="159" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_59" bpmnElement="CatchExceptions">
-        <dc:Bounds x="47" y="1515" width="36" height="36" />
+        <dc:Bounds x="237" y="1625" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="53" y="1560" width="86" height="12" />
+          <dc:Bounds x="243" y="1670" width="87" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_281" bpmnElement="LogSaveWorkflowException">
-        <dc:Bounds x="391" y="1493" width="100" height="80" />
+        <dc:Bounds x="581" y="1603" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_188" bpmnElement="EndEvent_1">
-        <dc:Bounds x="565" y="1515" width="36" height="36" />
+        <dc:Bounds x="755" y="1625" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="583" y="1551" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_55" bpmnElement="BoundaryEvent_1">
-        <dc:Bounds x="708" y="1514" width="36" height="36" />
+        <dc:Bounds x="898" y="1624" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="726" y="1550" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_189" bpmnElement="EndEvent_2">
-        <dc:Bounds x="880" y="1514" width="36" height="36" />
+        <dc:Bounds x="1070" y="1624" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="898" y="1555" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_BoundaryEvent_55" targetElement="_BPMNShape_EndEvent_189">
-        <di:waypoint xsi:type="dc:Point" x="744" y="1532" />
-        <di:waypoint xsi:type="dc:Point" x="818" y="1532" />
-        <di:waypoint xsi:type="dc:Point" x="818" y="1532" />
-        <di:waypoint xsi:type="dc:Point" x="880" y="1532" />
+        <di:waypoint x="934" y="1642" />
+        <di:waypoint x="1008" y="1642" />
+        <di:waypoint x="1008" y="1642" />
+        <di:waypoint x="1070" y="1642" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="833" y="1532" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0a0hroy_di" bpmnElement="ExclusiveGateway_0a0hroy" isMarkerVisible="true">
-        <dc:Bounds x="413" y="588" width="50" height="50" />
+        <dc:Bounds x="603" y="698" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="397" y="638" width="84" height="38" />
+          <dc:Bounds x="584" y="748" width="90" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0mnb4d7_di" bpmnElement="Task_08csf14">
-        <dc:Bounds x="212" y="507" width="100" height="80" />
+        <dc:Bounds x="402" y="617" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1shi2a6_di" bpmnElement="Task_18r7u02">
-        <dc:Bounds x="552" y="507" width="100" height="80" />
+        <dc:Bounds x="742" y="617" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0zvct4i_di" bpmnElement="Task_01ajtiy">
-        <dc:Bounds x="747" y="507" width="100" height="80" />
+        <dc:Bounds x="937" y="617" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0djpj3r_di" bpmnElement="SequenceFlow_0djpj3r">
-        <di:waypoint xsi:type="dc:Point" x="312" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="438" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="438" y="589" />
+        <di:waypoint x="502" y="657" />
+        <di:waypoint x="628" y="657" />
+        <di:waypoint x="628" y="699" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="375" y="532" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0uvarlv_di" bpmnElement="ExclusiveGateway_0uvarlv" isMarkerVisible="true">
-        <dc:Bounds x="921" y="588" width="50" height="50" />
+        <dc:Bounds x="1111" y="698" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="907" y="638" width="78" height="26" />
+          <dc:Bounds x="1096" y="748" width="80" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_185bo77_di" bpmnElement="SequenceFlow_185bo77">
-        <di:waypoint xsi:type="dc:Point" x="463" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="692" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="692" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="921" y="613" />
+        <di:waypoint x="653" y="723" />
+        <di:waypoint x="882" y="723" />
+        <di:waypoint x="882" y="723" />
+        <di:waypoint x="1111" y="723" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="701" y="613" width="12" height="14" />
+          <dc:Bounds x="891" y="723" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_111l1he_di" bpmnElement="SequenceFlow_111l1he">
-        <di:waypoint xsi:type="dc:Point" x="463" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="493" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="493" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="552" y="547" />
+        <di:waypoint x="653" y="723" />
+        <di:waypoint x="683" y="723" />
+        <di:waypoint x="683" y="657" />
+        <di:waypoint x="742" y="657" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="508" y="553" width="18" height="14" />
+          <dc:Bounds x="699" y="663" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ca4brn_di" bpmnElement="SequenceFlow_0ca4brn">
-        <di:waypoint xsi:type="dc:Point" x="652" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="693" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="693" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="747" y="547" />
+        <di:waypoint x="842" y="657" />
+        <di:waypoint x="883" y="657" />
+        <di:waypoint x="883" y="657" />
+        <di:waypoint x="937" y="657" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="708" y="547" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_19r2uus_di" bpmnElement="SequenceFlow_19r2uus">
-        <di:waypoint xsi:type="dc:Point" x="847" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="946" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="946" y="588" />
+        <di:waypoint x="1037" y="657" />
+        <di:waypoint x="1136" y="657" />
+        <di:waypoint x="1136" y="698" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="897" y="532" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1p0v6yk_di" bpmnElement="SequenceFlow_1p0v6yk">
-        <di:waypoint xsi:type="dc:Point" x="946" y="638" />
-        <di:waypoint xsi:type="dc:Point" x="946" y="724" />
-        <di:waypoint xsi:type="dc:Point" x="47" y="724" />
-        <di:waypoint xsi:type="dc:Point" x="47" y="803" />
-        <di:waypoint xsi:type="dc:Point" x="104" y="803" />
+        <di:waypoint x="1136" y="748" />
+        <di:waypoint x="1136" y="834" />
+        <di:waypoint x="237" y="834" />
+        <di:waypoint x="237" y="913" />
+        <di:waypoint x="294" y="913" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="507" y="732" width="18" height="14" />
+          <dc:Bounds x="698" y="842" width="17" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_03i4czf_di" bpmnElement="SequenceFlow_03i4czf">
-        <di:waypoint xsi:type="dc:Point" x="971" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="1036" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="1036" y="709" />
-        <di:waypoint xsi:type="dc:Point" x="30" y="709" />
-        <di:waypoint xsi:type="dc:Point" x="30" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="466" y="862" />
+        <di:waypoint x="1161" y="723" />
+        <di:waypoint x="1226" y="723" />
+        <di:waypoint x="1226" y="819" />
+        <di:waypoint x="220" y="819" />
+        <di:waypoint x="220" y="972" />
+        <di:waypoint x="656" y="972" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="508" y="683" width="12" height="12" />
+          <dc:Bounds x="698" y="793" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1yozzae_di" bpmnElement="ExclusiveGateway_1yozzae" isMarkerVisible="true">
-        <dc:Bounds x="278" y="93" width="50" height="50" />
+        <dc:Bounds x="468" y="203" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="267" y="143" width="72" height="12" />
+          <dc:Bounds x="457" y="253" width="73" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_11er1t8_di" bpmnElement="SequenceFlow_11er1t8">
-        <di:waypoint xsi:type="dc:Point" x="328" y="118" />
-        <di:waypoint xsi:type="dc:Point" x="538" y="118" />
+        <di:waypoint x="518" y="228" />
+        <di:waypoint x="728" y="228" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="357" y="91.50148837900852" width="12" height="12" />
+          <dc:Bounds x="547" y="202" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ggp8wz_di" bpmnElement="SequenceFlow_0ggp8wz">
-        <di:waypoint xsi:type="dc:Point" x="303" y="93" />
-        <di:waypoint xsi:type="dc:Point" x="303" y="-11" />
-        <di:waypoint xsi:type="dc:Point" x="1158" y="-11" />
-        <di:waypoint xsi:type="dc:Point" x="1177" y="1105" />
+        <di:waypoint x="493" y="203" />
+        <di:waypoint x="493" y="99" />
+        <di:waypoint x="1348" y="99" />
+        <di:waypoint x="1367" y="1215" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="723" y="-26" width="18" height="14" />
+          <dc:Bounds x="914" y="84" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_281" targetElement="_BPMNShape_EndEvent_188">
-        <di:waypoint xsi:type="dc:Point" x="491" y="1533" />
-        <di:waypoint xsi:type="dc:Point" x="565" y="1533" />
+        <di:waypoint x="681" y="1643" />
+        <di:waypoint x="755" y="1643" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="528" y="1518" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_StartEvent_59" targetElement="_BPMNShape_ScriptTask_281">
-        <di:waypoint xsi:type="dc:Point" x="83" y="1533" />
-        <di:waypoint xsi:type="dc:Point" x="198" y="1533" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_StartEvent_59" targetElement="ScriptTask_0cd144f_di">
+        <di:waypoint x="273" y="1643" />
+        <di:waypoint x="388" y="1643" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="141" y="1518" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1938vz9_di" bpmnElement="ExclusiveGateway_1938vz9" isMarkerVisible="true">
-        <dc:Bounds x="921.561377245509" y="357" width="50" height="50" />
+        <dc:Bounds x="1112" y="467" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="902" y="407" width="90" height="24" />
+          <dc:Bounds x="1093" y="517" width="89" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_17dmaj7_di" bpmnElement="PrepareSDNCDeactivateRequest">
-        <dc:Bounds x="204" y="281" width="100" height="80" />
+        <dc:Bounds x="394" y="391" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0ouj5y6_di" bpmnElement="CallSDNCDeactivate">
-        <dc:Bounds x="401" y="280" width="100" height="80" />
+        <dc:Bounds x="591" y="390" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1fmh02z_di" bpmnElement="PostProcessSDNCDeactivateRequest">
-        <dc:Bounds x="613" y="280" width="100" height="80" />
+        <dc:Bounds x="803" y="390" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ugalf8_di" bpmnElement="SequenceFlow_0ugalf8">
-        <di:waypoint xsi:type="dc:Point" x="304" y="321" />
-        <di:waypoint xsi:type="dc:Point" x="401" y="320" />
+        <di:waypoint x="494" y="431" />
+        <di:waypoint x="591" y="430" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="353" y="295.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0n78x37_di" bpmnElement="SequenceFlow_0n78x37">
-        <di:waypoint xsi:type="dc:Point" x="501" y="320" />
-        <di:waypoint xsi:type="dc:Point" x="613" y="320" />
+        <di:waypoint x="691" y="430" />
+        <di:waypoint x="803" y="430" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="557" y="295" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_06rm0hg_di" bpmnElement="SequenceFlow_06rm0hg">
-        <di:waypoint xsi:type="dc:Point" x="713" y="320" />
-        <di:waypoint xsi:type="dc:Point" x="947" y="320" />
-        <di:waypoint xsi:type="dc:Point" x="947" y="357" />
+        <di:waypoint x="903" y="430" />
+        <di:waypoint x="1137" y="430" />
+        <di:waypoint x="1137" y="467" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="830" y="305" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0n58kg1_di" bpmnElement="SequenceFlow_0n58kg1">
-        <di:waypoint xsi:type="dc:Point" x="972" y="382" />
-        <di:waypoint xsi:type="dc:Point" x="1033" y="382" />
-        <di:waypoint xsi:type="dc:Point" x="1033" y="466" />
-        <di:waypoint xsi:type="dc:Point" x="14" y="466" />
-        <di:waypoint xsi:type="dc:Point" x="14" y="613" />
-        <di:waypoint xsi:type="dc:Point" x="413" y="613" />
+        <di:waypoint x="1162" y="492" />
+        <di:waypoint x="1223" y="492" />
+        <di:waypoint x="1223" y="576" />
+        <di:waypoint x="204" y="576" />
+        <di:waypoint x="204" y="723" />
+        <di:waypoint x="603" y="723" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="508" y="444" width="12" height="12" />
+          <dc:Bounds x="698" y="554" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0unumxv_di" bpmnElement="SequenceFlow_0unumxv">
-        <di:waypoint xsi:type="dc:Point" x="947" y="407" />
-        <di:waypoint xsi:type="dc:Point" x="947" y="482" />
-        <di:waypoint xsi:type="dc:Point" x="32" y="482" />
-        <di:waypoint xsi:type="dc:Point" x="32" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="211" y="547" />
+        <di:waypoint x="1137" y="517" />
+        <di:waypoint x="1137" y="592" />
+        <di:waypoint x="222" y="592" />
+        <di:waypoint x="222" y="657" />
+        <di:waypoint x="401" y="657" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="506" y="493" width="18" height="12" />
+          <dc:Bounds x="697" y="603" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1iufuuu_di" bpmnElement="SequenceFlow_1iufuuu">
-        <di:waypoint xsi:type="dc:Point" x="287" y="1177" />
-        <di:waypoint xsi:type="dc:Point" x="328" y="1177" />
+        <di:waypoint x="477" y="1287" />
+        <di:waypoint x="518" y="1287" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="308" y="1162" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1l4n37b_di" bpmnElement="SequenceFlow_1l4n37b">
-        <di:waypoint xsi:type="dc:Point" x="428" y="1177" />
-        <di:waypoint xsi:type="dc:Point" x="469" y="1176" />
+        <di:waypoint x="618" y="1287" />
+        <di:waypoint x="659" y="1286" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="449" y="1161.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0qvylv2_di" bpmnElement="PrepareSDNCUnassignRequest">
-        <dc:Bounds x="187" y="1138" width="100" height="80" />
+        <dc:Bounds x="377" y="1248" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1stidyk_di" bpmnElement="CallSDNCAdapterUnassign">
-        <dc:Bounds x="328" y="1137" width="100" height="80" />
+        <dc:Bounds x="518" y="1247" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1ub9z2k_di" bpmnElement="PostProcessSDNCUnassignRequest">
-        <dc:Bounds x="469" y="1136" width="100" height="80" />
+        <dc:Bounds x="659" y="1246" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1h87hhh_di" bpmnElement="ExclusiveGateway_1h87hhh" isMarkerVisible="true">
-        <dc:Bounds x="55.989141164856846" y="1077.9259624876604" width="50" height="50" />
+        <dc:Bounds x="246" y="1188" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="41" y="1127.9259624876604" width="79" height="24" />
+          <dc:Bounds x="231" y="1238" width="80" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1rpg6ac_di" bpmnElement="SequenceFlow_1rpg6ac">
-        <di:waypoint xsi:type="dc:Point" x="81" y="1078" />
-        <di:waypoint xsi:type="dc:Point" x="81" y="1035" />
-        <di:waypoint xsi:type="dc:Point" x="187" y="1035" />
+        <di:waypoint x="271" y="1188" />
+        <di:waypoint x="271" y="1145" />
+        <di:waypoint x="377" y="1145" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="100" y="1010.5" width="12" height="12" />
+          <dc:Bounds x="290" y="1121" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_16ghmax_di" bpmnElement="SequenceFlow_16ghmax">
-        <di:waypoint xsi:type="dc:Point" x="81" y="1128" />
-        <di:waypoint xsi:type="dc:Point" x="81" y="1178" />
-        <di:waypoint xsi:type="dc:Point" x="187" y="1178" />
+        <di:waypoint x="271" y="1238" />
+        <di:waypoint x="271" y="1288" />
+        <di:waypoint x="377" y="1288" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="92" y="1182" width="18" height="12" />
+          <dc:Bounds x="283" y="1292" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_12otwa4_di" bpmnElement="SequenceFlow_12otwa4">
-        <di:waypoint xsi:type="dc:Point" x="569" y="1176" />
-        <di:waypoint xsi:type="dc:Point" x="579" y="1176" />
-        <di:waypoint xsi:type="dc:Point" x="579" y="1123" />
-        <di:waypoint xsi:type="dc:Point" x="589" y="1123" />
+        <di:waypoint x="759" y="1286" />
+        <di:waypoint x="769" y="1286" />
+        <di:waypoint x="769" y="1233" />
+        <di:waypoint x="779" y="1233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="594" y="1139.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1h8ve60_di" bpmnElement="SequenceFlow_1h8ve60">
-        <di:waypoint xsi:type="dc:Point" x="1128" y="1123" />
-        <di:waypoint xsi:type="dc:Point" x="1159" y="1123" />
+        <di:waypoint x="1318" y="1233" />
+        <di:waypoint x="1349" y="1233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1144" y="1108" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0lrbhgj_di" bpmnElement="SetSuccessfulRollbackStatus">
-        <dc:Bounds x="1028" y="1083" width="100" height="80" />
+        <dc:Bounds x="1218" y="1193" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_02fx6z6_di" bpmnElement="SequenceFlow_02fx6z6">
-        <di:waypoint xsi:type="dc:Point" x="298" y="1533" />
-        <di:waypoint xsi:type="dc:Point" x="391" y="1533" />
+        <di:waypoint x="488" y="1643" />
+        <di:waypoint x="581" y="1643" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="345" y="1518" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0cd144f_di" bpmnElement="SetFailedRollbackStatus">
-        <dc:Bounds x="198" y="1493" width="100" height="80" />
+        <dc:Bounds x="388" y="1603" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0ahc44p_di" bpmnElement="ExclusiveGateway_0ahc44p" isMarkerVisible="true">
-        <dc:Bounds x="465.5588822355289" y="837" width="50" height="50" />
+        <dc:Bounds x="656" y="947" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="500" y="805" width="82" height="24" />
+          <dc:Bounds x="689" y="915" width="84" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1gcfdej_di" bpmnElement="SequenceFlow_1gcfdej">
-        <di:waypoint xsi:type="dc:Point" x="516" y="862" />
-        <di:waypoint xsi:type="dc:Point" x="594" y="862" />
+        <di:waypoint x="706" y="972" />
+        <di:waypoint x="784" y="972" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="551" y="837.0195010054398" width="12" height="12" />
+          <dc:Bounds x="741" y="947" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17ne2iz_di" bpmnElement="SequenceFlow_17ne2iz">
-        <di:waypoint xsi:type="dc:Point" x="491" y="887" />
-        <di:waypoint xsi:type="dc:Point" x="491" y="931" />
-        <di:waypoint xsi:type="dc:Point" x="-38" y="931" />
-        <di:waypoint xsi:type="dc:Point" x="-38" y="1347" />
-        <di:waypoint xsi:type="dc:Point" x="104" y="1347" />
+        <di:waypoint x="681" y="997" />
+        <di:waypoint x="681" y="1041" />
+        <di:waypoint x="152" y="1041" />
+        <di:waypoint x="152" y="1457" />
+        <di:waypoint x="294" y="1457" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="459" y="884.8446601941747" width="18" height="12" />
+          <dc:Bounds x="650" y="995" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17it51d_di" bpmnElement="SequenceFlow_17it51d">
-        <di:waypoint xsi:type="dc:Point" x="362" y="1347" />
-        <di:waypoint xsi:type="dc:Point" x="1078" y="1347" />
-        <di:waypoint xsi:type="dc:Point" x="1078" y="1163" />
+        <di:waypoint x="552" y="1457" />
+        <di:waypoint x="1268" y="1457" />
+        <di:waypoint x="1268" y="1273" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="720" y="1332" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0fvuowt_di" bpmnElement="SequenceFlow_0fvuowt">
-        <di:waypoint xsi:type="dc:Point" x="204" y="1347" />
-        <di:waypoint xsi:type="dc:Point" x="262" y="1347" />
+        <di:waypoint x="394" y="1457" />
+        <di:waypoint x="452" y="1457" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="233" y="1332" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0i5a02m_di" bpmnElement="Task_0k9gnp2">
-        <dc:Bounds x="262" y="1307" width="100" height="80" />
+        <dc:Bounds x="452" y="1417" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_008e45v_di" bpmnElement="Task_1sqxedz">
-        <dc:Bounds x="104" y="1308" width="100" height="80" />
+        <dc:Bounds x="294" y="1418" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_08aruzz_di" bpmnElement="SequenceFlow_08aruzz">
-        <di:waypoint xsi:type="dc:Point" x="362" y="803" />
-        <di:waypoint xsi:type="dc:Point" x="491" y="803" />
-        <di:waypoint xsi:type="dc:Point" x="491" y="837" />
+        <di:waypoint x="552" y="913" />
+        <di:waypoint x="681" y="913" />
+        <di:waypoint x="681" y="947" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="427" y="778" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn
index 6f3dceda84..b5cb1bf255 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
   <bpmn:process id="DoCreateVfModuleVolumeRollback" name="DoCreateVfModuleVolumeRollback" isExecutable="true">
     <bpmn:subProcess id="SubProcess_1p4663w" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
       <bpmn:scriptTask id="ScriptTask_0by1uwk" name="Log / Print Unexpected Error" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_0xktw7v</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_0soe5t3</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback()
-doCreateVfModuleVolumeRollback.processJavaException(execution)]]></bpmn:script>
+doCreateVfModuleVolumeRollback.processJavaException(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:startEvent id="StartEvent_1j0eixl">
         <bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
@@ -33,9 +33,9 @@ doCreateVfModuleVolumeRollback.processJavaException(execution)]]></bpmn:script>
       <bpmn:outgoing>SequenceFlow_0h7k68j</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_10dawse</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:callActivity id="CallActivity_03pmk7v" name="Call VNF Adapter Rollback" calledElement="vnfAdapterTask">
+    <bpmn:callActivity id="CallActivity_03pmk7v" name="Call VNF Adapter Rollback" calledElement="openstackAdapterTask">
       <bpmn:extensionElements>
-        <camunda:in source="DCVFMODVOLRBK_rollbackVnfARequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="DCVFMODVOLRBK_rollbackVnfARequest" target="openstackAdapterTaskRequest" />
         <camunda:out source="workflowException" target="workflowException" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -44,15 +44,15 @@ doCreateVfModuleVolumeRollback.processJavaException(execution)]]></bpmn:script>
       <bpmn:outgoing>SequenceFlow_0bv04qn</bpmn:outgoing>
     </bpmn:callActivity>
     <bpmn:sequenceFlow id="SequenceFlow_0h7k68j" sourceRef="ExclusiveGateway_03qps8q" targetRef="CallActivity_03pmk7v">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMODVOLRBK_isCreateVnfRollbackNeeded") == "true"}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("DCVFMODVOLRBK_isCreateVnfRollbackNeeded") == "true"}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:scriptTask id="ScriptTask_1numqm0" name="Delete Volume Group" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0bv04qn</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_17k6oyz</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_13nb3n0</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback()
-doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script>
+doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_0bv04qn" sourceRef="CallActivity_03pmk7v" targetRef="ScriptTask_1numqm0" />
     <bpmn:sequenceFlow id="SequenceFlow_10dawse" sourceRef="ExclusiveGateway_03qps8q" targetRef="ExclusiveGateway_1dzejtx" />
@@ -63,7 +63,7 @@ doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', exe
       <bpmn:outgoing>SequenceFlow_1do0853</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="SequenceFlow_17k6oyz" sourceRef="ExclusiveGateway_1dzejtx" targetRef="ScriptTask_1numqm0">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMODVOLRBK_isAAIRollbackNeeded" ) == "true"}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("DCVFMODVOLRBK_isAAIRollbackNeeded" ) == "true"}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_1do0853" sourceRef="ExclusiveGateway_1dzejtx" targetRef="EndEvent_1ddbl39" />
     <bpmn:endEvent id="EndEvent_1ddbl39">
@@ -74,14 +74,14 @@ doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', exe
       <bpmn:incoming>SequenceFlow_13nb3n0</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="SequenceFlow_11y7faf" sourceRef="ExclusiveGateway_128ycfs" targetRef="ExclusiveGateway_03qps8q">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMODVOLRBK_backoutOnFailure") != "false"}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("DCVFMODVOLRBK_backoutOnFailure") != "false"}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:scriptTask id="ScriptTask_0uhy9lc" name="Pre process" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0qreiaa</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1xah9es</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback()
-doCreateVfModuleVolumeRollback.preProcessRequest(execution)]]></bpmn:script>
+doCreateVfModuleVolumeRollback.preProcessRequest(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_1wberw3" sourceRef="ExclusiveGateway_128ycfs" targetRef="EndEvent_1ddbl39" />
     <bpmn:sequenceFlow id="SequenceFlow_0qreiaa" sourceRef="StartEvent_0128tti" targetRef="ScriptTask_0uhy9lc" />
@@ -90,153 +90,153 @@ doCreateVfModuleVolumeRollback.preProcessRequest(execution)]]></bpmn:script>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModuleVolumeRollback">
       <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
-        <dc:Bounds x="293" y="165" width="394" height="188" />
+        <dc:Bounds x="293" y="365" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
-        <dc:Bounds x="441" y="220" width="100" height="80" />
+        <dc:Bounds x="441" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
-        <dc:Bounds x="326" y="242" width="36" height="36" />
+        <dc:Bounds x="326" y="442" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="344" y="283" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
-        <dc:Bounds x="602" y="242" width="36" height="36" />
+        <dc:Bounds x="602" y="442" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="620" y="283" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
-        <di:waypoint xsi:type="dc:Point" x="362" y="260" />
-        <di:waypoint xsi:type="dc:Point" x="441" y="260" />
+        <di:waypoint x="362" y="460" />
+        <di:waypoint x="441" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="404" y="260" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
-        <di:waypoint xsi:type="dc:Point" x="541" y="260" />
-        <di:waypoint xsi:type="dc:Point" x="602" y="260" />
+        <di:waypoint x="541" y="460" />
+        <di:waypoint x="602" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="576" y="260" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="StartEvent_0128tti_di" bpmnElement="StartEvent_0128tti">
-        <dc:Bounds x="173" y="-93" width="36" height="36" />
+        <dc:Bounds x="173" y="107" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="167" y="-52" width="50" height="12" />
+          <dc:Bounds x="166" y="148" width="52" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_128ycfs_di" bpmnElement="ExclusiveGateway_128ycfs" isMarkerVisible="true">
-        <dc:Bounds x="465" y="-100" width="50" height="50" />
+        <dc:Bounds x="465" y="100" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="450" y="-50" width="79" height="12" />
+          <dc:Bounds x="450" y="150" width="79" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_03qps8q_di" bpmnElement="ExclusiveGateway_03qps8q" isMarkerVisible="true">
-        <dc:Bounds x="607" y="-100" width="50" height="50" />
+        <dc:Bounds x="607" y="100" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="606" y="-50" width="52" height="12" />
+          <dc:Bounds x="606" y="150" width="52" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_03pmk7v_di" bpmnElement="CallActivity_03pmk7v">
-        <dc:Bounds x="786" y="-115" width="100" height="80" />
+        <dc:Bounds x="786" y="85" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0h7k68j_di" bpmnElement="SequenceFlow_0h7k68j">
-        <di:waypoint xsi:type="dc:Point" x="657" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="786" y="-75" />
+        <di:waypoint x="657" y="125" />
+        <di:waypoint x="786" y="125" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="722" y="-90" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1numqm0_di" bpmnElement="ScriptTask_1numqm0">
-        <dc:Bounds x="998" y="-115" width="100" height="80" />
+        <dc:Bounds x="998" y="85" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0bv04qn_di" bpmnElement="SequenceFlow_0bv04qn">
-        <di:waypoint xsi:type="dc:Point" x="886" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="937" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="937" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="998" y="-75" />
+        <di:waypoint x="886" y="125" />
+        <di:waypoint x="937" y="125" />
+        <di:waypoint x="937" y="125" />
+        <di:waypoint x="998" y="125" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="952" y="-75" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_10dawse_di" bpmnElement="SequenceFlow_10dawse">
-        <di:waypoint xsi:type="dc:Point" x="632" y="-50" />
-        <di:waypoint xsi:type="dc:Point" x="632" y="40" />
-        <di:waypoint xsi:type="dc:Point" x="811" y="40" />
+        <di:waypoint x="632" y="150" />
+        <di:waypoint x="632" y="240" />
+        <di:waypoint x="811" y="240" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="648" y="-5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_13nb3n0_di" bpmnElement="SequenceFlow_13nb3n0">
-        <di:waypoint xsi:type="dc:Point" x="1098" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="1151" y="-75" />
+        <di:waypoint x="1098" y="125" />
+        <di:waypoint x="1151" y="125" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1125" y="-90" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1dzejtx_di" bpmnElement="ExclusiveGateway_1dzejtx" isMarkerVisible="true">
-        <dc:Bounds x="811" y="15" width="50" height="50" />
+        <dc:Bounds x="811" y="215" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="809" y="65" width="53" height="12" />
+          <dc:Bounds x="809" y="265" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_17k6oyz_di" bpmnElement="SequenceFlow_17k6oyz">
-        <di:waypoint xsi:type="dc:Point" x="861" y="40" />
-        <di:waypoint xsi:type="dc:Point" x="1048" y="40" />
-        <di:waypoint xsi:type="dc:Point" x="1048" y="-35" />
+        <di:waypoint x="861" y="240" />
+        <di:waypoint x="1048" y="240" />
+        <di:waypoint x="1048" y="165" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="955" y="25" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1do0853_di" bpmnElement="SequenceFlow_1do0853">
-        <di:waypoint xsi:type="dc:Point" x="836" y="65" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="99" />
+        <di:waypoint x="836" y="265" />
+        <di:waypoint x="836" y="299" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="851" y="82" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0le8wga_di" bpmnElement="EndEvent_1ddbl39">
-        <dc:Bounds x="818" y="99" width="36" height="36" />
+        <dc:Bounds x="818" y="299" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="836" y="135" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1iibjyo_di" bpmnElement="EndEvent_11duf9p">
-        <dc:Bounds x="1151" y="-93" width="36" height="36" />
+        <dc:Bounds x="1151" y="107" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1169" y="-57" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_11y7faf_di" bpmnElement="SequenceFlow_11y7faf">
-        <di:waypoint xsi:type="dc:Point" x="515" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="607" y="-75" />
+        <di:waypoint x="515" y="125" />
+        <di:waypoint x="607" y="125" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="561" y="-90" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0uhy9lc_di" bpmnElement="ScriptTask_0uhy9lc">
-        <dc:Bounds x="288" y="-115" width="100" height="80" />
+        <dc:Bounds x="288" y="85" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wberw3_di" bpmnElement="SequenceFlow_1wberw3">
-        <di:waypoint xsi:type="dc:Point" x="490" y="-50" />
-        <di:waypoint xsi:type="dc:Point" x="490" y="117" />
-        <di:waypoint xsi:type="dc:Point" x="818" y="117" />
+        <di:waypoint x="490" y="150" />
+        <di:waypoint x="490" y="317" />
+        <di:waypoint x="818" y="317" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="505" y="23.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0qreiaa_di" bpmnElement="SequenceFlow_0qreiaa">
-        <di:waypoint xsi:type="dc:Point" x="209" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="288" y="-75" />
+        <di:waypoint x="209" y="125" />
+        <di:waypoint x="288" y="125" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="249" y="-100" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1xah9es_di" bpmnElement="SequenceFlow_1xah9es">
-        <di:waypoint xsi:type="dc:Point" x="388" y="-75" />
-        <di:waypoint xsi:type="dc:Point" x="465" y="-75" />
+        <di:waypoint x="388" y="125" />
+        <di:waypoint x="465" y="125" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="427" y="-100" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn
index 58ea0c4951..5dc9878561 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn
@@ -1,27 +1,27 @@
 <?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="_FhrCQG2BEeaNdqnn65BT4A" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="_FhrCQG2BEeaNdqnn65BT4A" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateVfModuleVolumeV2" name="DoCreateVfModuleVolumeV2" isExecutable="true">
     <bpmn2:scriptTask id="ScriptTask_preProcessRequest" name="Preprocess Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1wi1cf9</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('preProcessRequest', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_callRestAaiCloudRegion" name="Call REST AAI Cloud Region" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1dpt7ul</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ScriptTask_callRestAaiCloudRegion" targetRef="ScriptTask_callRestAaiQueryGenericVnf" />
     <bpmn2:scriptTask id="ScriptTask_createVolGrpExistsException" name="Build Workflow Exception" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_volGrpName404No</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group name already exists in the system.", isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group name already exists in the system.", isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_createVolGrpExistsException" targetRef="EndEvent_6" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_aaiReturnCode404" name="AAI Return Code is 404?" default="SequenceFlow_volGrpName404No">
@@ -31,15 +31,15 @@ doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500
       <bpmn2:outgoing>SequenceFlow_volGrpName404No</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_volGrpName404Yes" name="Yes" sourceRef="ExclusiveGateway_aaiReturnCode404" targetRef="ScriptTask_callRestAaiCreateVolumeGrp">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{DCVFMODVOLV2_AaiReturnCode == '404'}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{DCVFMODVOLV2_AaiReturnCode == '404'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_volGrpName404No" name="No" sourceRef="ExclusiveGateway_aaiReturnCode404" targetRef="ScriptTask_createVolGrpExistsException" />
     <bpmn2:scriptTask id="ScriptTask_callRestAaiQueryGenericVnf" name="Call REST AAI Query Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_callRestAaiQueryGenericVnf" targetRef="ScriptTask_callRestAaiQueryVolGrpName" />
     <bpmn2:boundaryEvent id="BoundaryEvent_catchAaiError" name="" attachedToRef="ScriptTask_callRestAaiQueryVolGrpName">
@@ -50,22 +50,22 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution,
     <bpmn2:scriptTask id="ScriptTask_callRestAaiQueryVolGrpName" name="Call REST AAI Query Volume Grp Name" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_callRestAaiQueryVolGrpName" targetRef="ExclusiveGateway_aaiReturnCode404" />
     <bpmn2:scriptTask id="ScriptTask_callRestAaiCreateVolumeGrp" name="Call REST AAI Create Volume Group" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_volGrpName404Yes</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="ScriptTask_callRestAaiCreateVolumeGrp" targetRef="ScriptTask_prepareVnfAdapterCreate" />
-    <bpmn2:callActivity id="CallActivity_callVnfAdapterCreate" name="Call VNF Adapter Create" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="CallActivity_callVnfAdapterCreate" name="Call VNF Adapter Create" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
-        <camunda:in source="DCVFMODVOLV2_createVnfARequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="DCVFMODVOLV2_createVnfARequest" target="openstackAdapterTaskRequest" />
         <camunda:in source="msoRequestId" target="mso-request-id" />
         <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
         <camunda:out source="WorkflowResponse" target="DCVFMODVOLV2_createVnfAResponse" />
@@ -79,25 +79,25 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution,
     <bpmn2:scriptTask id="ScriptTask_callRestAaiRequeryVolGrpNm" name="Call REST AAI Requery Volume Group Name" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1gbt2n5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="ScriptTask_callRestAaiRequeryVolGrpNm" targetRef="ScriptTask_callRestAaiVolumeGrp" />
     <bpmn2:scriptTask id="ScriptTask_prepareDbInfraRequest" name="Set Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('setSuccessIndicator', execution, true)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('setSuccessIndicator', execution, true)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ScriptTask_prepareDbInfraRequest" targetRef="EndEvent_1" />
     <bpmn2:scriptTask id="ScriptTask_callRestAaiVolumeGrp" name="Call REST AAI Update Volume Group" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_callRestAaiVolumeGrp" targetRef="ScriptTask_prepareDbInfraRequest" />
     <bpmn2:endEvent id="EndEvent_1" name="End">
@@ -106,9 +106,9 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execut
     <bpmn2:scriptTask id="ScriptTask_prepareVnfAdapterCreate" name="Prepare VNF Adapter Create Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="ScriptTask_prepareVnfAdapterCreate" targetRef="CallActivity_callVnfAdapterCreate" />
     <bpmn2:startEvent id="StartEvent_doCreateVfModuleVolume" name="Start">
@@ -121,18 +121,18 @@ doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', executi
     <bpmn2:scriptTask id="Task_07psich" name="Validate VNF Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1qwurc5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1gbt2n5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('validateVnfResponse', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('validateVnfResponse', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1qwurc5" sourceRef="CallActivity_callVnfAdapterCreate" targetRef="Task_07psich" />
     <bpmn2:sequenceFlow id="SequenceFlow_1gbt2n5" sourceRef="Task_07psich" targetRef="ScriptTask_callRestAaiRequeryVolGrpNm" />
     <bpmn2:scriptTask id="Task_0qbm5cz" name="&#10;AAI&#10;Query&#10;(svc instance)&#10;" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1wi1cf9</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1dpt7ul</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugLogEnabled)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1wi1cf9" sourceRef="ScriptTask_preProcessRequest" targetRef="Task_0qbm5cz" />
     <bpmn2:sequenceFlow id="SequenceFlow_1dpt7ul" sourceRef="Task_0qbm5cz" targetRef="ScriptTask_callRestAaiCloudRegion" />
@@ -142,194 +142,194 @@ doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugL
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModuleVolumeV2">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_65" bpmnElement="StartEvent_doCreateVfModuleVolume">
-        <dc:Bounds x="270" y="128" width="36" height="36" />
+        <dc:Bounds x="170" y="128" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="276" y="169" width="23" height="12" />
+          <dc:Bounds x="175" y="169" width="25" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="ScriptTask_preProcessRequest">
-        <dc:Bounds x="369" y="106" width="100" height="80" />
+        <dc:Bounds x="269" y="106" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_287" bpmnElement="ScriptTask_callRestAaiCloudRegion">
-        <dc:Bounds x="768" y="106" width="100" height="80" />
+        <dc:Bounds x="668" y="106" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_288" bpmnElement="ScriptTask_callRestAaiQueryVolGrpName">
-        <dc:Bounds x="1045" y="106" width="100" height="80" />
+        <dc:Bounds x="945" y="106" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_247" bpmnElement="ExclusiveGateway_aaiReturnCode404" isMarkerVisible="true">
-        <dc:Bounds x="1242" y="121" width="50" height="50" />
+        <dc:Bounds x="1142" y="121" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1224" y="176" width="85" height="24" />
+          <dc:Bounds x="1125" y="176" width="83" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_289" bpmnElement="ScriptTask_callRestAaiCreateVolumeGrp">
-        <dc:Bounds x="256" y="307" width="100" height="80" />
+        <dc:Bounds x="156" y="307" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_290" bpmnElement="ScriptTask_prepareVnfAdapterCreate">
-        <dc:Bounds x="420" y="307" width="100" height="80" />
+        <dc:Bounds x="320" y="307" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_32" bpmnElement="CallActivity_callVnfAdapterCreate">
-        <dc:Bounds x="576" y="307" width="100" height="80" />
+        <dc:Bounds x="476" y="307" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_292" bpmnElement="ScriptTask_callRestAaiRequeryVolGrpNm">
-        <dc:Bounds x="857" y="307" width="100" height="80" />
+        <dc:Bounds x="757" y="307" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_293" bpmnElement="ScriptTask_callRestAaiVolumeGrp">
-        <dc:Bounds x="995" y="307" width="100" height="80" />
+        <dc:Bounds x="895" y="307" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_294" bpmnElement="ScriptTask_prepareDbInfraRequest">
-        <dc:Bounds x="1142" y="307" width="100" height="80" />
+        <dc:Bounds x="1042" y="307" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_226" bpmnElement="EndEvent_1">
-        <dc:Bounds x="1283" y="328" width="36" height="36" />
+        <dc:Bounds x="1183" y="328" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1292" y="369" width="19" height="12" />
+          <dc:Bounds x="1192" y="369" width="20" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_65" targetElement="_BPMNShape_ScriptTask_285">
-        <di:waypoint xsi:type="dc:Point" x="306" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="369" y="146" />
+        <di:waypoint x="206" y="146" />
+        <di:waypoint x="269" y="146" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="338" y="131" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_volGrpName404Yes" sourceElement="_BPMNShape_ExclusiveGateway_247" targetElement="_BPMNShape_ScriptTask_289">
-        <di:waypoint xsi:type="dc:Point" x="1267" y="171" />
-        <di:waypoint xsi:type="dc:Point" x="1267" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="811" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="306" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="306" y="307" />
+        <di:waypoint x="1167" y="171" />
+        <di:waypoint x="1167" y="232" />
+        <di:waypoint x="711" y="232" />
+        <di:waypoint x="206" y="232" />
+        <di:waypoint x="206" y="307" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="582" y="232" width="18" height="12" />
+          <dc:Bounds x="482" y="232" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_289" targetElement="_BPMNShape_ScriptTask_290">
-        <di:waypoint xsi:type="dc:Point" x="356" y="347" />
-        <di:waypoint xsi:type="dc:Point" x="420" y="347" />
+        <di:waypoint x="256" y="347" />
+        <di:waypoint x="320" y="347" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="388" y="332" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_290" targetElement="_BPMNShape_CallActivity_32">
-        <di:waypoint xsi:type="dc:Point" x="520" y="347" />
-        <di:waypoint xsi:type="dc:Point" x="576" y="347" />
+        <di:waypoint x="420" y="347" />
+        <di:waypoint x="476" y="347" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="548" y="455" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_287" targetElement="_BPMNShape_ScriptTask_311">
-        <di:waypoint xsi:type="dc:Point" x="868" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="911" y="147" />
+        <di:waypoint x="768" y="146" />
+        <di:waypoint x="811" y="147" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="890" y="132" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_296" bpmnElement="ScriptTask_createVolGrpExistsException">
-        <dc:Bounds x="1355" y="106" width="100" height="80" />
+        <dc:Bounds x="1255" y="106" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_296" targetElement="_BPMNShape_EndEvent_241">
-        <di:waypoint xsi:type="dc:Point" x="1455" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="1493" y="146" />
+        <di:waypoint x="1355" y="146" />
+        <di:waypoint x="1393" y="146" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1474" y="131" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_BoundaryEvent_62" targetElement="_BPMNShape_ExclusiveGateway_247">
-        <di:waypoint xsi:type="dc:Point" x="1145" y="88" />
-        <di:waypoint xsi:type="dc:Point" x="1145" y="59" />
-        <di:waypoint xsi:type="dc:Point" x="1267" y="59" />
-        <di:waypoint xsi:type="dc:Point" x="1267" y="121" />
+        <di:waypoint x="1045" y="88" />
+        <di:waypoint x="1045" y="59" />
+        <di:waypoint x="1167" y="59" />
+        <di:waypoint x="1167" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1206" y="44" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_volGrpName404No" sourceElement="_BPMNShape_ExclusiveGateway_247" targetElement="_BPMNShape_ScriptTask_296">
-        <di:waypoint xsi:type="dc:Point" x="1292" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="1355" y="146" />
+        <di:waypoint x="1192" y="146" />
+        <di:waypoint x="1255" y="146" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1320" y="146" width="14" height="12" />
+          <dc:Bounds x="1220" y="146" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ScriptTask_292" targetElement="_BPMNShape_ScriptTask_293">
-        <di:waypoint xsi:type="dc:Point" x="957" y="347" />
-        <di:waypoint xsi:type="dc:Point" x="995" y="347" />
+        <di:waypoint x="857" y="347" />
+        <di:waypoint x="895" y="347" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="976" y="332" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_293" targetElement="_BPMNShape_ScriptTask_294">
-        <di:waypoint xsi:type="dc:Point" x="1095" y="347" />
-        <di:waypoint xsi:type="dc:Point" x="1142" y="347" />
+        <di:waypoint x="995" y="347" />
+        <di:waypoint x="1042" y="347" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1119" y="332" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_294" targetElement="_BPMNShape_EndEvent_226">
-        <di:waypoint xsi:type="dc:Point" x="1242" y="347" />
-        <di:waypoint xsi:type="dc:Point" x="1283" y="346" />
+        <di:waypoint x="1142" y="347" />
+        <di:waypoint x="1183" y="346" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1263" y="332" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_311" bpmnElement="ScriptTask_callRestAaiQueryGenericVnf">
-        <dc:Bounds x="911" y="106" width="100" height="80" />
+        <dc:Bounds x="811" y="106" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_311" targetElement="_BPMNShape_ScriptTask_288">
-        <di:waypoint xsi:type="dc:Point" x="1011" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="1045" y="146" />
+        <di:waypoint x="911" y="146" />
+        <di:waypoint x="945" y="146" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1028" y="131" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_62" bpmnElement="BoundaryEvent_catchAaiError">
-        <dc:Bounds x="1127" y="88" width="36" height="36" />
+        <dc:Bounds x="1027" y="88" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1145" y="129" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_288" targetElement="_BPMNShape_ExclusiveGateway_247">
-        <di:waypoint xsi:type="dc:Point" x="1145" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="1242" y="146" />
+        <di:waypoint x="1045" y="146" />
+        <di:waypoint x="1142" y="146" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1194" y="131" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_241" bpmnElement="EndEvent_6">
-        <dc:Bounds x="1493" y="128" width="36" height="36" />
+        <dc:Bounds x="1393" y="128" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1502" y="169" width="19" height="12" />
+          <dc:Bounds x="1402" y="169" width="20" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_00lua86_di" bpmnElement="Task_07psich">
-        <dc:Bounds x="716" y="307" width="100" height="80" />
+        <dc:Bounds x="616" y="307" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1qwurc5_di" bpmnElement="SequenceFlow_1qwurc5">
-        <di:waypoint xsi:type="dc:Point" x="676" y="347" />
-        <di:waypoint xsi:type="dc:Point" x="716" y="347" />
+        <di:waypoint x="576" y="347" />
+        <di:waypoint x="616" y="347" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="696" y="322" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1gbt2n5_di" bpmnElement="SequenceFlow_1gbt2n5">
-        <di:waypoint xsi:type="dc:Point" x="816" y="347" />
-        <di:waypoint xsi:type="dc:Point" x="857" y="347" />
+        <di:waypoint x="716" y="347" />
+        <di:waypoint x="757" y="347" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="837" y="322" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1n9cmka_di" bpmnElement="Task_0qbm5cz">
-        <dc:Bounds x="576" y="106" width="100" height="80" />
+        <dc:Bounds x="476" y="106" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wi1cf9_di" bpmnElement="SequenceFlow_1wi1cf9">
-        <di:waypoint xsi:type="dc:Point" x="469" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="576" y="146" />
+        <di:waypoint x="369" y="146" />
+        <di:waypoint x="476" y="146" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="477.5" y="131" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1dpt7ul_di" bpmnElement="SequenceFlow_1dpt7ul">
-        <di:waypoint xsi:type="dc:Point" x="676" y="146" />
-        <di:waypoint xsi:type="dc:Point" x="768" y="146" />
+        <di:waypoint x="576" y="146" />
+        <di:waypoint x="668" y="146" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="677" y="131" width="90" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn
index d6069d714e..5edbf3cd55 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.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: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: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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoDeleteNetworkInstance" name="DoDeleteNetworkInstance" isExecutable="true">
     <bpmn2:startEvent id="deleteNetwork_startEvent" name="Start Flow">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -8,9 +8,9 @@
     <bpmn2:scriptTask id="callAAIQuery_scriptTask" name="Call REST Query In AAI" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0msqfwu</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def callRESTDeleteAAI = new DoDeleteNetworkInstance()
-callRESTDeleteAAI.callRESTQueryAAI(execution)]]></bpmn2:script>
+callRESTDeleteAAI.callRESTQueryAAI(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="callAAIQuery_scriptTask" targetRef="isRelationshipExists_ExclusiveGateway" />
     <bpmn2:callActivity id="callDeleteSDNCAdapter_CallActivity" name="Call SDNC Unassign Adapter V1 Sub-process" calledElement="sdncAdapter">
@@ -31,10 +31,9 @@ callRESTDeleteAAI.callRESTQueryAAI(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1jnva78</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def validateSDNCResponse = new DoDeleteNetworkInstance()
-validateSDNCResponse.validateSDNCResponse(execution)
-]]></bpmn2:script>
+validateSDNCResponse.validateSDNCResponse(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="validateSDNCResponse_ScriptTask" targetRef="isSdncTopoDeleteOk_ExclusiveGateway" />
     <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="validateSDNCResponse_ScriptTask">
@@ -54,7 +53,7 @@ validateSDNCResponse.validateSDNCResponse(execution)
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="sdncTopoDeleteNo_SequenceFlow" name="No" sourceRef="isSdncTopoDeleteOk_ExclusiveGateway" targetRef="sndcError_EndEvent" />
     <bpmn2:sequenceFlow id="sdncTopoDeleteYes_SequenceFlow" name="Yes" sourceRef="isSdncTopoDeleteOk_ExclusiveGateway" targetRef="ScriptTask_01xjfhu">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:subProcess id="subProcessException_SubProcess" name="Subprocess For Exception" triggeredByEvent="true">
       <bpmn2:startEvent id="subProcessStart_StartEvent" name="Fault Start">
@@ -67,18 +66,17 @@ validateSDNCResponse.validateSDNCResponse(execution)
       <bpmn2:scriptTask id="ScriptTask_00lgy9f" name="PostProcess Response" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_1nl99y6</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1yvnovn</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.postProcessResponse(execution)
-]]></bpmn2:script>
+DoDeleteNetworkInstance.postProcessResponse(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_1a51h25" sourceRef="subProcessStart_StartEvent" targetRef="Task_0026x4v" />
       <bpmn2:sequenceFlow id="SequenceFlow_1yvnovn" sourceRef="ScriptTask_00lgy9f" targetRef="EndEvent_2" />
       <bpmn2:scriptTask id="ScriptTask_0n4do0p" name="Prepare SDNC RPC Rollback Deactivate" scriptFormat="groovy">
         <bpmn2:outgoing>SequenceFlow_1wif0e5</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:exclusiveGateway id="ExclusiveGateway_1gix2o6" name="Is Rollback On?">
         <bpmn2:incoming>SequenceFlow_021b0sz</bpmn2:incoming>
@@ -86,33 +84,16 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]></bpmn2:sc
         <bpmn2:outgoing>SequenceFlow_1suj1nc</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_0tiz0kk" name="Yes" sourceRef="ExclusiveGateway_1gix2o6" targetRef="ExclusiveGateway_1x7o5bo">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_rollbackEnabled") == true}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_rollbackEnabled") == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="SequenceFlow_1suj1nc" name="No" sourceRef="ExclusiveGateway_1gix2o6" targetRef="ExclusiveGateway_01xin16" />
-      <bpmn2:callActivity id="CallActivity_0lku52d" name="DoDelete NetworkInstanceRollback&#10;" calledElement="DoDeleteNetworkInstanceRollback">
-        <bpmn2:extensionElements>
-          <camunda:in source="msoRequestId" target="msoRequestId" />
-          <camunda:out source="rolledBack" target="rolledBack" />
-          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-          <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
-          <camunda:in source="rollbackData" target="rollbackData" />
-          <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="WorkflowException" target="WorkflowException" />
-          <camunda:in source="sdncVersion" target="sdncVersion" />
-          <camunda:out source="workflowException" target="workflowException" />
-          <camunda:in source="SavedWorkflowException1" target="SavedWorkflowException1" />
-          <camunda:out source="wasDeleted" target="wasDeleted" />
-        </bpmn2:extensionElements>
-        <bpmn2:incoming>SequenceFlow_147vc14</bpmn2:incoming>
-      </bpmn2:callActivity>
       <bpmn2:exclusiveGateway id="ExclusiveGateway_1x7o5bo" name="is SDNC Rollback Needed? " default="SequenceFlow_1raa09h">
         <bpmn2:incoming>SequenceFlow_0tiz0kk</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0jb7rws</bpmn2:outgoing>
         <bpmn2:outgoing>SequenceFlow_1raa09h</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_0jb7rws" name="Yes" sourceRef="ExclusiveGateway_1x7o5bo" targetRef="ExclusiveGateway_01xin16">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isSdncDeactivateRollbackNeeded") == true}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isSdncDeactivateRollbackNeeded") == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:inclusiveGateway id="ExclusiveGateway_01xin16">
         <bpmn2:incoming>SequenceFlow_1suj1nc</bpmn2:incoming>
@@ -124,24 +105,19 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]></bpmn2:sc
       <bpmn2:sequenceFlow id="SequenceFlow_1nl99y6" sourceRef="ExclusiveGateway_01xin16" targetRef="ScriptTask_00lgy9f" />
       <bpmn2:scriptTask id="ScriptTask_0n4ya47" name="Prepare RollbackData" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_1wif0e5</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_147vc14</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.prepareRollbackData(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.prepareRollbackData(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_1wif0e5" sourceRef="ScriptTask_0n4do0p" targetRef="ScriptTask_0n4ya47" />
-      <bpmn2:sequenceFlow id="SequenceFlow_147vc14" sourceRef="ScriptTask_0n4ya47" targetRef="CallActivity_0lku52d" />
       <bpmn2:sequenceFlow id="SequenceFlow_021b0sz" sourceRef="Task_0026x4v" targetRef="ExclusiveGateway_1gix2o6" />
       <bpmn2:scriptTask id="Task_0026x4v" name="Set Exception Flag" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_1a51h25</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_021b0sz</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.setExceptionFlag(execution)</bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:textAnnotation id="TextAnnotation_0i06ryl">      <bpmn2:text>Rollback Not Needed for Delete.</bpmn2:text>
-</bpmn2:textAnnotation>
-      <bpmn2:association id="Association_0gzsxad" sourceRef="CallActivity_0lku52d" targetRef="TextAnnotation_0i06ryl" />
     </bpmn2:subProcess>
     <bpmn2:exclusiveGateway id="isAAIQueryOk_ExclusiveGateway_2" name="Is AAI Query Ok?" default="querySuccessNo_SequenceFlow">
       <bpmn2:incoming>isRelationshipExistNo_SequenceFlow</bpmn2:incoming>
@@ -149,7 +125,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
       <bpmn2:outgoing>querySuccessNo_SequenceFlow</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="querySuccessYes_SequenceFlow" name="Yes" sourceRef="isAAIQueryOk_ExclusiveGateway_2" targetRef="isResponseEmpty_ExclusiveGateway_2">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isAAIGood") == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isAAIGood") == true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="querySuccessNo_SequenceFlow" name="No" sourceRef="isAAIQueryOk_ExclusiveGateway_2" targetRef="isReturnCode404_ExclusiveGateway" />
     <bpmn2:exclusiveGateway id="isReturnCode404_ExclusiveGateway" name="Is Return Code 404?" default="isReturnCode404_No_SequenceFlow">
@@ -159,7 +135,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="isReturnCode404_No_SequenceFlow" name="No" sourceRef="isReturnCode404_ExclusiveGateway" targetRef="aai_Error_EndEvent" />
     <bpmn2:sequenceFlow id="isReturnCode404_Yes_SequenceFlow" name="Yes" sourceRef="isReturnCode404_ExclusiveGateway" targetRef="silentSucces_InclusiveGateway">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_aaiReturnCode" ) == "404"}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_aaiReturnCode" ) == "404"}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:endEvent id="aai_Error_EndEvent" name="AAI Error">
       <bpmn2:incoming>isReturnCode404_No_SequenceFlow</bpmn2:incoming>
@@ -172,7 +148,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="isResponseEmptyNo_SequenceFlow" name="No" sourceRef="isResponseEmpty_ExclusiveGateway_2" targetRef="callRESTQueryCloudRegion_ScriptTask" />
     <bpmn2:sequenceFlow id="isResponseEmptyYes_SequenceFlow" name="Yes" sourceRef="isResponseEmpty_ExclusiveGateway_2" targetRef="silentSucces_InclusiveGateway">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isSilentSuccess") == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isSilentSuccess") == true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:inclusiveGateway id="silentSucces_InclusiveGateway" name="Joint">
       <bpmn2:incoming>isReturnCode404_Yes_SequenceFlow</bpmn2:incoming>
@@ -186,9 +162,9 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="callRESTQueryCloudRegion_ScriptTask" name="Call REST Query Cloud Region " scriptFormat="groovy">
       <bpmn2:incoming>isResponseEmptyNo_SequenceFlow</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteNetMod = new DoDeleteNetworkInstance()
-deleteNetMod.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
+deleteNetMod.callRESTQueryAAICloudRegion(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_30" name="" sourceRef="callRESTQueryCloudRegion_ScriptTask" targetRef="prepareNetworkRequest_ScriptTask" />
     <bpmn2:exclusiveGateway id="isRelationshipExists_ExclusiveGateway" name="Is Relationship Exists?" default="isRelationshipExistNo_SequenceFlow">
@@ -198,7 +174,7 @@ deleteNetMod.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="isRelationshipExistNo_SequenceFlow" name="No" sourceRef="isRelationshipExists_ExclusiveGateway" targetRef="isAAIQueryOk_ExclusiveGateway_2" />
     <bpmn2:sequenceFlow id="isRelationshipExistYes_SequenceFlow" name="Yes" sourceRef="isRelationshipExists_ExclusiveGateway" targetRef="relationshipError_EndEvent">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isVfRelationshipExist") == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isVfRelationshipExist") == true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:endEvent id="relationshipError_EndEvent" name="Relationship Error">
       <bpmn2:incoming>isRelationshipExistYes_SequenceFlow</bpmn2:incoming>
@@ -210,36 +186,18 @@ deleteNetMod.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="prepareSDNCTopoRequest_ScriptTask" name="Prepare SDNC Topology Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0r3pvf8</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1pdp4d2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def prepareSDNCRequest = new DoDeleteNetworkInstance()
-prepareSDNCRequest.prepareSDNCRequest(execution)
-]]></bpmn2:script>
+prepareSDNCRequest.prepareSDNCRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:scriptTask id="validateDeletePONetwork_ScriptTask" name="Validate Delete PO Network" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def validateNetworkResponse = new DoDeleteNetworkInstance()
-validateNetworkResponse.validateNetworkResponse(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="validateDeletePONetwork_ScriptTask" targetRef="ExclusiveGateway_02t94x3" />
     <bpmn2:scriptTask id="prepareNetworkRequest_ScriptTask" name="Prepare Network Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def prepareNetworkRequest = new DoDeleteNetworkInstance()
-prepareNetworkRequest.prepareNetworkRequest(execution)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="sendRequestToNewworkAdapater_ScriptTask" />
-    <bpmn2:scriptTask id="sendRequestToNewworkAdapater_ScriptTask" name="Send Request to Network Adapter" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def prepareNetworkRequest = new DoDeleteNetworkInstance()
-prepareNetworkRequest.sendRequestToVnfAdapter(execution)]]></bpmn2:script>
+prepareNetworkRequest.prepareNetworkRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="sendRequestToNewworkAdapater_ScriptTask" targetRef="validateDeletePONetwork_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="Activity_1bwwwba" />
     <bpmn2:subProcess id="SubProcess_1" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
       <bpmn2:startEvent id="StartEvent_1">
         <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
@@ -251,9 +209,9 @@ prepareNetworkRequest.sendRequestToVnfAdapter(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="unexpectedError_DeleteNetworkInfra_ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteNetMod = new DoDeleteNetworkInstance()
-deleteNetMod.processJavaException(execution)]]></bpmn2:script>
+deleteNetMod.processJavaException(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="StartEvent_1" targetRef="unexpectedError_DeleteNetworkInfra_ScriptTask_1" />
       <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="unexpectedError_DeleteNetworkInfra_ScriptTask_1" targetRef="EndEvent_4" />
@@ -261,15 +219,14 @@ deleteNetMod.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_01xjfhu" name="PostProcess Response" scriptFormat="groovy">
       <bpmn2:incoming>sdncTopoDeleteYes_SequenceFlow</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1pbgnr2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.postProcessResponse(execution)
-]]></bpmn2:script>
+DoDeleteNetworkInstance.postProcessResponse(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1pbgnr2" sourceRef="ScriptTask_01xjfhu" targetRef="EndEvent_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_1pdp4d2" sourceRef="prepareSDNCTopoRequest_ScriptTask" targetRef="callDeleteSDNCAdapter_CallActivity" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_02t94x3" name="is not &#39;1610&#39; SNDC Call?" default="SequenceFlow_0r3pvf8">
-      <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
+      <bpmn2:incoming>Flow_10caop8</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0r3pvf8</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_0kqnddy</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
@@ -277,10 +234,9 @@ DoDeleteNetworkInstance.postProcessResponse(execution)
     <bpmn2:scriptTask id="ScriptTask_0iqzbz6" name="Prepare RSRC SDNC Unassign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0f13b17</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0zlbzad</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def prepareSDNCRequest = new DoDeleteNetworkInstance()
-prepareSDNCRequest.prepareRpcSDNCRequest(execution)
-]]></bpmn2:script>
+prepareSDNCRequest.prepareRpcSDNCRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallActivity_03wzdas" name="Call RSRC SDNC Unassign Adapter V1 " calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -298,23 +254,22 @@ prepareSDNCRequest.prepareRpcSDNCRequest(execution)
     <bpmn2:sequenceFlow id="SequenceFlow_1jnva78" sourceRef="CallActivity_03wzdas" targetRef="validateSDNCResponse_ScriptTask" />
     <bpmn2:sequenceFlow id="SequenceFlow_0zlbzad" sourceRef="ScriptTask_0iqzbz6" targetRef="CallActivity_03wzdas" />
     <bpmn2:sequenceFlow id="SequenceFlow_0kqnddy" name="Yes" sourceRef="ExclusiveGateway_02t94x3" targetRef="ScriptTask_1wf192s">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:scriptTask id="ScriptTask_01w2cd9" name="PreProcess Incoming Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0msqfwu</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.preProcessRequest(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.preProcessRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0msqfwu" sourceRef="ScriptTask_01w2cd9" targetRef="callAAIQuery_scriptTask" />
     <bpmn2:scriptTask id="ScriptTask_0dtzzht" name="PostProcess Response" scriptFormat="groovy">
       <bpmn2:incoming>silentSuccess_SequenceFlow</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0f25bme</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.postProcessResponse(execution)
-]]></bpmn2:script>
+DoDeleteNetworkInstance.postProcessResponse(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0f25bme" sourceRef="ScriptTask_0dtzzht" targetRef="EndEvent_1" />
     <bpmn2:callActivity id="CallActivity_0wyu1mx" name="Call RSRC SDNC Deactivate Adapter" calledElement="sdncAdapter">
@@ -333,9 +288,9 @@ DoDeleteNetworkInstance.postProcessResponse(execution)
     <bpmn2:scriptTask id="ScriptTask_1wf192s" name="Prepare SDNC RSRC Deactivate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0kqnddy</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1o088sy</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1o088sy" sourceRef="ScriptTask_1wf192s" targetRef="CallActivity_0wyu1mx" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_024qvqd" default="SequenceFlow_1qyo7ot">
@@ -346,9 +301,9 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_00vwf2h" name="Validate Deactivate SDNC Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1i3193l</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0n8sf23</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:boundaryEvent id="BoundaryEvent_0un9yyu" name="" attachedToRef="ScriptTask_00vwf2h">
       <bpmn2:outgoing>SequenceFlow_08hus4u</bpmn2:outgoing>
@@ -359,575 +314,555 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:s
     <bpmn2:sequenceFlow id="SequenceFlow_08hus4u" sourceRef="BoundaryEvent_0un9yyu" targetRef="EndEvent_1l210ae" />
     <bpmn2:sequenceFlow id="SequenceFlow_1qyo7ot" name="No" sourceRef="ExclusiveGateway_024qvqd" targetRef="EndEvent_1l210ae" />
     <bpmn2:sequenceFlow id="SequenceFlow_0f13b17" name="Yes" sourceRef="ExclusiveGateway_024qvqd" targetRef="ScriptTask_0iqzbz6">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:endEvent id="EndEvent_1l210ae">
       <bpmn2:incoming>SequenceFlow_08hus4u</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1qyo7ot</bpmn2:incoming>
       <bpmn2:errorEventDefinition errorRef="Error_3" />
     </bpmn2:endEvent>
+    <bpmn2:callActivity id="Activity_1bwwwba" name="openstack Adapter" calledElement="openstackAdapterTask">
+      <bpmn2:extensionElements>
+        <camunda:in source="DELNWKI_deleteNetworkRequest" target="openstackAdapterTaskRequest" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="DELNWKI_deleteNetworkResponse" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
+      <bpmn2:outgoing>Flow_10caop8</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="Flow_10caop8" sourceRef="Activity_1bwwwba" targetRef="ExclusiveGateway_02t94x3" />
   </bpmn2:process>
   <bpmn2:error id="Error_3" 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="DoDeleteNetworkInstance">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteNetwork_startEvent">
-        <dc:Bounds x="444" y="185" width="36" height="36" />
+        <dc:Bounds x="604" y="185" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="437" y="226" width="49" height="12" />
+          <dc:Bounds x="596" y="226" width="51" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47">
-        <di:waypoint xsi:type="dc:Point" x="480" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="597" y="204" />
+        <di:waypoint x="640" y="203" />
+        <di:waypoint x="757" y="204" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="539" y="188.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="callAAIQuery_scriptTask">
-        <dc:Bounds x="816" y="163" width="100" height="80" />
+        <dc:Bounds x="976" y="163" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_62" bpmnElement="isAAIQueryOk_ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds x="984" y="72" width="50" height="50" />
+        <dc:Bounds x="1144" y="72" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="966" y="44" width="87" height="12" />
+          <dc:Bounds x="1127" y="44" width="86" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_62" targetElement="_BPMNShape_ExclusiveGateway_224">
-        <di:waypoint xsi:type="dc:Point" x="866" y="163" />
-        <di:waypoint xsi:type="dc:Point" x="865" y="122" />
+        <di:waypoint x="1026" y="163" />
+        <di:waypoint x="1025" y="122" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="862" y="135" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateDeletePONetwork_ScriptTask">
-        <dc:Bounds x="1131" y="509" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="querySuccessYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_ExclusiveGateway_65">
-        <di:waypoint xsi:type="dc:Point" x="1009" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="1009" y="177" />
+        <di:waypoint x="1169" y="122" />
+        <di:waypoint x="1169" y="177" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1008" y="120" width="29" height="22" />
+          <dc:Bounds x="1174" y="120" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="querySuccessNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_ExclusiveGateway_64">
-        <di:waypoint xsi:type="dc:Point" x="1034" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1126" y="97" />
+        <di:waypoint x="1194" y="97" />
+        <di:waypoint x="1286" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1036" y="97" width="22" height="22" />
+          <dc:Bounds x="1200" y="97" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_64" bpmnElement="isReturnCode404_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="1126" y="72" width="50" height="50" />
+        <dc:Bounds x="1286" y="72" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1115" y="41" width="77" height="24" />
+          <dc:Bounds x="1277" y="41" width="74" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="isReturnCode404_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_64" targetElement="_BPMNShape_EndEvent_118">
-        <di:waypoint xsi:type="dc:Point" x="1176" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1212" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1212" y="98" />
-        <di:waypoint xsi:type="dc:Point" x="1281" y="98" />
+        <di:waypoint x="1336" y="97" />
+        <di:waypoint x="1372" y="97" />
+        <di:waypoint x="1372" y="98" />
+        <di:waypoint x="1441" y="98" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1176" y="97" width="22" height="22" />
+          <dc:Bounds x="1340" y="97" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="isReturnCode404_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_64" targetElement="_BPMNShape_InclusiveGateway_2">
-        <di:waypoint xsi:type="dc:Point" x="1151" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="1151" y="177" />
+        <di:waypoint x="1311" y="122" />
+        <di:waypoint x="1311" y="177" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1152" y="120" width="29" height="22" />
+          <dc:Bounds x="1318" y="120" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_65" bpmnElement="isResponseEmpty_ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds x="984" y="177" width="50" height="50" />
+        <dc:Bounds x="1144" y="177" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1016" y="163" width="95" height="22" />
+          <dc:Bounds x="1185" y="163" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="isResponseEmptyNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_65" targetElement="_BPMNShape_ScriptTask_250">
-        <di:waypoint xsi:type="dc:Point" x="1009" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1010" y="269" />
+        <di:waypoint x="1169" y="227" />
+        <di:waypoint x="1170" y="269" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1016" y="227" width="22" height="22" />
+          <dc:Bounds x="1180" y="227" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="isResponseEmptyYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_65" targetElement="_BPMNShape_InclusiveGateway_2">
-        <di:waypoint xsi:type="dc:Point" x="1034" y="202" />
-        <di:waypoint xsi:type="dc:Point" x="1126" y="202" />
+        <di:waypoint x="1194" y="202" />
+        <di:waypoint x="1286" y="202" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1034" y="202" width="29" height="22" />
+          <dc:Bounds x="1200" y="202" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_118" bpmnElement="aai_Error_EndEvent">
-        <dc:Bounds x="1281" y="80" width="36" height="36" />
+        <dc:Bounds x="1441" y="80" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1270" y="121" width="59" height="22" />
+          <dc:Bounds x="1437" y="121" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_66" bpmnElement="prepareNetworkRequest_ScriptTask">
-        <dc:Bounds x="1131" y="269" width="100" height="80" />
+        <dc:Bounds x="1291" y="269" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_66" targetElement="_BPMNShape_ScriptTask_242">
-        <di:waypoint xsi:type="dc:Point" x="1181" y="349" />
-        <di:waypoint xsi:type="dc:Point" x="1181" y="387" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_66" targetElement="Activity_16tuuqq_di">
+        <di:waypoint x="1341" y="349" />
+        <di:waypoint x="1341" y="400" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1196" y="368" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
-        <dc:Bounds x="981" y="718" width="100" height="80" />
+        <dc:Bounds x="1141" y="718" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_67">
-        <di:waypoint xsi:type="dc:Point" x="1180" y="589" />
-        <di:waypoint xsi:type="dc:Point" x="1181" y="648" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1181" y="603.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
-        <dc:Bounds x="-1" y="576" width="902" height="448" />
+        <dc:Bounds x="159" y="576" width="902" height="448" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
-        <dc:Bounds x="49" y="896" width="36" height="36" />
+        <dc:Bounds x="209" y="896" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="43" y="938" width="50" height="12" />
+          <dc:Bounds x="202" y="938" width="52" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoDeleteOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="1156" y="997" width="50" height="50" />
+        <dc:Bounds x="1316" y="997" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1070" y="1010" width="70" height="24" />
+          <dc:Bounds x="1230" y="1010" width="70" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="sdncTopoDeleteNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_EndEvent_124">
-        <di:waypoint xsi:type="dc:Point" x="1206" y="1022" />
-        <di:waypoint xsi:type="dc:Point" x="1244" y="1022" />
-        <di:waypoint xsi:type="dc:Point" x="1244" y="1022" />
-        <di:waypoint xsi:type="dc:Point" x="1278" y="1022" />
+        <di:waypoint x="1366" y="1022" />
+        <di:waypoint x="1404" y="1022" />
+        <di:waypoint x="1404" y="1022" />
+        <di:waypoint x="1438" y="1022" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1206" y="1029.0213702128942" width="14" height="12" />
+          <dc:Bounds x="1366" y="1029" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="sdncTopoDeleteYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67">
-        <di:waypoint xsi:type="dc:Point" x="1181" y="1047" />
-        <di:waypoint xsi:type="dc:Point" x="1181" y="1097" />
+        <di:waypoint x="1341" y="1047" />
+        <di:waypoint x="1341" y="1097" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1187" y="1053.3920491579422" width="18" height="12" />
+          <dc:Bounds x="1347" y="1053" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
-        <dc:Bounds x="1278" y="1004" width="36" height="36" />
+        <dc:Bounds x="1438" y="1004" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1289" y="1047" width="59" height="12" />
+          <dc:Bounds x="1448" y="1047" width="61" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callDeleteSDNCAdapter_CallActivity">
-        <dc:Bounds x="981" y="851" width="100" height="80" />
+        <dc:Bounds x="1141" y="851" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_CallActivity_19" targetElement="_BPMNShape_ScriptTask_131">
-        <di:waypoint xsi:type="dc:Point" x="1081" y="891" />
-        <di:waypoint xsi:type="dc:Point" x="1131" y="891" />
+        <di:waypoint x="1241" y="891" />
+        <di:waypoint x="1291" y="891" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1106" y="876" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_242" targetElement="_BPMNShape_ScriptTask_63">
-        <di:waypoint xsi:type="dc:Point" x="1181" y="467" />
-        <di:waypoint xsi:type="dc:Point" x="1181" y="509" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1196" y="488" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_2" bpmnElement="silentSucces_InclusiveGateway">
-        <dc:Bounds x="1126" y="177" width="50" height="50" />
+        <dc:Bounds x="1286" y="177" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1136" y="227" width="33" height="22" />
+          <dc:Bounds x="1300" y="227" width="25" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="silentSuccess_SequenceFlow" sourceElement="_BPMNShape_InclusiveGateway_2">
-        <di:waypoint xsi:type="dc:Point" x="1176" y="202" />
-        <di:waypoint xsi:type="dc:Point" x="1305" y="203" />
+        <di:waypoint x="1336" y="202" />
+        <di:waypoint x="1465" y="203" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1195" y="180.7648701031734" width="72" height="12" />
+          <dc:Bounds x="1355" y="181" width="73" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
-        <dc:Bounds x="1131" y="851" width="100" height="80" />
+        <dc:Bounds x="1291" y="851" width="100" height="80" />
       </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="1180" y="931" />
-        <di:waypoint xsi:type="dc:Point" x="1181" y="997" />
+        <di:waypoint x="1340" y="931" />
+        <di:waypoint x="1341" y="997" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1181" y="949" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_242" bpmnElement="sendRequestToNewworkAdapater_ScriptTask">
-        <dc:Bounds x="1131" y="387" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_179" bpmnElement="EndEvent_1">
-        <dc:Bounds x="1458" y="185" width="36" height="36" />
+        <dc:Bounds x="1618" y="185" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1476" y="226" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_180" bpmnElement="EndEvent_2">
-        <dc:Bounds x="817" y="687" width="36" height="36" />
+        <dc:Bounds x="977" y="687" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="835" y="728" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_182" bpmnElement="EndEvent_3">
-        <dc:Bounds x="1163" y="1228" width="36" height="36" />
+        <dc:Bounds x="1323" y="1228" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1181" y="1269" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_250" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
-        <dc:Bounds x="960" y="269" width="100" height="80" />
+        <dc:Bounds x="1120" y="269" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_52" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ScriptTask_250" targetElement="_BPMNShape_ScriptTask_66">
-        <di:waypoint xsi:type="dc:Point" x="1060" y="309" />
-        <di:waypoint xsi:type="dc:Point" x="1096" y="309" />
-        <di:waypoint xsi:type="dc:Point" x="1096" y="309" />
-        <di:waypoint xsi:type="dc:Point" x="1131" y="309" />
+        <di:waypoint x="1220" y="309" />
+        <di:waypoint x="1256" y="309" />
+        <di:waypoint x="1256" y="309" />
+        <di:waypoint x="1291" y="309" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1111" y="309" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_41" bpmnElement="BoundaryEvent_1">
-        <dc:Bounds x="1213" y="913" width="36" height="36" />
+        <dc:Bounds x="1373" y="913" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1231" y="949" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_41" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_BoundaryEvent_41" targetElement="_BPMNShape_EndEvent_124">
-        <di:waypoint xsi:type="dc:Point" x="1241" y="945" />
-        <di:waypoint xsi:type="dc:Point" x="1286" y="1007" />
+        <di:waypoint x="1401" y="945" />
+        <di:waypoint x="1446" y="1007" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1264" y="961" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_224" bpmnElement="isRelationshipExists_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="840" y="72" width="50" height="50" />
+        <dc:Bounds x="1000" y="72" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="829" y="41" width="74" height="24" />
+          <dc:Bounds x="989" y="41" width="74" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_60" bpmnElement="isRelationshipExistNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ExclusiveGateway_62">
-        <di:waypoint xsi:type="dc:Point" x="890" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="984" y="97" />
+        <di:waypoint x="1050" y="97" />
+        <di:waypoint x="1144" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="890" y="97" width="22" height="22" />
+          <dc:Bounds x="1054" y="97" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_216" bpmnElement="relationshipError_EndEvent">
-        <dc:Bounds x="730" y="80" width="36" height="36" />
+        <dc:Bounds x="890" y="80" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="701" y="117" width="109" height="22" />
+          <dc:Bounds x="871" y="117" width="90" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_61" bpmnElement="isRelationshipExistYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_EndEvent_216">
-        <di:waypoint xsi:type="dc:Point" x="840" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="800" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="800" y="98" />
-        <di:waypoint xsi:type="dc:Point" x="766" y="98" />
+        <di:waypoint x="1000" y="97" />
+        <di:waypoint x="960" y="97" />
+        <di:waypoint x="960" y="98" />
+        <di:waypoint x="926" y="98" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="816" y="97" width="29" height="22" />
+          <dc:Bounds x="982" y="97" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_29" bpmnElement="SubProcess_1" isExpanded="true">
-        <dc:Bounds x="0" y="369" width="326" height="175" />
+        <dc:Bounds x="160" y="369" width="326" height="175" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_73" bpmnElement="StartEvent_1">
-        <dc:Bounds x="36" y="432" width="36" height="36" />
+        <dc:Bounds x="196" y="432" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="54" y="473" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_222" bpmnElement="EndEvent_4">
-        <dc:Bounds x="240" y="432" width="36" height="36" />
+        <dc:Bounds x="400" y="432" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="258" y="473" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_272" bpmnElement="unexpectedError_DeleteNetworkInfra_ScriptTask_1">
-        <dc:Bounds x="108" y="410" width="100" height="80" />
+        <dc:Bounds x="268" y="410" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_StartEvent_73" targetElement="_BPMNShape_ScriptTask_272">
-        <di:waypoint xsi:type="dc:Point" x="72" y="450" />
-        <di:waypoint xsi:type="dc:Point" x="108" y="450" />
+        <di:waypoint x="232" y="450" />
+        <di:waypoint x="268" y="450" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_272" targetElement="_BPMNShape_EndEvent_222">
-        <di:waypoint xsi:type="dc:Point" x="208" y="450" />
-        <di:waypoint xsi:type="dc:Point" x="240" y="450" />
+        <di:waypoint x="368" y="450" />
+        <di:waypoint x="400" y="450" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_00lgy9f_di" bpmnElement="ScriptTask_00lgy9f">
-        <dc:Bounds x="688" y="665" width="100" height="80" />
+        <dc:Bounds x="848" y="665" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1a51h25_di" bpmnElement="SequenceFlow_1a51h25">
-        <di:waypoint xsi:type="dc:Point" x="85" y="914" />
-        <di:waypoint xsi:type="dc:Point" x="124" y="914" />
+        <di:waypoint x="245" y="914" />
+        <di:waypoint x="284" y="914" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="105" y="899" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yvnovn_di" bpmnElement="SequenceFlow_1yvnovn">
-        <di:waypoint xsi:type="dc:Point" x="788" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="817" y="705" />
+        <di:waypoint x="948" y="705" />
+        <di:waypoint x="977" y="705" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="803" y="690" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_01xjfhu_di" bpmnElement="ScriptTask_01xjfhu">
-        <dc:Bounds x="1131" y="1097" width="100" height="80" />
+        <dc:Bounds x="1291" y="1097" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1pbgnr2_di" bpmnElement="SequenceFlow_1pbgnr2">
-        <di:waypoint xsi:type="dc:Point" x="1181" y="1177" />
-        <di:waypoint xsi:type="dc:Point" x="1181" y="1228" />
+        <di:waypoint x="1341" y="1177" />
+        <di:waypoint x="1341" y="1228" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1196" y="1202.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1pdp4d2_di" bpmnElement="SequenceFlow_1pdp4d2">
-        <di:waypoint xsi:type="dc:Point" x="1031" y="798" />
-        <di:waypoint xsi:type="dc:Point" x="1031" y="851" />
+        <di:waypoint x="1191" y="798" />
+        <di:waypoint x="1191" y="851" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1046" y="824.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_02t94x3_di" bpmnElement="ExclusiveGateway_02t94x3" isMarkerVisible="true">
-        <dc:Bounds x="1156" y="648" width="50" height="50" />
+        <dc:Bounds x="1316" y="648" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1150" y="707" width="61" height="24" />
+          <dc:Bounds x="1311" y="707" width="60" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0r3pvf8_di" bpmnElement="SequenceFlow_0r3pvf8">
-        <di:waypoint xsi:type="dc:Point" x="1156" y="673" />
-        <di:waypoint xsi:type="dc:Point" x="1031" y="673" />
-        <di:waypoint xsi:type="dc:Point" x="1031" y="718" />
+        <di:waypoint x="1316" y="673" />
+        <di:waypoint x="1191" y="673" />
+        <di:waypoint x="1191" y="718" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1134" y="681" width="14" height="12" />
+          <dc:Bounds x="1294" y="681" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0iqzbz6_di" bpmnElement="ScriptTask_0iqzbz6">
-        <dc:Bounds x="1426" y="851" width="100" height="80" />
+        <dc:Bounds x="1586" y="851" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_03wzdas_di" bpmnElement="CallActivity_03wzdas">
-        <dc:Bounds x="1279" y="851" width="100" height="80" />
+        <dc:Bounds x="1439" y="851" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1jnva78_di" bpmnElement="SequenceFlow_1jnva78">
-        <di:waypoint xsi:type="dc:Point" x="1279" y="891" />
-        <di:waypoint xsi:type="dc:Point" x="1231" y="891" />
+        <di:waypoint x="1439" y="891" />
+        <di:waypoint x="1391" y="891" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1255" y="876" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0zlbzad_di" bpmnElement="SequenceFlow_0zlbzad">
-        <di:waypoint xsi:type="dc:Point" x="1426" y="891" />
-        <di:waypoint xsi:type="dc:Point" x="1379" y="891" />
+        <di:waypoint x="1586" y="891" />
+        <di:waypoint x="1539" y="891" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1403" y="876" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0kqnddy_di" bpmnElement="SequenceFlow_0kqnddy">
-        <di:waypoint xsi:type="dc:Point" x="1206" y="673" />
-        <di:waypoint xsi:type="dc:Point" x="1279" y="673" />
+        <di:waypoint x="1366" y="673" />
+        <di:waypoint x="1439" y="673" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1217" y="677.9562629793824" width="18" height="12" />
+          <dc:Bounds x="1377" y="678" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_01w2cd9_di" bpmnElement="ScriptTask_01w2cd9">
-        <dc:Bounds x="597" y="163" width="100" height="80" />
+        <dc:Bounds x="757" y="163" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0msqfwu_di" bpmnElement="SequenceFlow_0msqfwu">
-        <di:waypoint xsi:type="dc:Point" x="697" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="816" y="203" />
+        <di:waypoint x="857" y="203" />
+        <di:waypoint x="976" y="203" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="757" y="188" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0dtzzht_di" bpmnElement="ScriptTask_0dtzzht">
-        <dc:Bounds x="1305" y="163" width="100" height="80" />
+        <dc:Bounds x="1465" y="163" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0f25bme_di" bpmnElement="SequenceFlow_0f25bme">
-        <di:waypoint xsi:type="dc:Point" x="1405" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="1458" y="203" />
+        <di:waypoint x="1565" y="203" />
+        <di:waypoint x="1618" y="203" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1432" y="178" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0wyu1mx_di" bpmnElement="CallActivity_0wyu1mx">
-        <dc:Bounds x="1426" y="633" width="100" height="80" />
+        <dc:Bounds x="1586" y="633" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1wf192s_di" bpmnElement="ScriptTask_1wf192s">
-        <dc:Bounds x="1279" y="633" width="100" height="80" />
+        <dc:Bounds x="1439" y="633" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1o088sy_di" bpmnElement="SequenceFlow_1o088sy">
-        <di:waypoint xsi:type="dc:Point" x="1379" y="673" />
-        <di:waypoint xsi:type="dc:Point" x="1403" y="673" />
-        <di:waypoint xsi:type="dc:Point" x="1403" y="673" />
-        <di:waypoint xsi:type="dc:Point" x="1426" y="673" />
+        <di:waypoint x="1539" y="673" />
+        <di:waypoint x="1563" y="673" />
+        <di:waypoint x="1563" y="673" />
+        <di:waypoint x="1586" y="673" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1418" y="673" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_024qvqd_di" bpmnElement="ExclusiveGateway_024qvqd" isMarkerVisible="true">
-        <dc:Bounds x="1597" y="775" width="50" height="50" />
+        <dc:Bounds x="1757" y="775" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1622" y="825" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_00vwf2h_di" bpmnElement="ScriptTask_00vwf2h">
-        <dc:Bounds x="1572" y="633" width="100" height="80" />
+        <dc:Bounds x="1732" y="633" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BoundaryEvent_0un9yyu_di" bpmnElement="BoundaryEvent_0un9yyu">
-        <dc:Bounds x="1654" y="695" width="36" height="36" />
+        <dc:Bounds x="1814" y="695" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1672" y="731" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1i3193l_di" bpmnElement="SequenceFlow_1i3193l">
-        <di:waypoint xsi:type="dc:Point" x="1526" y="673" />
-        <di:waypoint xsi:type="dc:Point" x="1572" y="673" />
+        <di:waypoint x="1686" y="673" />
+        <di:waypoint x="1732" y="673" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1549" y="648" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0n8sf23_di" bpmnElement="SequenceFlow_0n8sf23">
-        <di:waypoint xsi:type="dc:Point" x="1622" y="713" />
-        <di:waypoint xsi:type="dc:Point" x="1622" y="775" />
+        <di:waypoint x="1782" y="713" />
+        <di:waypoint x="1782" y="775" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1637" y="734" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_08hus4u_di" bpmnElement="SequenceFlow_08hus4u">
-        <di:waypoint xsi:type="dc:Point" x="1680" y="729" />
-        <di:waypoint xsi:type="dc:Point" x="1710" y="784" />
+        <di:waypoint x="1840" y="729" />
+        <di:waypoint x="1870" y="784" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1695" y="741.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1qyo7ot_di" bpmnElement="SequenceFlow_1qyo7ot">
-        <di:waypoint xsi:type="dc:Point" x="1647" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1700" y="800" />
+        <di:waypoint x="1807" y="800" />
+        <di:waypoint x="1860" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1651" y="808" width="14" height="12" />
+          <dc:Bounds x="1811" y="808" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0f13b17_di" bpmnElement="SequenceFlow_0f13b17">
-        <di:waypoint xsi:type="dc:Point" x="1622" y="825" />
-        <di:waypoint xsi:type="dc:Point" x="1622" y="891" />
-        <di:waypoint xsi:type="dc:Point" x="1526" y="891" />
+        <di:waypoint x="1782" y="825" />
+        <di:waypoint x="1782" y="891" />
+        <di:waypoint x="1686" y="891" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1629" y="824" width="18" height="12" />
+          <dc:Bounds x="1789" y="824" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0p7ad9r_di" bpmnElement="EndEvent_1l210ae">
-        <dc:Bounds x="1700" y="782" width="36" height="36" />
+        <dc:Bounds x="1860" y="782" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1718" y="818" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0n4do0p_di" bpmnElement="ScriptTask_0n4do0p">
-        <dc:Bounds x="245" y="665" width="100" height="80" />
+        <dc:Bounds x="405" y="665" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1gix2o6_di" bpmnElement="ExclusiveGateway_1gix2o6" isMarkerVisible="true">
-        <dc:Bounds x="270" y="889" width="50" height="50" />
+        <dc:Bounds x="430" y="889" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="256" y="939" width="77" height="13" />
+          <dc:Bounds x="416" y="939" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0tiz0kk_di" bpmnElement="SequenceFlow_0tiz0kk">
-        <di:waypoint xsi:type="dc:Point" x="295" y="889" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="869" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="869" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="849" />
+        <di:waypoint x="455" y="889" />
+        <di:waypoint x="455" y="869" />
+        <di:waypoint x="455" y="869" />
+        <di:waypoint x="455" y="849" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="299" y="858.4545454545455" width="19" height="13" />
+          <dc:Bounds x="460" y="858" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1suj1nc_di" bpmnElement="SequenceFlow_1suj1nc">
-        <di:waypoint xsi:type="dc:Point" x="320" y="914" />
-        <di:waypoint xsi:type="dc:Point" x="437" y="914" />
-        <di:waypoint xsi:type="dc:Point" x="437" y="849" />
+        <di:waypoint x="480" y="914" />
+        <di:waypoint x="597" y="914" />
+        <di:waypoint x="597" y="849" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="333" y="897" width="14" height="13" />
+          <dc:Bounds x="493" y="897" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_0lku52d_di" bpmnElement="CallActivity_0lku52d">
-        <dc:Bounds x="523" y="665" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1x7o5bo_di" bpmnElement="ExclusiveGateway_1x7o5bo" isMarkerVisible="true">
-        <dc:Bounds x="270" y="799" width="50" height="50" />
+        <dc:Bounds x="430" y="799" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="173" y="812" width="87" height="25" />
+          <dc:Bounds x="333" y="812" width="88" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0jb7rws_di" bpmnElement="SequenceFlow_0jb7rws">
-        <di:waypoint xsi:type="dc:Point" x="295" y="799" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="772" />
-        <di:waypoint xsi:type="dc:Point" x="437" y="772" />
-        <di:waypoint xsi:type="dc:Point" x="437" y="799" />
+        <di:waypoint x="455" y="799" />
+        <di:waypoint x="455" y="772" />
+        <di:waypoint x="597" y="772" />
+        <di:waypoint x="597" y="799" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="312" y="776.0384854424079" width="18" height="12" />
+          <dc:Bounds x="472" y="776" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_17qke2s_di" bpmnElement="ExclusiveGateway_01xin16">
-        <dc:Bounds x="412" y="799" width="50" height="50" />
+        <dc:Bounds x="572" y="799" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="437" y="849" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1raa09h_di" bpmnElement="SequenceFlow_1raa09h">
-        <di:waypoint xsi:type="dc:Point" x="320" y="824" />
-        <di:waypoint xsi:type="dc:Point" x="412" y="824" />
+        <di:waypoint x="480" y="824" />
+        <di:waypoint x="572" y="824" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="366" y="809" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1nl99y6_di" bpmnElement="SequenceFlow_1nl99y6">
-        <di:waypoint xsi:type="dc:Point" x="462" y="824" />
-        <di:waypoint xsi:type="dc:Point" x="738" y="824" />
-        <di:waypoint xsi:type="dc:Point" x="738" y="745" />
+        <di:waypoint x="622" y="824" />
+        <di:waypoint x="898" y="824" />
+        <di:waypoint x="898" y="745" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="600" y="809" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0n4ya47_di" bpmnElement="ScriptTask_0n4ya47">
-        <dc:Bounds x="387" y="665" width="100" height="80" />
+        <dc:Bounds x="547" y="665" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wif0e5_di" bpmnElement="SequenceFlow_1wif0e5">
-        <di:waypoint xsi:type="dc:Point" x="345" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="387" y="705" />
+        <di:waypoint x="505" y="705" />
+        <di:waypoint x="547" y="705" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="366" y="690" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_147vc14_di" bpmnElement="SequenceFlow_147vc14">
-        <di:waypoint xsi:type="dc:Point" x="487" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="523" y="705" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="505" y="690" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_021b0sz_di" bpmnElement="SequenceFlow_021b0sz">
-        <di:waypoint xsi:type="dc:Point" x="224" y="914" />
-        <di:waypoint xsi:type="dc:Point" x="270" y="914" />
+        <di:waypoint x="384" y="914" />
+        <di:waypoint x="430" y="914" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="247" y="899" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1gtl61j_di" bpmnElement="Task_0026x4v">
-        <dc:Bounds x="124" y="874" width="100" height="80" />
+        <dc:Bounds x="284" y="874" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_0i06ryl_di" bpmnElement="TextAnnotation_0i06ryl">
-        <dc:Bounds x="592" y="596" width="106" height="45" />
+      <bpmndi:BPMNShape id="Activity_16tuuqq_di" bpmnElement="Activity_1bwwwba">
+        <dc:Bounds x="1291" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_0gzsxad_di" bpmnElement="Association_0gzsxad">
-        <di:waypoint xsi:type="dc:Point" x="606" y="665" />
-        <di:waypoint xsi:type="dc:Point" x="627" y="641" />
+      <bpmndi:BPMNEdge id="Flow_10caop8_di" bpmnElement="Flow_10caop8">
+        <di:waypoint x="1341" y="480" />
+        <di:waypoint x="1341" y="648" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn
deleted file mode 100644
index 7ec02addfa..0000000000
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn
+++ /dev/null
@@ -1,547 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0">
-  <bpmn:process id="DoDeleteNetworkInstanceRollback" name="DoDeleteNetworkInstanceRollback" isExecutable="true">
-    <bpmn:startEvent id="StartEvent_1">
-      <bpmn:outgoing>SequenceFlow_1krl2dg</bpmn:outgoing>
-    </bpmn:startEvent>
-    <bpmn:scriptTask id="Task_0whino1" name="PreProcess Incoming Data" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_1krl2dg</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0u41iz2</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-DoDeleteNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1krl2dg" sourceRef="StartEvent_1" targetRef="Task_0whino1" />
-    <bpmn:sequenceFlow id="SequenceFlow_0u41iz2" sourceRef="Task_0whino1" targetRef="ExclusiveGateway_0p5zgdb" />
-    <bpmn:callActivity id="CallActivity_1x88fsq" name="Call RSRC SDNC Activate Adapter" calledElement="sdncAdapter">
-      <bpmn:extensionElements>
-        <camunda:in source="DELNWKIR_rollbackDeactivateSDNCRequest" 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="DELNWKIR_rollbackDeactivateSDNCReturnCode" />
-        <camunda:out source="sdncAdapterResponse" target="DELNWKIR_rollbackDeactivateSDNCResponse" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_1mxbdps</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_07s5r14</bpmn:outgoing>
-    </bpmn:callActivity>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_0p5zgdb" name="is RSRC Deactivate Rollback?" default="SequenceFlow_1bb7zpp">
-      <bpmn:incoming>SequenceFlow_0u41iz2</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1bb7zpp</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_1mxbdps</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:scriptTask id="ScriptTask_1ggaxfu" name="Validate Rollback Responses" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_1xokvq6</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_1xs882r</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1ucaagl</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-DoDeleteNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1bb7zpp" name="No" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="ExclusiveGateway_03d5sol" />
-    <bpmn:sequenceFlow id="SequenceFlow_1mxbdps" name="Yes" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="CallActivity_1x88fsq">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKIR_rollbackDeactivateSDNCRequest") != null}]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_07s5r14" sourceRef="CallActivity_1x88fsq" targetRef="ExclusiveGateway_03d5sol" />
-    <bpmn:endEvent id="EndEvent_1fvr7ad">
-      <bpmn:incoming>SequenceFlow_1ucaagl</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1eyt8z2" sourceRef="ServiceTask_1vx8ti9" targetRef="ExclusiveGateway_03fn5ks" />
-    <bpmn:subProcess id="SubProcess_1p4663w" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
-      <bpmn:scriptTask id="ScriptTask_0by1uwk" name="Log / Print Unexpected Error" scriptFormat="groovy">
-        <bpmn:incoming>SequenceFlow_0xktw7v</bpmn:incoming>
-        <bpmn:outgoing>SequenceFlow_0soe5t3</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-DoDeleteNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
-      </bpmn:scriptTask>
-      <bpmn:startEvent id="StartEvent_1j0eixl">
-        <bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
-        <bpmn:errorEventDefinition errorRef="Error_1" />
-      </bpmn:startEvent>
-      <bpmn:endEvent id="EndEvent_0jxh015">
-        <bpmn:incoming>SequenceFlow_0soe5t3</bpmn:incoming>
-      </bpmn:endEvent>
-      <bpmn:sequenceFlow id="SequenceFlow_0xktw7v" name="" sourceRef="StartEvent_1j0eixl" targetRef="ScriptTask_0by1uwk" />
-      <bpmn:sequenceFlow id="SequenceFlow_0soe5t3" name="" sourceRef="ScriptTask_0by1uwk" targetRef="EndEvent_0jxh015" />
-    </bpmn:subProcess>
-    <bpmn:inclusiveGateway id="ExclusiveGateway_0798yby">
-      <bpmn:incoming>SequenceFlow_1hcmrh9</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_1pi168e</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1xs882r</bpmn:outgoing>
-    </bpmn:inclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_1xs882r" sourceRef="ExclusiveGateway_0798yby" targetRef="ScriptTask_1ggaxfu" />
-    <bpmn:exclusiveGateway id="ExclusiveGateway_03d5sol" name="is PO Network Rollback?" default="SequenceFlow_1yj3542">
-      <bpmn:incoming>SequenceFlow_1bb7zpp</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_07s5r14</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1yj3542</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_18e00sw</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_1yj3542" name="No" sourceRef="ExclusiveGateway_03d5sol" targetRef="ExclusiveGateway_03fn5ks" />
-    <bpmn:serviceTask id="ServiceTask_1vx8ti9" name="Call Rollback Network">
-      <bpmn:extensionElements>
-        <camunda:connector>
-          <camunda:inputOutput>
-            <camunda:inputParameter name="payload">${DELNWKIR_rollbackNetworkRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}
-]]></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">POST</camunda:inputParameter>
-            <camunda:outputParameter name="DELNWKIR_rollbackNetworkResponse">${response}</camunda:outputParameter>
-            <camunda:outputParameter name="DELNWKIR_rollbackNetworkReturnCode">${statusCode}</camunda:outputParameter>
-          </camunda:inputOutput>
-          <camunda:connectorId>http-connector</camunda:connectorId>
-        </camunda:connector>
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_18e00sw</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1eyt8z2</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="SequenceFlow_18e00sw" name="Yes" sourceRef="ExclusiveGateway_03d5sol" targetRef="ServiceTask_1vx8ti9">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKIR_rollbackNetworkRequest") != null}]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_03fn5ks" name="is SDNC Rollback?" default="SequenceFlow_1xokvq6">
-      <bpmn:incoming>SequenceFlow_1yj3542</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_1eyt8z2</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1xokvq6</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_172safw</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_1ga27si" name="is RSRC SDNC?" default="SequenceFlow_1wy1aba">
-      <bpmn:incoming>SequenceFlow_172safw</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1wy1aba</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_1yltkyg</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_1xokvq6" name="No" sourceRef="ExclusiveGateway_03fn5ks" targetRef="ScriptTask_1ggaxfu" />
-    <bpmn:sequenceFlow id="SequenceFlow_172safw" name="Yes" sourceRef="ExclusiveGateway_03fn5ks" targetRef="ExclusiveGateway_1ga27si">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKIR_rollbackSDNCRequest") != null}]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_1wy1aba" name="No" sourceRef="ExclusiveGateway_1ga27si" targetRef="Task_00chyig" />
-    <bpmn:sequenceFlow id="SequenceFlow_1yltkyg" name="Yes" sourceRef="ExclusiveGateway_1ga27si" targetRef="Task_1iuumxi">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_1hcmrh9" sourceRef="Task_1iuumxi" targetRef="ExclusiveGateway_0798yby" />
-    <bpmn:sequenceFlow id="SequenceFlow_1pi168e" sourceRef="Task_00chyig" targetRef="ExclusiveGateway_0798yby" />
-    <bpmn:callActivity id="Task_1iuumxi" name="Call Assign RSRC SDNC Adapter" calledElement="sdncAdapter">
-      <bpmn:extensionElements>
-        <camunda:in source="DELNWKIR_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="DELNWKIR_rollbackSDNCReturnCode" />
-        <camunda:out source="sdncAdapterResponse" target="DELNWKIR_rollbackSDNCResponse" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_1yltkyg</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1hcmrh9</bpmn:outgoing>
-    </bpmn:callActivity>
-    <bpmn:callActivity id="Task_00chyig" name="Call Rollback SDNC Adapter" calledElement="sdncAdapter">
-      <bpmn:extensionElements>
-        <camunda:in source="DELNWKIR_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="DELNWKIR_rollbackSDNCReturnCode" />
-        <camunda:out source="sdncAdapterResponse" target="DELNWKIR_rollbackSDNCResponse" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_1wy1aba</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1pi168e</bpmn:outgoing>
-    </bpmn:callActivity>
-    <bpmn:sequenceFlow id="SequenceFlow_1ucaagl" sourceRef="ScriptTask_1ggaxfu" targetRef="EndEvent_1fvr7ad" />
-    <bpmn:subProcess id="SubProcess_02vfqr7" triggeredByEvent="true">
-      <bpmn:endEvent id="EndEvent_0m7hpuj">
-        <bpmn:incoming>SequenceFlow_1s5yjuu</bpmn:incoming>
-      </bpmn:endEvent>
-      <bpmn:scriptTask id="ScriptTask_0yr3vca" name="Catch Exception" scriptFormat="groovy">
-        <bpmn:incoming>SequenceFlow_01hh1wq</bpmn:incoming>
-        <bpmn:outgoing>SequenceFlow_1s5yjuu</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-execution.setVariable("workflowException", execution.getVariable("WorkflowException")]]></bpmn:script>
-      </bpmn:scriptTask>
-      <bpmn:startEvent id="StartEvent_001ol7f">
-        <bpmn:outgoing>SequenceFlow_01hh1wq</bpmn:outgoing>
-        <bpmn:errorEventDefinition errorRef="Error_2" />
-      </bpmn:startEvent>
-      <bpmn:sequenceFlow id="SequenceFlow_1s5yjuu" sourceRef="ScriptTask_0yr3vca" targetRef="EndEvent_0m7hpuj" />
-      <bpmn:sequenceFlow id="SequenceFlow_01hh1wq" sourceRef="StartEvent_001ol7f" targetRef="ScriptTask_0yr3vca" />
-    </bpmn:subProcess>
-    <bpmn:boundaryEvent id="BoundaryEvent_1mrkh9x" attachedToRef="CallActivity_1x88fsq">
-      <bpmn:outgoing>SequenceFlow_0b0m3o7</bpmn:outgoing>
-      <bpmn:errorEventDefinition errorRef="Error_2" />
-    </bpmn:boundaryEvent>
-    <bpmn:boundaryEvent id="BoundaryEvent_16cracu" attachedToRef="ServiceTask_1vx8ti9">
-      <bpmn:outgoing>SequenceFlow_141226w</bpmn:outgoing>
-      <bpmn:errorEventDefinition errorRef="Error_2" />
-    </bpmn:boundaryEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_141226w" sourceRef="BoundaryEvent_16cracu" targetRef="EndEvent_00y9o8y" />
-    <bpmn:sequenceFlow id="SequenceFlow_0b0m3o7" sourceRef="BoundaryEvent_1mrkh9x" targetRef="EndEvent_00y9o8y" />
-    <bpmn:endEvent id="EndEvent_00y9o8y">
-      <bpmn:incoming>SequenceFlow_141226w</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_0b0m3o7</bpmn:incoming>
-      <bpmn:errorEventDefinition errorRef="Error_2" />
-    </bpmn:endEvent>
-    <bpmn:boundaryEvent id="BoundaryEvent_1gk4tem" attachedToRef="Task_1iuumxi">
-      <bpmn:outgoing>SequenceFlow_1lr1613</bpmn:outgoing>
-      <bpmn:errorEventDefinition errorRef="Error_2" />
-    </bpmn:boundaryEvent>
-    <bpmn:boundaryEvent id="BoundaryEvent_1qaz277" attachedToRef="Task_00chyig">
-      <bpmn:outgoing>SequenceFlow_0np0b8p</bpmn:outgoing>
-      <bpmn:errorEventDefinition errorRef="Error_2" />
-    </bpmn:boundaryEvent>
-    <bpmn:endEvent id="EndEvent_1qfbudr">
-      <bpmn:incoming>SequenceFlow_1lr1613</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_0np0b8p</bpmn:incoming>
-      <bpmn:errorEventDefinition errorRef="Error_2" />
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1lr1613" sourceRef="BoundaryEvent_1gk4tem" targetRef="EndEvent_1qfbudr" />
-    <bpmn:sequenceFlow id="SequenceFlow_0np0b8p" sourceRef="BoundaryEvent_1qaz277" targetRef="EndEvent_1qfbudr" />
-    <bpmn:textAnnotation id="TextAnnotation_000ap15">    <bpmn:text><![CDATA[Include ONLY inputs/varrables:  
-rollbackData, as Map
--rollbackDeactivateSDNCRequest
--rollbackNetworkRequest 
-WorkflowException
-]]></bpmn:text>
-</bpmn:textAnnotation>
-    <bpmn:association id="Association_0ybkmal" sourceRef="Task_0whino1" targetRef="TextAnnotation_000ap15" />
-    <bpmn:textAnnotation id="TextAnnotation_0vwyo82">    <bpmn:text><![CDATA[set value for:
-WorkflowException
-rolledBack
-wasDeleted
-]]></bpmn:text>
-</bpmn:textAnnotation>
-    <bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" />
-  </bpmn:process>
-  <bpmn:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
-  <bpmn:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteNetworkInstanceRollback">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="214" y="240" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="232" y="276" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1dqe09s_di" bpmnElement="Task_0whino1">
-        <dc:Bounds x="333" y="218" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1krl2dg_di" bpmnElement="SequenceFlow_1krl2dg">
-        <di:waypoint xsi:type="dc:Point" x="250" y="258" />
-        <di:waypoint xsi:type="dc:Point" x="333" y="258" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="292" y="243" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0u41iz2_di" bpmnElement="SequenceFlow_0u41iz2">
-        <di:waypoint xsi:type="dc:Point" x="433" y="258" />
-        <di:waypoint xsi:type="dc:Point" x="556" y="258" />
-        <di:waypoint xsi:type="dc:Point" x="556" y="347" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="495" y="243" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_1x88fsq_di" bpmnElement="CallActivity_1x88fsq">
-        <dc:Bounds x="506" y="481" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0p5zgdb_di" bpmnElement="ExclusiveGateway_0p5zgdb" isMarkerVisible="true">
-        <dc:Bounds x="531" y="347" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="451" y="360" width="55" height="36" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_000ap15_di" bpmnElement="TextAnnotation_000ap15">
-        <dc:Bounds x="112" y="355" width="277" height="115" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_0ybkmal_di" bpmnElement="Association_0ybkmal">
-        <di:waypoint xsi:type="dc:Point" x="349" y="298" />
-        <di:waypoint xsi:type="dc:Point" x="300" y="355" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1ggaxfu_di" bpmnElement="ScriptTask_1ggaxfu">
-        <dc:Bounds x="1097" y="332" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_0vwyo82_di" bpmnElement="TextAnnotation_0vwyo82">
-        <dc:Bounds x="1230" y="448" width="165" height="60" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_1gx121b_di" bpmnElement="Association_1gx121b">
-        <di:waypoint xsi:type="dc:Point" x="1195" y="404" />
-        <di:waypoint xsi:type="dc:Point" x="1264" y="448" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1bb7zpp_di" bpmnElement="SequenceFlow_1bb7zpp">
-        <di:waypoint xsi:type="dc:Point" x="581" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="711" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="589" y="350.17259171746633" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1mxbdps_di" bpmnElement="SequenceFlow_1mxbdps">
-        <di:waypoint xsi:type="dc:Point" x="556" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="556" y="481" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="560" y="397.10731155015196" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_07s5r14_di" bpmnElement="SequenceFlow_07s5r14">
-        <di:waypoint xsi:type="dc:Point" x="606" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="639" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="639" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="711" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="654" y="446.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1fvr7ad_di" bpmnElement="EndEvent_1fvr7ad">
-        <dc:Bounds x="1253" y="252" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1271" y="288" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1eyt8z2_di" bpmnElement="SequenceFlow_1eyt8z2">
-        <di:waypoint xsi:type="dc:Point" x="786" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="815" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="815" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="866" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="830" y="446.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
-        <dc:Bounds x="-6" y="665" width="394" height="188" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
-        <dc:Bounds x="142" y="720" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
-        <dc:Bounds x="27" y="742" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="45" y="783" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
-        <dc:Bounds x="303" y="742" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="321" y="783" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
-        <di:waypoint xsi:type="dc:Point" x="63" y="760" />
-        <di:waypoint xsi:type="dc:Point" x="142" y="760" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="105" y="760" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
-        <di:waypoint xsi:type="dc:Point" x="242" y="760" />
-        <di:waypoint xsi:type="dc:Point" x="303" y="760" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="277" y="760" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="InclusiveGateway_04myanb_di" bpmnElement="ExclusiveGateway_0798yby">
-        <dc:Bounds x="1122" y="496" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1147" y="546" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1xs882r_di" bpmnElement="SequenceFlow_1xs882r">
-        <di:waypoint xsi:type="dc:Point" x="1147" y="496" />
-        <di:waypoint xsi:type="dc:Point" x="1147" y="412" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1162" y="454" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_03d5sol_di" bpmnElement="ExclusiveGateway_03d5sol" isMarkerVisible="true">
-        <dc:Bounds x="711" y="347" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="699" y="312" width="74" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1yj3542_di" bpmnElement="SequenceFlow_1yj3542">
-        <di:waypoint xsi:type="dc:Point" x="761" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="866" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="774" y="354" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ServiceTask_1vx8ti9_di" bpmnElement="ServiceTask_1vx8ti9">
-        <dc:Bounds x="686" y="481" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_18e00sw_di" bpmnElement="SequenceFlow_18e00sw">
-        <di:waypoint xsi:type="dc:Point" x="736" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="736" y="481" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="748" y="394" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_03fn5ks_di" bpmnElement="ExclusiveGateway_03fn5ks" isMarkerVisible="true">
-        <dc:Bounds x="866" y="347" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="867" y="310" width="48" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1ga27si_di" bpmnElement="ExclusiveGateway_1ga27si" isMarkerVisible="true">
-        <dc:Bounds x="866" y="496" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="898" y="456" width="82" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1xokvq6_di" bpmnElement="SequenceFlow_1xokvq6">
-        <di:waypoint xsi:type="dc:Point" x="916" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="1097" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="926" y="353" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_172safw_di" bpmnElement="SequenceFlow_172safw">
-        <di:waypoint xsi:type="dc:Point" x="891" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="891" y="496" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="898" y="396.5" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1wy1aba_di" bpmnElement="SequenceFlow_1wy1aba">
-        <di:waypoint xsi:type="dc:Point" x="891" y="546" />
-        <di:waypoint xsi:type="dc:Point" x="891" y="677" />
-        <di:waypoint xsi:type="dc:Point" x="955" y="677" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="903" y="541.5" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1yltkyg_di" bpmnElement="SequenceFlow_1yltkyg">
-        <di:waypoint xsi:type="dc:Point" x="916" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="955" y="521" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="915" y="502" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1hcmrh9_di" bpmnElement="SequenceFlow_1hcmrh9">
-        <di:waypoint xsi:type="dc:Point" x="1055" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="1122" y="521" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1089" y="506" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1pi168e_di" bpmnElement="SequenceFlow_1pi168e">
-        <di:waypoint xsi:type="dc:Point" x="1055" y="677" />
-        <di:waypoint xsi:type="dc:Point" x="1147" y="677" />
-        <di:waypoint xsi:type="dc:Point" x="1147" y="546" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1101" y="662" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_12rk9t5_di" bpmnElement="Task_1iuumxi">
-        <dc:Bounds x="955" y="481" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_0l1dvlv_di" bpmnElement="Task_00chyig">
-        <dc:Bounds x="955" y="637" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1ucaagl_di" bpmnElement="SequenceFlow_1ucaagl">
-        <di:waypoint xsi:type="dc:Point" x="1147" y="332" />
-        <di:waypoint xsi:type="dc:Point" x="1147" y="270" />
-        <di:waypoint xsi:type="dc:Point" x="1253" y="270" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1162" y="301" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_02vfqr7_di" bpmnElement="SubProcess_02vfqr7" isExpanded="true">
-        <dc:Bounds x="-10" y="898" width="382" height="213" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0m7hpuj_di" bpmnElement="EndEvent_0m7hpuj">
-        <dc:Bounds x="293" y="977" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="311" y="1013" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0yr3vca_di" bpmnElement="ScriptTask_0yr3vca">
-        <dc:Bounds x="120" y="955" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_001ol7f_di" bpmnElement="StartEvent_001ol7f">
-        <dc:Bounds x="20" y="977" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="38" y="1013" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1s5yjuu_di" bpmnElement="SequenceFlow_1s5yjuu">
-        <di:waypoint xsi:type="dc:Point" x="220" y="995" />
-        <di:waypoint xsi:type="dc:Point" x="293" y="995" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="257" y="970" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_01hh1wq_di" bpmnElement="SequenceFlow_01hh1wq">
-        <di:waypoint xsi:type="dc:Point" x="56" y="995" />
-        <di:waypoint xsi:type="dc:Point" x="120" y="995" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="88" y="980" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="BoundaryEvent_10qmjw0_di" bpmnElement="BoundaryEvent_1mrkh9x">
-        <dc:Bounds x="588" y="543" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="606" y="579" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BoundaryEvent_1n1s1n0_di" bpmnElement="BoundaryEvent_16cracu">
-        <dc:Bounds x="668" y="543" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="686" y="579" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_141226w_di" bpmnElement="SequenceFlow_141226w">
-        <di:waypoint xsi:type="dc:Point" x="677" y="577" />
-        <di:waypoint xsi:type="dc:Point" x="655" y="613" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="666" y="580" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0b0m3o7_di" bpmnElement="SequenceFlow_0b0m3o7">
-        <di:waypoint xsi:type="dc:Point" x="615" y="576" />
-        <di:waypoint xsi:type="dc:Point" x="637" y="614" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="626" y="580" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_0yeci14_di" bpmnElement="EndEvent_00y9o8y">
-        <dc:Bounds x="628" y="611" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="646" y="647" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BoundaryEvent_10psbey_di" bpmnElement="BoundaryEvent_1gk4tem">
-        <dc:Bounds x="1037" y="543" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1055" y="579" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BoundaryEvent_0wka4xd_di" bpmnElement="BoundaryEvent_1qaz277">
-        <dc:Bounds x="1037" y="619" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1055" y="655" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0c33uj0_di" bpmnElement="EndEvent_1qfbudr">
-        <dc:Bounds x="1089" y="587" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1107" y="623" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1lr1613_di" bpmnElement="SequenceFlow_1lr1613">
-        <di:waypoint xsi:type="dc:Point" x="1068" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="1094" y="594" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1081" y="568" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0np0b8p_di" bpmnElement="SequenceFlow_0np0b8p">
-        <di:waypoint xsi:type="dc:Point" x="1070" y="628" />
-        <di:waypoint xsi:type="dc:Point" x="1092" y="614" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1081" y="606" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn
index 6026fc84b3..e08ffbde2f 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn
@@ -1,12 +1,12 @@
 <?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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.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:incoming>SequenceFlow_0fp1wqz</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
+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">
@@ -30,7 +30,7 @@ dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_029ioyr</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14xn858</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapterTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeopenstackAdapterTask" />
     <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke
&#10;SDNCAdapterV1" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
@@ -48,22 +48,22 @@ dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_14xn858</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.prepVNFAdapterRequest(execution)]]></bpmn2:script>
+dvm.prepVNFAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.prepSDNCAdapterRequest(execution, "delete")]]></bpmn2:script>
+dvm.prepSDNCAdapterRequest(execution, "delete")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="InvokeSDNCAdapterV1_2" />
-    <bpmn2:callActivity id="InvokeVNFAdapterTask" name="Invoke&#10;VNFAdapterTask" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="InvokeopenstackAdapterTask" name="Invoke&#10;openstackAdapterTask" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:in source="vnfAdapterTaskRequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="vnfAdapterTaskRequest" target="openstackAdapterTaskRequest" />
         <camunda:out source="WorkflowResponse" target="DoDVfMod_doDeleteVfModuleResponse" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -88,33 +88,33 @@ dvm.prepSDNCAdapterRequest(execution, "delete")]]></bpmn2:script>
     <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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
+dvm.prepDeleteAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="DeleteAAIVfModulePrep" targetRef="InvokeDeleteAAIVfModule" />
     <bpmn2:scriptTask id="validateSDNCResponse" name="Validate SDNC Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.sdncValidateResponse(execution, DoDVfMod_doDeleteVfModuleResponse)]]></bpmn2:script>
+dvm.sdncValidateResponse(execution, DoDVfMod_doDeleteVfModuleResponse)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="validateSDNCResponse" targetRef="DeleteAAIVfModulePrep" />
     <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.preProcessRequest(execution)]]></bpmn2:script>
+dvm.preProcessRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="InitializeVariables" targetRef="PrepareUpdateAAIVfModulePrep" />
     <bpmn2:scriptTask id="PrepareUpdateAAIVfModulePrep" name="PrepareUpdateAAIVfModule Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_42</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.preProcessRequest(execution)]]></bpmn2:script>
+dvm.preProcessRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_42" name="" sourceRef="PrepareUpdateAAIVfModulePrep" targetRef="Task_0h2lui6" />
     <bpmn2:startEvent id="StartEvent_1">
@@ -125,16 +125,16 @@ dvm.preProcessRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="DeleteNetworkPoliciesFromAAI" name="Delete Network Policies from AAI" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0coa90m</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_08g02ch</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.deleteNetworkPoliciesFromAAI(execution)]]></bpmn2:script>
+dvm.deleteNetworkPoliciesFromAAI(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNFAdapter Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1xruki1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0coa90m</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+dvm.postProcessVNFAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0coa90m" sourceRef="PostProcessVNFAdapterRequest" targetRef="DeleteNetworkPoliciesFromAAI" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1drlnlk" name="need to update VNF in AAI?" default="SequenceFlow_0ep3hjm">
@@ -144,7 +144,7 @@ dvm.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_08g02ch" sourceRef="DeleteNetworkPoliciesFromAAI" targetRef="ExclusiveGateway_1drlnlk" />
     <bpmn2:sequenceFlow id="SequenceFlow_1yehsyc" name="yes" sourceRef="ExclusiveGateway_1drlnlk" targetRef="PreProcessUpdateAAIGenericVnf">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DoDVfMod_oamManagementV4Address") != null  || execution.getVariable("DoDVfMod_oamManagementV6Address") != null]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DoDVfMod_oamManagementV4Address") != null  || execution.getVariable("DoDVfMod_oamManagementV6Address") != null</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1a7lzhz" sourceRef="PreProcessUpdateAAIGenericVnf" targetRef="UpdateAAIGenericVnfTask" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_0lsru7z">
@@ -158,9 +158,9 @@ dvm.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="PreProcessUpdateAAIGenericVnf" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1yehsyc</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1a7lzhz</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doDeleteVfModule = new DoDeleteVfModule()
-doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+doDeleteVfModule.prepUpdateAAIGenericVnf(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="UpdateAAIGenericVnfTask" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">
       <bpmn2:extensionElements>
@@ -177,11 +177,11 @@ doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="Task_0h2lui6" name="Query AAI for Orchestration Status" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_42</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_029ioyr</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def dvm = new DoDeleteVfModule()
-dvm.queryAAIVfModuleForStatus(execution)]]></bpmn2:script>
+dvm.queryAAIVfModuleForStatus(execution)</bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1xruki1" sourceRef="InvokeVNFAdapterTask" targetRef="PostProcessVNFAdapterRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1xruki1" sourceRef="InvokeopenstackAdapterTask" targetRef="PostProcessVNFAdapterRequest" />
     <bpmn2:sequenceFlow id="SequenceFlow_14xn858" sourceRef="InvokePrepareUpdateAAIVfModule" targetRef="VNFAdapterPrep" />
   </bpmn2:process>
   <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
@@ -189,240 +189,240 @@ dvm.queryAAIVfModuleForStatus(execution)]]></bpmn2:script>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteVfModule">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
-        <dc:Bounds x="34" y="57" width="36" height="36" />
+        <dc:Bounds x="154" y="107" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="52" y="98" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">
-        <dc:Bounds x="144" y="36" width="100" height="80" />
+        <dc:Bounds x="264" y="86" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">
-        <di:waypoint xsi:type="dc:Point" x="70" y="75" />
-        <di:waypoint xsi:type="dc:Point" x="144" y="76" />
+        <di:waypoint x="190" y="125" />
+        <di:waypoint x="264" y="126" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="104" y="0" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="InvokePrepareUpdateAAIVfModule">
-        <dc:Bounds x="647" y="36" width="100" height="80" />
+        <dc:Bounds x="767" y="86" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="PrepareUpdateAAIVfModulePrep">
-        <dc:Bounds x="315" y="36" width="100" height="80" />
+        <dc:Bounds x="435" y="86" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_168">
-        <di:waypoint xsi:type="dc:Point" x="244" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="315" y="76" />
+        <di:waypoint x="364" y="126" />
+        <di:waypoint x="435" y="126" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="269" y="0" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="VNFAdapterPrep">
-        <dc:Bounds x="193" y="206" width="100" height="80" />
+        <dc:Bounds x="313" y="256" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapterTask">
-        <dc:Bounds x="404" y="206" width="100" height="80" />
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeopenstackAdapterTask">
+        <dc:Bounds x="524" y="256" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_171" bpmnElement="UpdateAAIVfModulePrep">
-        <dc:Bounds x="844" y="385" width="100" height="80" />
+        <dc:Bounds x="964" y="435" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_14" bpmnElement="InvokeUpdateAAIVfModule">
-        <dc:Bounds x="995" y="385" width="100" height="80" />
+        <dc:Bounds x="1115" y="435" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ScriptTask_171" targetElement="_BPMNShape_CallActivity_14">
-        <di:waypoint xsi:type="dc:Point" x="944" y="425" />
-        <di:waypoint xsi:type="dc:Point" x="995" y="425" />
+        <di:waypoint x="1064" y="475" />
+        <di:waypoint x="1115" y="475" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="970" y="410" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2">
-        <dc:Bounds x="140" y="665" width="100" height="80" />
+        <dc:Bounds x="260" y="715" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="InvokeSDNCAdapterV1_2">
-        <dc:Bounds x="272" y="665" width="100" height="80" />
+        <dc:Bounds x="392" y="715" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="DeleteAAIVfModulePrep">
-        <dc:Bounds x="547" y="665" width="100" height="80" />
+        <dc:Bounds x="667" y="715" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_16" bpmnElement="InvokeDeleteAAIVfModule">
-        <dc:Bounds x="690" y="665" width="100" height="80" />
+        <dc:Bounds x="810" y="715" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_CallActivity_14" targetElement="_BPMNShape_ScriptTask_172">
-        <di:waypoint xsi:type="dc:Point" x="1045" y="465" />
-        <di:waypoint xsi:type="dc:Point" x="1045" y="603" />
-        <di:waypoint xsi:type="dc:Point" x="70" y="603" />
-        <di:waypoint xsi:type="dc:Point" x="70" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="140" y="705" />
+        <di:waypoint x="1165" y="515" />
+        <di:waypoint x="1165" y="653" />
+        <di:waypoint x="190" y="653" />
+        <di:waypoint x="190" y="755" />
+        <di:waypoint x="260" y="755" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="558" y="588" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_CallActivity_15">
-        <di:waypoint xsi:type="dc:Point" x="240" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="256" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="256" y="706" />
-        <di:waypoint xsi:type="dc:Point" x="272" y="706" />
+        <di:waypoint x="360" y="755" />
+        <di:waypoint x="376" y="755" />
+        <di:waypoint x="376" y="756" />
+        <di:waypoint x="392" y="756" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="268" y="558" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_CallActivity_15" targetElement="_BPMNShape_ScriptTask_251">
-        <di:waypoint xsi:type="dc:Point" x="372" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="404" y="705" />
+        <di:waypoint x="492" y="755" />
+        <di:waypoint x="524" y="755" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="388" y="705" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_CallActivity_16">
-        <di:waypoint xsi:type="dc:Point" x="647" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="690" y="705" />
+        <di:waypoint x="767" y="755" />
+        <di:waypoint x="810" y="755" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="669" y="690" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_169" bpmnElement="EndEvent_9">
-        <dc:Bounds x="836" y="687" width="36" height="36" />
+        <dc:Bounds x="956" y="737" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="854" y="728" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_CallActivity_16" targetElement="_BPMNShape_EndEvent_169">
-        <di:waypoint xsi:type="dc:Point" x="790" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="705" />
+        <di:waypoint x="910" y="755" />
+        <di:waypoint x="956" y="755" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="813" y="690" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_42" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_ScriptTask_160">
-        <di:waypoint xsi:type="dc:Point" x="415" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="483" y="76" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_42" sourceElement="_BPMNShape_ScriptTask_168" targetElement="ScriptTask_15vzlxw_di">
+        <di:waypoint x="535" y="126" />
+        <di:waypoint x="603" y="126" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="449" y="61" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ScriptTask_170">
-        <di:waypoint xsi:type="dc:Point" x="293" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="404" y="246" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_170" targetElement="_BPMNShape_CallActivity_13">
+        <di:waypoint x="413" y="296" />
+        <di:waypoint x="524" y="296" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="349" y="231" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_251" bpmnElement="validateSDNCResponse">
-        <dc:Bounds x="404" y="665" width="100" height="80" />
+        <dc:Bounds x="524" y="715" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_251" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="504" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="547" y="705" />
+        <di:waypoint x="624" y="755" />
+        <di:waypoint x="667" y="755" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="526" y="690" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0la8haz_di" bpmnElement="DeleteNetworkPoliciesFromAAI">
-        <dc:Bounds x="202" y="385" width="100" height="80" />
+        <dc:Bounds x="322" y="435" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0lewl6b_di" bpmnElement="PostProcessVNFAdapterRequest">
-        <dc:Bounds x="620" y="206" width="100" height="80" />
+        <dc:Bounds x="740" y="256" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0coa90m_di" bpmnElement="SequenceFlow_0coa90m">
-        <di:waypoint xsi:type="dc:Point" x="720" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="923" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="923" y="333" />
-        <di:waypoint xsi:type="dc:Point" x="76" y="333" />
-        <di:waypoint xsi:type="dc:Point" x="76" y="425" />
-        <di:waypoint xsi:type="dc:Point" x="202" y="425" />
+        <di:waypoint x="840" y="296" />
+        <di:waypoint x="1043" y="296" />
+        <di:waypoint x="1043" y="383" />
+        <di:waypoint x="196" y="383" />
+        <di:waypoint x="196" y="475" />
+        <di:waypoint x="322" y="475" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="500" y="318" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1drlnlk_di" bpmnElement="ExclusiveGateway_1drlnlk" isMarkerVisible="true">
-        <dc:Bounds x="415" y="400" width="50" height="50" />
+        <dc:Bounds x="535" y="450" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="402" y="362" width="75" height="24" />
+          <dc:Bounds x="523" y="412" width="74" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_08g02ch_di" bpmnElement="SequenceFlow_08g02ch">
-        <di:waypoint xsi:type="dc:Point" x="302" y="425" />
-        <di:waypoint xsi:type="dc:Point" x="415" y="425" />
+        <di:waypoint x="422" y="475" />
+        <di:waypoint x="535" y="475" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="359" y="410" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yehsyc_di" bpmnElement="SequenceFlow_1yehsyc">
-        <di:waypoint xsi:type="dc:Point" x="440" y="450" />
-        <di:waypoint xsi:type="dc:Point" x="440" y="517" />
-        <di:waypoint xsi:type="dc:Point" x="477" y="517" />
+        <di:waypoint x="560" y="500" />
+        <di:waypoint x="560" y="567" />
+        <di:waypoint x="597" y="567" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="406" y="473" width="18" height="12" />
+          <dc:Bounds x="527" y="523" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1a7lzhz_di" bpmnElement="SequenceFlow_1a7lzhz">
-        <di:waypoint xsi:type="dc:Point" x="577" y="517" />
-        <di:waypoint xsi:type="dc:Point" x="624" y="517" />
-        <di:waypoint xsi:type="dc:Point" x="624" y="517" />
-        <di:waypoint xsi:type="dc:Point" x="654" y="517" />
+        <di:waypoint x="697" y="567" />
+        <di:waypoint x="744" y="567" />
+        <di:waypoint x="744" y="567" />
+        <di:waypoint x="774" y="567" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="639" y="517" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0lsru7z_di" bpmnElement="ExclusiveGateway_0lsru7z" isMarkerVisible="true">
-        <dc:Bounds x="759" y="400" width="50" height="50" />
+        <dc:Bounds x="879" y="450" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="784" y="450" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ep3hjm_di" bpmnElement="SequenceFlow_0ep3hjm">
-        <di:waypoint xsi:type="dc:Point" x="465" y="425" />
-        <di:waypoint xsi:type="dc:Point" x="759" y="425" />
+        <di:waypoint x="585" y="475" />
+        <di:waypoint x="879" y="475" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="606" y="400" width="12" height="12" />
+          <dc:Bounds x="726" y="450" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_14l7olw_di" bpmnElement="SequenceFlow_14l7olw">
-        <di:waypoint xsi:type="dc:Point" x="754" y="517" />
-        <di:waypoint xsi:type="dc:Point" x="784" y="517" />
-        <di:waypoint xsi:type="dc:Point" x="784" y="450" />
+        <di:waypoint x="874" y="567" />
+        <di:waypoint x="904" y="567" />
+        <di:waypoint x="904" y="500" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="769" y="502" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0fp1wqz_di" bpmnElement="SequenceFlow_0fp1wqz">
-        <di:waypoint xsi:type="dc:Point" x="809" y="425" />
-        <di:waypoint xsi:type="dc:Point" x="844" y="425" />
+        <di:waypoint x="929" y="475" />
+        <di:waypoint x="964" y="475" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="827" y="400" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_18y0guc_di" bpmnElement="PreProcessUpdateAAIGenericVnf">
-        <dc:Bounds x="477" y="477" width="100" height="80" />
+        <dc:Bounds x="597" y="527" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0kbqf50_di" bpmnElement="UpdateAAIGenericVnfTask">
-        <dc:Bounds x="654" y="477" width="100" height="80" />
+        <dc:Bounds x="774" y="527" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_029ioyr_di" bpmnElement="SequenceFlow_029ioyr">
-        <di:waypoint xsi:type="dc:Point" x="583" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="647" y="76" />
+        <di:waypoint x="703" y="126" />
+        <di:waypoint x="767" y="126" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="615" y="61" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_15vzlxw_di" bpmnElement="Task_0h2lui6">
-        <dc:Bounds x="483" y="36" width="100" height="80" />
+        <dc:Bounds x="603" y="86" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1xruki1_di" bpmnElement="SequenceFlow_1xruki1">
-        <di:waypoint xsi:type="dc:Point" x="504" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="620" y="246" />
+        <di:waypoint x="624" y="296" />
+        <di:waypoint x="740" y="296" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="562" y="231" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_14xn858_di" bpmnElement="SequenceFlow_14xn858">
-        <di:waypoint xsi:type="dc:Point" x="747" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="914" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="914" y="154" />
-        <di:waypoint xsi:type="dc:Point" x="71" y="154" />
-        <di:waypoint xsi:type="dc:Point" x="71" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="193" y="246" />
+        <di:waypoint x="867" y="126" />
+        <di:waypoint x="1034" y="126" />
+        <di:waypoint x="1034" y="204" />
+        <di:waypoint x="191" y="204" />
+        <di:waypoint x="191" y="296" />
+        <di:waypoint x="313" y="296" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="493" y="139" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn
index 918964f8f8..2dcf79ec8b 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.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: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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoDeleteVfModuleFromVnf" name="DoDeleteVfModuleFromVnf" isExecutable="true">
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapter" />
     <bpmn2:callActivity id="callSDNCAdapterTopologyUnassign" name="Call SDNC Adapter Topology Unassign" calledElement="sdncAdapter">
@@ -19,22 +19,22 @@
     <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
&#10;&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0kx9e3s</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.prepVNFAdapterRequest(execution)]]></bpmn2:script>
+ddvmfv.prepVNFAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter
&#10;&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0ltm4jt</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
+ddvmfv.preProcessSDNCUnassignRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="callSDNCAdapterTopologyUnassign" />
-    <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;&#10;VNFAdapter" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;&#10;VNFAdapter" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:in source="vnfAdapterTaskRequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="vnfAdapterTaskRequest" target="openstackAdapterTaskRequest" />
         <camunda:out source="WorkflowResponse" target="DDVMFV_doDeleteVfModuleResponse" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -48,33 +48,33 @@ ddvmfv.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="validateSDNCResponse" name="PostProcess SDNC Adapter Unassign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
 String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse")
-ddvmfv.validateSDNCResponse(execution, response, "unassign")]]></bpmn2:script>
+ddvmfv.validateSDNCResponse(execution, response, "unassign")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="validateSDNCResponse" targetRef="DeleteAAIVfModulePrep" />
     <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0qbjihn</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.preProcessRequest(execution)]]></bpmn2:script>
+ddvmfv.preProcessRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="InitializeVariables" />
     <bpmn2:scriptTask id="DeleteNetworkPoliciesFromAAI" name="Delete Network Policies from AAI" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0coa90m</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ltm4jt</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.deleteNetworkPoliciesFromAAI(execution)]]></bpmn2:script>
+ddvmfv.deleteNetworkPoliciesFromAAI(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNFAdapter Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0hia88a</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0coa90m</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+ddvmfv.postProcessVNFAdapterRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0coa90m" sourceRef="PostProcessVNFAdapterRequest" targetRef="DeleteNetworkPoliciesFromAAI" />
     <bpmn2:startEvent id="StartEvent_1">
@@ -88,9 +88,9 @@ ddvmfv.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="preProcessSDNCDeactivateRequest" name="PreProcess SDNC Deactivate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1igsfgk</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0y4td40</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
+ddvmfv.preProcessSDNCDeactivateRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="callSDNCAdapterTopologyDeactivate" name="Call SDNC Adapter Topology Deactivate" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -108,27 +108,27 @@ ddvmfv.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="postProcessSDNCDeactivateRequest" name="PostProcess SDNC Adapter Deactivate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_12q2r4i</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0kx9e3s</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
 String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse")
-ddvmfv.validateSDNCResponse(execution, response, "deactivate")]]></bpmn2:script>
+ddvmfv.validateSDNCResponse(execution, response, "deactivate")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0qbjihn" sourceRef="InitializeVariables" targetRef="QueryAAIForVfModule" />
     <bpmn2:sequenceFlow id="SequenceFlow_1c2lvlc" sourceRef="QueryAAIForVfModule" targetRef="ValidateVfModule" />
     <bpmn2:scriptTask id="QueryAAIForVfModule" name="Query AAI for VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0qbjihn</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1c2lvlc</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.queryAAIForVfModule(execution)]]></bpmn2:script>
+ddvmfv.queryAAIForVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1igsfgk" sourceRef="ValidateVfModule" targetRef="preProcessSDNCDeactivateRequest" />
     <bpmn2:scriptTask id="ValidateVfModule" name="Validate VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1c2lvlc</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1igsfgk</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.validateVfModule(execution)]]></bpmn2:script>
+ddvmfv.validateVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:subProcess id="SubProcess_1r8unf9" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
       <bpmn2:startEvent id="StartEvent_1ebrix6">
@@ -141,9 +141,9 @@ ddvmfv.validateVfModule(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="ScriptTask_1ypch9x" name="Log / Print Unexpected Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_095634c</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0yvjvhu</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
-ex.processJavaException(execution)]]></bpmn2:script>
+ex.processJavaException(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_095634c" name="" sourceRef="StartEvent_1ebrix6" targetRef="ScriptTask_1ypch9x" />
       <bpmn2:sequenceFlow id="SequenceFlow_0yvjvhu" name="" sourceRef="ScriptTask_1ypch9x" targetRef="EndEvent_0yb2lmo" />
@@ -161,9 +161,9 @@ ex.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule
&#10;&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_092kvy3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
+ddvmfv.prepDeleteAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_092kvy3" name="" sourceRef="DeleteAAIVfModulePrep" targetRef="DeleteAAIVfModule" />
     <bpmn2:sequenceFlow id="SequenceFlow_1eemrjp" sourceRef="DeleteAAIVfModule" targetRef="EndEvent_9" />
@@ -174,218 +174,218 @@ ddvmfv.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteVfModuleFromVnf">
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">
-        <dc:Bounds x="144" y="36" width="100" height="80" />
+        <dc:Bounds x="264" y="86" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" targetElement="_BPMNShape_ScriptTask_22">
-        <di:waypoint xsi:type="dc:Point" x="70" y="75" />
-        <di:waypoint xsi:type="dc:Point" x="144" y="76" />
+        <di:waypoint x="190" y="125" />
+        <di:waypoint x="264" y="126" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="107" y="60.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="VNFAdapterPrep">
-        <dc:Bounds x="125" y="330" width="100" height="80" />
+        <dc:Bounds x="245" y="380" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapter">
-        <dc:Bounds x="281" y="330" width="100" height="80" />
+        <dc:Bounds x="401" y="380" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2">
-        <dc:Bounds x="129" y="487" width="100" height="80" />
+        <dc:Bounds x="249" y="537" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="callSDNCAdapterTopologyUnassign">
-        <dc:Bounds x="281" y="487" width="100" height="80" />
+        <dc:Bounds x="401" y="537" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_CallActivity_15">
-        <di:waypoint xsi:type="dc:Point" x="229" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="281" y="528" />
+        <di:waypoint x="349" y="577" />
+        <di:waypoint x="401" y="578" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="255" y="512.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_CallActivity_15" targetElement="_BPMNShape_ScriptTask_251">
-        <di:waypoint xsi:type="dc:Point" x="381" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="425" y="527" />
+        <di:waypoint x="501" y="577" />
+        <di:waypoint x="545" y="577" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="403" y="512" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_169" bpmnElement="EndEvent_9">
-        <dc:Bounds x="873" y="509" width="36" height="36" />
+        <dc:Bounds x="993" y="559" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="891" y="550" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" targetElement="_BPMNShape_ScriptTask_170">
-        <di:waypoint xsi:type="dc:Point" x="225" y="370" />
-        <di:waypoint xsi:type="dc:Point" x="281" y="370" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" targetElement="_BPMNShape_CallActivity_13">
+        <di:waypoint x="345" y="420" />
+        <di:waypoint x="401" y="420" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="253" y="355" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_251" bpmnElement="validateSDNCResponse">
-        <dc:Bounds x="425" y="487" width="100" height="80" />
+        <dc:Bounds x="545" y="537" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_251">
-        <di:waypoint xsi:type="dc:Point" x="525" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="548" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="548" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="570" y="527" />
+        <di:waypoint x="645" y="577" />
+        <di:waypoint x="668" y="577" />
+        <di:waypoint x="668" y="577" />
+        <di:waypoint x="690" y="577" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="563" y="527" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0la8haz_di" bpmnElement="DeleteNetworkPoliciesFromAAI">
-        <dc:Bounds x="581" y="330" width="100" height="80" />
+        <dc:Bounds x="701" y="380" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0lewl6b_di" bpmnElement="PostProcessVNFAdapterRequest">
-        <dc:Bounds x="430" y="330" width="100" height="80" />
+        <dc:Bounds x="550" y="380" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0coa90m_di" bpmnElement="SequenceFlow_0coa90m">
-        <di:waypoint xsi:type="dc:Point" x="530" y="370" />
-        <di:waypoint xsi:type="dc:Point" x="581" y="370" />
+        <di:waypoint x="650" y="420" />
+        <di:waypoint x="701" y="420" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="556" y="355" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="StartEvent_1mifg2p_di" bpmnElement="StartEvent_1">
-        <dc:Bounds x="34" y="57" width="36" height="36" />
+        <dc:Bounds x="154" y="107" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="52" y="98" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0y4td40_di" bpmnElement="SequenceFlow_0y4td40">
-        <di:waypoint xsi:type="dc:Point" x="268" y="219" />
-        <di:waypoint xsi:type="dc:Point" x="288" y="219" />
-        <di:waypoint xsi:type="dc:Point" x="288" y="219" />
-        <di:waypoint xsi:type="dc:Point" x="316" y="219" />
+        <di:waypoint x="388" y="269" />
+        <di:waypoint x="408" y="269" />
+        <di:waypoint x="408" y="269" />
+        <di:waypoint x="436" y="269" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="303" y="219" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_12q2r4i_di" bpmnElement="SequenceFlow_12q2r4i">
-        <di:waypoint xsi:type="dc:Point" x="416" y="219" />
-        <di:waypoint xsi:type="dc:Point" x="464" y="219" />
+        <di:waypoint x="536" y="269" />
+        <di:waypoint x="584" y="269" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="440" y="204" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0hia88a_di" bpmnElement="SequenceFlow_0hia88a">
-        <di:waypoint xsi:type="dc:Point" x="381" y="370" />
-        <di:waypoint xsi:type="dc:Point" x="430" y="370" />
+        <di:waypoint x="501" y="420" />
+        <di:waypoint x="550" y="420" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="406" y="345" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0kx9e3s_di" bpmnElement="SequenceFlow_0kx9e3s">
-        <di:waypoint xsi:type="dc:Point" x="564" y="219" />
-        <di:waypoint xsi:type="dc:Point" x="763" y="219" />
-        <di:waypoint xsi:type="dc:Point" x="763" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="39" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="39" y="370" />
-        <di:waypoint xsi:type="dc:Point" x="125" y="370" />
+        <di:waypoint x="684" y="269" />
+        <di:waypoint x="883" y="269" />
+        <di:waypoint x="883" y="343" />
+        <di:waypoint x="159" y="343" />
+        <di:waypoint x="159" y="420" />
+        <di:waypoint x="245" y="420" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="401" y="278" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ltm4jt_di" bpmnElement="SequenceFlow_0ltm4jt">
-        <di:waypoint xsi:type="dc:Point" x="681" y="370" />
-        <di:waypoint xsi:type="dc:Point" x="759" y="370" />
-        <di:waypoint xsi:type="dc:Point" x="759" y="442" />
-        <di:waypoint xsi:type="dc:Point" x="51" y="442" />
-        <di:waypoint xsi:type="dc:Point" x="51" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="129" y="527" />
+        <di:waypoint x="801" y="420" />
+        <di:waypoint x="879" y="420" />
+        <di:waypoint x="879" y="492" />
+        <di:waypoint x="171" y="492" />
+        <di:waypoint x="171" y="577" />
+        <di:waypoint x="249" y="577" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="405" y="427" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1boza4q_di" bpmnElement="preProcessSDNCDeactivateRequest">
-        <dc:Bounds x="168" y="179" width="100" height="80" />
+        <dc:Bounds x="288" y="229" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0xpc0da_di" bpmnElement="callSDNCAdapterTopologyDeactivate">
-        <dc:Bounds x="316" y="179" width="100" height="80" />
+        <dc:Bounds x="436" y="229" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1kkyngh_di" bpmnElement="postProcessSDNCDeactivateRequest">
-        <dc:Bounds x="464" y="179" width="100" height="80" />
+        <dc:Bounds x="584" y="229" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qbjihn_di" bpmnElement="SequenceFlow_0qbjihn">
-        <di:waypoint xsi:type="dc:Point" x="244" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="316" y="76" />
+        <di:waypoint x="364" y="126" />
+        <di:waypoint x="436" y="126" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="280" y="61" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1c2lvlc_di" bpmnElement="SequenceFlow_1c2lvlc">
-        <di:waypoint xsi:type="dc:Point" x="416" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="473" y="76" />
+        <di:waypoint x="536" y="126" />
+        <di:waypoint x="593" y="126" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="445" y="61" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1gf22c0_di" bpmnElement="QueryAAIForVfModule">
-        <dc:Bounds x="316" y="36" width="100" height="80" />
+        <dc:Bounds x="436" y="86" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1igsfgk_di" bpmnElement="SequenceFlow_1igsfgk">
-        <di:waypoint xsi:type="dc:Point" x="573" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="760" y="76" />
-        <di:waypoint xsi:type="dc:Point" x="760" y="145" />
-        <di:waypoint xsi:type="dc:Point" x="34" y="145" />
-        <di:waypoint xsi:type="dc:Point" x="34" y="218" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="219" />
+        <di:waypoint x="693" y="126" />
+        <di:waypoint x="880" y="126" />
+        <di:waypoint x="880" y="195" />
+        <di:waypoint x="154" y="195" />
+        <di:waypoint x="154" y="268" />
+        <di:waypoint x="288" y="269" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="397" y="130" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1jgeknl_di" bpmnElement="ValidateVfModule">
-        <dc:Bounds x="473" y="36" width="100" height="80" />
+        <dc:Bounds x="593" y="86" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_1r8unf9_di" bpmnElement="SubProcess_1r8unf9" isExpanded="true">
-        <dc:Bounds x="43" y="622" width="467" height="193" />
+        <dc:Bounds x="163" y="672" width="467" height="193" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1ebrix6_di" bpmnElement="StartEvent_1ebrix6">
-        <dc:Bounds x="111" y="689" width="36" height="36" />
+        <dc:Bounds x="231" y="739" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="129" y="730" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0yb2lmo_di" bpmnElement="EndEvent_0yb2lmo">
-        <dc:Bounds x="404" y="689" width="36" height="36" />
+        <dc:Bounds x="524" y="739" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="422" y="730" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1ypch9x_di" bpmnElement="ScriptTask_1ypch9x">
-        <dc:Bounds x="215" y="667" width="100" height="80" />
+        <dc:Bounds x="335" y="717" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_095634c_di" bpmnElement="SequenceFlow_095634c">
-        <di:waypoint xsi:type="dc:Point" x="147" y="707" />
-        <di:waypoint xsi:type="dc:Point" x="215" y="707" />
+        <di:waypoint x="267" y="757" />
+        <di:waypoint x="335" y="757" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="181" y="692" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yvjvhu_di" bpmnElement="SequenceFlow_0yvjvhu">
-        <di:waypoint xsi:type="dc:Point" x="315" y="707" />
-        <di:waypoint xsi:type="dc:Point" x="404" y="707" />
+        <di:waypoint x="435" y="757" />
+        <di:waypoint x="524" y="757" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="360" y="692" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_10td9ns_di" bpmnElement="DeleteAAIVfModule">
-        <dc:Bounds x="713" y="487" width="100" height="80" />
+        <dc:Bounds x="833" y="537" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1rcw5x3_di" bpmnElement="DeleteAAIVfModulePrep">
-        <dc:Bounds x="570" y="487" width="100" height="80" />
+        <dc:Bounds x="690" y="537" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_092kvy3_di" bpmnElement="SequenceFlow_092kvy3">
-        <di:waypoint xsi:type="dc:Point" x="670" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="713" y="527" />
+        <di:waypoint x="790" y="577" />
+        <di:waypoint x="833" y="577" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="692" y="512" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1eemrjp_di" bpmnElement="SequenceFlow_1eemrjp">
-        <di:waypoint xsi:type="dc:Point" x="813" y="527" />
-        <di:waypoint xsi:type="dc:Point" x="873" y="527" />
+        <di:waypoint x="933" y="577" />
+        <di:waypoint x="993" y="577" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="843" y="502" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn
index e7706c20e6..6a44a117c1 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
   <bpmn:process id="DoDeleteVfModuleVolumeV2" name="DoDeleteVfModuleVolumeV2" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1" name="Start">
       <bpmn:outgoing>SequenceFlow_1gvfdp4</bpmn:outgoing>
@@ -7,27 +7,27 @@
     <bpmn:scriptTask id="Task_06u1lr0" name="Call REST AAI Query Cloud Region" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1vy2ojp</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1dlcqmc</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def delVfModuleVol = new DoDeleteVfModuleVolumeV2()
-delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn:script>
+delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="Task_1woqfjw" name="Call REST AAI Query for Volume Group" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1dlcqmc</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1kjccf1</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('callRESTQueryAAIForVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script>
+deleteVfMod.executeMethod('callRESTQueryAAIForVolumeGroup', execution, isDebugLogEnabled)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="Task_0yjx0p2" name="Prepare VNF Adapter Delete" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1kjccf1</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1tgngf7</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)]]></bpmn:script>
+deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:callActivity id="Task_14fsstq" name="Call REST VNF Adapter Delete" calledElement="vnfAdapterTask">
+    <bpmn:callActivity id="Task_14fsstq" name="Call REST VNF Adapter Delete" calledElement="openstackAdapterTask">
       <bpmn:extensionElements>
-        <camunda:in source="DDVMV_deleteVnfARequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="DDVMV_deleteVnfARequest" target="openstackAdapterTaskRequest" />
         <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="WorkflowResponse" target="DDVMV_deleteVnfAResponse" />
@@ -40,9 +40,9 @@ deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLo
     <bpmn:scriptTask id="Task_17q1roq" name="Call REST AAI Delete Volume Group" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_04zsr0f</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_13c3cv2</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script>
+deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:endEvent id="EndEvent_0fw1gkf" name="Stop">
       <bpmn:incoming>SequenceFlow_1sgtwr2</bpmn:incoming>
@@ -53,19 +53,19 @@ deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogE
     <bpmn:scriptTask id="Task_1i432ud" name="Pre Process Request" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1gvfdp4</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1vy2ojp</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DoDeleteVfModuleVolumeV2()
 deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled)
-]]></bpmn:script>
+</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_1gvfdp4" sourceRef="StartEvent_1" targetRef="Task_1i432ud" />
     <bpmn:sequenceFlow id="SequenceFlow_1vy2ojp" sourceRef="Task_1i432ud" targetRef="Task_06u1lr0" />
     <bpmn:scriptTask id="Task_018w43g" name="Post Process" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_13c3cv2</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1sgtwr2</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:script>
+deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_13c3cv2" sourceRef="Task_17q1roq" targetRef="Task_018w43g" />
     <bpmn:sequenceFlow id="SequenceFlow_1sgtwr2" sourceRef="Task_018w43g" targetRef="EndEvent_0fw1gkf" />
@@ -102,22 +102,22 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1dlcqmc_di" bpmnElement="SequenceFlow_1dlcqmc">
-        <di:waypoint xsi:type="dc:Point" x="507" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="564" y="120" />
+        <di:waypoint x="507" y="120" />
+        <di:waypoint x="564" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="536" y="95" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1kjccf1_di" bpmnElement="SequenceFlow_1kjccf1">
-        <di:waypoint xsi:type="dc:Point" x="664" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="713" y="120" />
+        <di:waypoint x="664" y="120" />
+        <di:waypoint x="713" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="689" y="95" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1tgngf7_di" bpmnElement="SequenceFlow_1tgngf7">
-        <di:waypoint xsi:type="dc:Point" x="813" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="865" y="120" />
+        <di:waypoint x="813" y="120" />
+        <di:waypoint x="865" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="839" y="95" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -126,15 +126,15 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:
         <dc:Bounds x="247" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1gvfdp4_di" bpmnElement="SequenceFlow_1gvfdp4">
-        <di:waypoint xsi:type="dc:Point" x="209" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="247" y="120" />
+        <di:waypoint x="209" y="120" />
+        <di:waypoint x="247" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="228" y="95" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1vy2ojp_di" bpmnElement="SequenceFlow_1vy2ojp">
-        <di:waypoint xsi:type="dc:Point" x="347" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="407" y="120" />
+        <di:waypoint x="347" y="120" />
+        <di:waypoint x="407" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="377" y="95" width="0" height="0" />
         </bpmndi:BPMNLabel>
@@ -143,22 +143,22 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:
         <dc:Bounds x="1298" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_13c3cv2_di" bpmnElement="SequenceFlow_13c3cv2">
-        <di:waypoint xsi:type="dc:Point" x="1251" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="1298" y="120" />
+        <di:waypoint x="1251" y="120" />
+        <di:waypoint x="1298" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1275" y="95" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1sgtwr2_di" bpmnElement="SequenceFlow_1sgtwr2">
-        <di:waypoint xsi:type="dc:Point" x="1398" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="1463" y="120" />
+        <di:waypoint x="1398" y="120" />
+        <di:waypoint x="1463" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1431" y="95" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_04zsr0f_di" bpmnElement="SequenceFlow_04zsr0f">
-        <di:waypoint xsi:type="dc:Point" x="965" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="1151" y="120" />
+        <di:waypoint x="965" y="120" />
+        <di:waypoint x="1151" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1058" y="99" width="0" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn
index b82b1da951..ede63eafac 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.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: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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoUpdateNetworkInstance" name="DoUpdateNetworkInstance" isExecutable="true">
     <bpmn2:startEvent id="updateNetwork_startEvent" name="Start Flow">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -8,18 +8,18 @@
     <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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
 DoUpdateNetworkInstance.prepareSDNCRequest(execution)
-]]></bpmn2:script>
+</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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.validateSDNCResponse(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.validateSDNCResponse(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="isSdncTopoOk_ExclusiveGateway" name="Is SDNC Ok?" default="sdncTopoNo_SequenceFlow">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@@ -28,7 +28,7 @@ DoUpdateNetworkInstance.validateSDNCResponse(execution)]]></bpmn2:script>
     </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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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">
@@ -59,9 +59,9 @@ DoUpdateNetworkInstance.validateSDNCResponse(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_46</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="EndEvent_3" />
     <bpmn2:subProcess id="subProcessException_SubProcess" name="Subprocess For Exception" triggeredByEvent="true">
@@ -71,7 +71,7 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("UPDNETI_rollbackEnabled") == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="isRollbackOn_NoNetwork_SequenceFlow" name="No" sourceRef="isRollbackOn_Network_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2" />
       <bpmn2:startEvent id="subProcessStart_StartEvent" name="Fault Start">
@@ -85,7 +85,7 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <bpmn2:outgoing>isPONR_No_SequenceFlow</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="isPONR_Yes_SequenceFlow" name="Yes" sourceRef="isPONR_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isPONR") == true}]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("UPDNETI_isPONR") == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="isPONR_No_SequenceFlow" name="No" sourceRef="isPONR_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2" />
       <bpmn2:exclusiveGateway id="sdncOk_ExclusiveGateway" name="is Sdnc Ok?" default="sdncOk_No_ExclusiveGateway">
@@ -94,15 +94,15 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("UPDNETI_isSdncRollbackNeeded" ) == true}</bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:sequenceFlow id="sdncOk_No_ExclusiveGateway" name="No" sourceRef="sdncOk_ExclusiveGateway" targetRef="InclusiveGateway_6" />
       <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.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_53" name="" sourceRef="prepareSDNCRollbackRequest_ScriptTask" targetRef="InclusiveGateway_6" />
       <bpmn2:endEvent id="EndEvent_4">
@@ -117,37 +117,17 @@ DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)]]></bpmn2:script>
       <bpmn2:sequenceFlow id="SequenceFlow_47" name="" sourceRef="InclusiveGateway_6" targetRef="ScriptTask_1p6n2yy" />
       <bpmn2:scriptTask id="ScriptTask_1p6n2yy" name="Prepare RollbackData" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_47</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_0qr4es6</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.prepareRollbackData(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.prepareRollbackData(execution)</bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:callActivity id="CallActivity_1kid5y0" name="DoUpdate&#10;NetworkInstanceRollback&#10;" calledElement="DoCreateNetworkInstanceRollback">
-        <bpmn2:extensionElements>
-          <camunda:in source="msoRequestId" target="msoRequestId" />
-          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-          <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
-          <camunda:in source="rollbackData" target="rollbackData" />
-          <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="WorkflowException" target="WorkflowException" />
-          <camunda:in source="sdncVersion" target="sdncVersion" />
-          <camunda:out source="wasDeleted" target="wasDeleted" />
-          <camunda:out source="rolledBack" target="rolledBack" />
-          <camunda:out source="WorkflowException" target="WorkflowException" />
-          <camunda:out source="workflowException" target="workflowException" />
-          <camunda:in source="SavedWorkflowException1" target="SavedWorkflowException1" />
-        </bpmn2:extensionElements>
-        <bpmn2:incoming>SequenceFlow_0qr4es6</bpmn2:incoming>
-      </bpmn2:callActivity>
       <bpmn2:scriptTask id="ScriptTask_0voqz6r" name="Post Process Response" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_0ze5k6c</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_04rdjfi</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_0qr4es6" sourceRef="ScriptTask_1p6n2yy" targetRef="CallActivity_1kid5y0" />
       <bpmn2:sequenceFlow id="SequenceFlow_04rdjfi" sourceRef="ScriptTask_0voqz6r" targetRef="EndEvent_4" />
       <bpmn2:exclusiveGateway id="ExclusiveGateway_1kjh92x" name="is &#39;1702&#39; SNDC Call?">
         <bpmn2:outgoing>SequenceFlow_0nrc66n</bpmn2:outgoing>
@@ -155,14 +135,14 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
       </bpmn2:exclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_0nrc66n" name="No" sourceRef="ExclusiveGateway_1kjh92x" targetRef="sdncOk_ExclusiveGateway" />
       <bpmn2:sequenceFlow id="SequenceFlow_0srdlf3" name="Yes" sourceRef="ExclusiveGateway_1kjh92x" targetRef="InclusiveGateway_6">
-        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn2:conditionExpression>
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'} </bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:scriptTask id="ScriptTask_1gedbow" name="Set Exception Flag" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_053re4q</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.setExceptionFlag(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_053re4q" sourceRef="ScriptTask_1gedbow" targetRef="isRollbackOn_Network_ExclusiveGateway" />
       <bpmn2:inclusiveGateway id="ExclusiveGateway_1dcb5p2">
@@ -172,24 +152,21 @@ DoUpdateNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
         <bpmn2:outgoing>SequenceFlow_0ze5k6c</bpmn2:outgoing>
       </bpmn2:inclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_0ze5k6c" sourceRef="ExclusiveGateway_1dcb5p2" targetRef="ScriptTask_0voqz6r" />
-      <bpmn2:textAnnotation id="TextAnnotation_0qx19b9">      <bpmn2:text>Note: Rollback is not needed for UpdateNetwork,</bpmn2:text>
-</bpmn2:textAnnotation>
-      <bpmn2:association id="Association_10dk4x3" sourceRef="CallActivity_1kid5y0" targetRef="TextAnnotation_0qx19b9" />
     </bpmn2:subProcess>
     <bpmn2:scriptTask id="callRESTReQuery2NetworkID_ScriptTask" name="Call REST ReQuery2 Network Id in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
+      <bpmn2:incoming>Flow_1eutzkj</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_46" name="PONR" sourceRef="callRESTUpdateContrailNetwork_ScriptTask" targetRef="postProcessAndCompletionRequest_ScriptTask" />
     <bpmn2:endEvent id="EndEvent_3">
@@ -199,9 +176,9 @@ DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)]]></bpmn2:sc
       <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.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.processJavaException(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.processJavaException(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
       <bpmn2:startEvent id="StartEvent_1">
@@ -216,570 +193,518 @@ DoUpdateNetworkInstance.processJavaException(execution)]]></bpmn2:script>
     <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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
 DoUpdateNetworkInstance.preProcessRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="callGetServiceInstance" />
     <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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.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>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="callRESTQueryNetworkId_ScriptTask" targetRef="callRESTQueryCloudRegion_ScriptTask" />
     <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="callGetServiceInstance" targetRef="callRESTQueryNetworkId_ScriptTask" />
-    <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.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.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:inputOutput>
-            <camunda:inputParameter name="payload">${UPDNETI_updateNetworkRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}/${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:connectorId>http-connector</camunda:connectorId>
-        </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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
 DoUpdateNetworkInstance.prepareUpdateNetworkRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="callUpdateNetwork_ServiceTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="openstackAdapterTask" />
     <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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkTableRef(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkVpnBinding(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.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.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="callRESTQueryNetworkPolicy_ScriptTask" targetRef="callRESTQueryNetworkTableRef_ScriptTask" />
     <bpmn2:scriptTask id="callGetServiceInstance" name="AAI&#10;Query&#10;(svc instance)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.getServiceInstance(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.getServiceInstance(execution)</bpmn2:script>
     </bpmn2:scriptTask>
+    <bpmn2:callActivity id="openstackAdapterTask" name="openstack Adapter" calledElement="openstackAdapterTask">
+      <bpmn2:extensionElements>
+        <camunda:in source="UPDNETI_updateNetworkRequest" target="openstackAdapterTaskRequest" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="UPDNETI_updateNetworkResponse" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
+      <bpmn2:outgoing>Flow_1eutzkj</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="Flow_1eutzkj" sourceRef="openstackAdapterTask" targetRef="callRESTReQuery2NetworkID_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="DoUpdateNetworkInstance">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="updateNetwork_startEvent">
-        <dc:Bounds x="286" y="185" width="36" height="36" />
+        <dc:Bounds x="596" y="185" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="279" y="226" width="49" height="12" />
+          <dc:Bounds x="588" y="226" width="51" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
-        <dc:Bounds x="472" y="163" width="100" height="80" />
+        <dc:Bounds x="782" y="163" 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="322" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="472" y="203" />
+        <di:waypoint x="632" y="203" />
+        <di:waypoint x="782" y="203" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="397" y="188" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateUpdatePONetwork_ScriptTask">
-        <dc:Bounds x="1343" y="1311" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_83" bpmnElement="callUpdateNetwork_ServiceTask">
-        <dc:Bounds x="1342" y="1176" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
-        <dc:Bounds x="1519" y="100" width="100" height="80" />
+        <dc:Bounds x="1829" y="100" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
-        <dc:Bounds x="-153" y="594" width="1288" height="701" />
+        <dc:Bounds x="157" y="594" width="1288" height="701" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
-        <dc:Bounds x="-103" y="1160" width="36" height="36" />
+        <dc:Bounds x="207" y="1160" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-109" y="1201" width="50" height="12" />
+          <dc:Bounds x="200" y="1201" width="52" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="1544" y="521" width="50" height="50" />
+        <dc:Bounds x="1854" y="521" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1535" y="577" width="67" height="12" />
+          <dc:Bounds x="1845" y="577" width="67" height="14" />
         </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="1594" y="546" />
-        <di:waypoint xsi:type="dc:Point" x="1682" y="546" />
+        <di:waypoint x="1904" y="546" />
+        <di:waypoint x="1992" y="546" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1600" y="546.8622891951518" width="14" height="12" />
+          <dc:Bounds x="1910" y="547" width="15" height="14" />
         </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="1544" y="546" />
-        <di:waypoint xsi:type="dc:Point" x="1393" y="546" />
-        <di:waypoint xsi:type="dc:Point" x="1393" y="576" />
+        <di:waypoint x="1854" y="546" />
+        <di:waypoint x="1703" y="546" />
+        <di:waypoint x="1703" y="576" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1526" y="546" width="18" height="12" />
+          <dc:Bounds x="1836" y="546" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
-        <dc:Bounds x="743" y="1390" width="100" height="80" />
+        <dc:Bounds x="1053" y="1390" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
-        <dc:Bounds x="1682" y="528" width="36" height="36" />
+        <dc:Bounds x="1992" y="528" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1663" y="569" width="74" height="22" />
+          <dc:Bounds x="1980" y="569" width="61" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callAssignSDNCAdapter_CallActivity">
-        <dc:Bounds x="1519" y="242" width="100" height="80" />
+        <dc:Bounds x="1829" y="242" width="100" height="80" />
       </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="1569" y="180" />
-        <di:waypoint xsi:type="dc:Point" x="1569" y="242" />
+        <di:waypoint x="1879" y="180" />
+        <di:waypoint x="1879" y="242" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1584" y="211" width="0" height="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="1569" y="322" />
-        <di:waypoint xsi:type="dc:Point" x="1569" y="373" />
+        <di:waypoint x="1879" y="322" />
+        <di:waypoint x="1879" y="373" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1584" y="347.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61">
-        <di:waypoint xsi:type="dc:Point" x="572" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="686" y="203" />
+        <di:waypoint x="882" y="203" />
+        <di:waypoint x="996" y="203" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="584" y="188" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ExclusiveGateway_90">
-        <di:waypoint xsi:type="dc:Point" x="-67" y="1178" />
-        <di:waypoint xsi:type="dc:Point" x="-40" y="1178" />
-        <di:waypoint xsi:type="dc:Point" x="-11" y="1178" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="ScriptTask_1gedbow_di">
+        <di:waypoint x="243" y="1178" />
+        <di:waypoint x="270" y="1178" />
+        <di:waypoint x="299" y="1178" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-53" y="1163" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
-        <dc:Bounds x="1519" y="373" width="100" height="80" />
+        <dc:Bounds x="1829" y="373" width="100" height="80" />
       </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="1569" y="453" />
-        <di:waypoint xsi:type="dc:Point" x="1569" y="521" />
+        <di:waypoint x="1879" y="453" />
+        <di:waypoint x="1879" y="521" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1584" y="487" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80">
-        <di:waypoint xsi:type="dc:Point" x="743" y="1430" />
-        <di:waypoint xsi:type="dc:Point" x="635" y="1430" />
+        <di:waypoint x="1053" y="1430" />
+        <di:waypoint x="945" y="1430" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="689" y="1415" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_133" bpmnElement="callRESTQueryNetworkId_ScriptTask">
-        <dc:Bounds x="984" y="100" width="100" height="80" />
+        <dc:Bounds x="1294" y="100" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTReQuery2NetworkID_ScriptTask">
-        <dc:Bounds x="1176" y="1390" width="100" height="80" />
+        <dc:Bounds x="1486" y="1390" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_135" bpmnElement="callRESTUpdateContrailNetwork_ScriptTask">
-        <dc:Bounds x="984" y="1390" width="100" height="80" />
+        <dc:Bounds x="1294" y="1390" width="100" height="80" />
       </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" y="1430" />
-        <di:waypoint xsi:type="dc:Point" x="1084" y="1430" />
+        <di:waypoint x="1486" y="1430" />
+        <di:waypoint x="1394" y="1430" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1130" y="1415" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_65" bpmnElement="SequenceFlow_46" sourceElement="_BPMNShape_ScriptTask_135">
-        <di:waypoint xsi:type="dc:Point" x="984" y="1430" />
-        <di:waypoint xsi:type="dc:Point" x="843" y="1430" />
+        <di:waypoint x="1294" y="1430" />
+        <di:waypoint x="1153" y="1430" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="935" y="1431.2411831373652" width="32" height="12" />
+          <dc:Bounds x="1245" y="1431" width="33" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="callRESTQueryVpnBinding_ScriptTask">
-        <dc:Bounds x="1341" y="688" width="100" height="80" />
+        <dc:Bounds x="1651" y="688" width="100" height="80" />
       </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" y="768" />
-        <di:waypoint xsi:type="dc:Point" x="1391" y="810" />
+        <di:waypoint x="1701" y="768" />
+        <di:waypoint x="1701" y="810" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1388" y="781" width="6" height="6" />
         </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" y="1256" />
-        <di:waypoint xsi:type="dc:Point" x="1393" y="1311" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1390" y="1284" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="prepareNetworkRequest_ScriptTask">
-        <dc:Bounds x="1342" y="1052" width="100" height="80" />
+        <dc:Bounds x="1652" y="1052" width="100" height="80" />
       </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" y="1132" />
-        <di:waypoint xsi:type="dc:Point" x="1392" y="1176" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="Activity_06vsf1e_di">
+        <di:waypoint x="1702" y="1132" />
+        <di:waypoint x="1702" y="1190" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1389" y="1159" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="isRollbackOn_Network_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="156" y="1153" width="50" height="50" />
+        <dc:Bounds x="466" y="1153" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="143" y="1213" width="78" height="12" />
+          <dc:Bounds x="453" y="1213" width="78" height="14" />
         </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="181" y="1153" />
-        <di:waypoint xsi:type="dc:Point" x="181" y="1089" />
+        <di:waypoint x="491" y="1153" />
+        <di:waypoint x="491" y="1089" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="187" y="1133.4787123394708" width="18" height="12" />
+          <dc:Bounds x="497" y="1133" width="18" height="14" />
         </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="206" y="1178" />
-        <di:waypoint xsi:type="dc:Point" x="372" y="1178" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="isRollbackOn_NoNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="InclusiveGateway_1adrta3_di">
+        <di:waypoint x="516" y="1178" />
+        <di:waypoint x="682" y="1178" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="206" y="1182.7278101950883" width="14" height="12" />
+          <dc:Bounds x="516" y="1183" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="callRESTQueryNetworkPolicy_ScriptTask">
-        <dc:Bounds x="1341" y="810" width="100" height="80" />
+        <dc:Bounds x="1651" y="810" width="100" height="80" />
       </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" y="890" />
-        <di:waypoint xsi:type="dc:Point" x="1391" y="926" />
+        <di:waypoint x="1701" y="890" />
+        <di:waypoint x="1701" y="926" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1388" y="900" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_24" bpmnElement="InclusiveGateway_6">
-        <dc:Bounds x="626" y="859" width="50" height="50" />
+        <dc:Bounds x="936" y="859" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="651" y="914" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="isPONR_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="156" y="1039" width="50" height="50" />
+        <dc:Bounds x="466" y="1039" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="90" y="1054" width="46" height="12" />
+          <dc:Bounds x="400" y="1054" width="46" height="14" />
         </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="206" y="1064" />
-        <di:waypoint xsi:type="dc:Point" x="397" y="1064" />
-        <di:waypoint xsi:type="dc:Point" x="397" y="1153" />
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="InclusiveGateway_1adrta3_di">
+        <di:waypoint x="516" y="1064" />
+        <di:waypoint x="707" y="1064" />
+        <di:waypoint x="707" y="1153" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="213" y="1067.6448598130842" width="18" height="12" />
+          <dc:Bounds x="523" y="1068" width="18" height="14" />
         </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="181" y="1039" />
-        <di:waypoint xsi:type="dc:Point" x="181" y="971" />
-        <di:waypoint xsi:type="dc:Point" x="397" y="971" />
-        <di:waypoint xsi:type="dc:Point" x="397" y="1153" />
+        <di:waypoint x="491" y="1039" />
+        <di:waypoint x="491" y="971" />
+        <di:waypoint x="707" y="971" />
+        <di:waypoint x="707" y="1153" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="185" y="1027.872131147541" width="14" height="12" />
+          <dc:Bounds x="495" y="1028" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_217" bpmnElement="sdncOk_ExclusiveGateway" isMarkerVisible="true">
-        <dc:Bounds x="493" y="709" width="50" height="50" />
+        <dc:Bounds x="803" y="709" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="488" y="683" width="60" height="12" />
+          <dc:Bounds x="798" y="683" width="60" height="14" />
         </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="543" y="734" />
-        <di:waypoint xsi:type="dc:Point" x="601" y="733" />
+        <di:waypoint x="853" y="734" />
+        <di:waypoint x="911" y="733" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="545" y="737.2172362208834" width="18" height="12" />
+          <dc:Bounds x="855" y="737" width="18" height="14" />
         </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="517" y="758" />
-        <di:waypoint xsi:type="dc:Point" x="517" y="884" />
-        <di:waypoint xsi:type="dc:Point" x="626" y="884" />
+        <di:waypoint x="827" y="758" />
+        <di:waypoint x="827" y="884" />
+        <di:waypoint x="936" y="884" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="526" y="761.1171067354646" width="14" height="12" />
+          <dc:Bounds x="836" y="761" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds x="599" y="1412" width="36" height="36" />
+        <dc:Bounds x="909" y="1412" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="617" y="1453" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_178" bpmnElement="EndEvent_4">
-        <dc:Bounds x="1029" y="968" width="36" height="36" />
+        <dc:Bounds x="1339" y="968" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1047" y="1009" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_245" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
-        <dc:Bounds x="1200" y="100" width="100" height="80" />
+        <dc:Bounds x="1510" y="100" width="100" height="80" />
       </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" y="140" />
-        <di:waypoint xsi:type="dc:Point" x="1519" y="140" />
+        <di:waypoint x="1610" y="140" />
+        <di:waypoint x="1829" y="140" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1410" y="125" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_38" bpmnElement="BoundaryEvent_4">
-        <dc:Bounds x="1601" y="355" width="36" height="36" />
+        <dc:Bounds x="1911" y="355" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1619" y="391" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </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="1637" y="373" />
-        <di:waypoint xsi:type="dc:Point" x="1700" y="373" />
-        <di:waypoint xsi:type="dc:Point" x="1700" y="528" />
+        <di:waypoint x="1947" y="373" />
+        <di:waypoint x="2010" y="373" />
+        <di:waypoint x="2010" y="528" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1669" y="358" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_261" bpmnElement="prepareSDNCRollbackRequest_ScriptTask">
-        <dc:Bounds x="601" y="694" width="100" height="79" />
+        <dc:Bounds x="911" y="694" width="100" height="79" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_76" bpmnElement="SequenceFlow_47" sourceElement="_BPMNShape_InclusiveGateway_24">
-        <di:waypoint xsi:type="dc:Point" x="651" y="909" />
-        <di:waypoint xsi:type="dc:Point" x="651" y="946" />
+        <di:waypoint x="961" y="909" />
+        <di:waypoint x="961" y="946" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="666" y="927.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_84" bpmnElement="SequenceFlow_53" sourceElement="_BPMNShape_ScriptTask_261">
-        <di:waypoint xsi:type="dc:Point" x="651" y="773" />
-        <di:waypoint xsi:type="dc:Point" x="651" y="859" />
+        <di:waypoint x="961" y="773" />
+        <di:waypoint x="961" y="859" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="666" y="816" width="0" height="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" y="1391" />
-        <di:waypoint xsi:type="dc:Point" x="1393" y="1430" />
-        <di:waypoint xsi:type="dc:Point" x="1310" y="1430" />
-        <di:waypoint xsi:type="dc:Point" x="1276" y="1430" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1390" y="1425" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
-        <dc:Bounds x="-62" y="375" width="394" height="188" />
+        <dc:Bounds x="248" y="375" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
-        <dc:Bounds x="-29" y="452" width="36" height="36" />
+        <dc:Bounds x="281" y="452" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-11" y="493" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="ScriptTask_1">
-        <dc:Bounds x="86" y="430" width="100" height="80" />
+        <dc:Bounds x="396" y="430" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_220" bpmnElement="EndEvent_1">
-        <dc:Bounds x="247" y="452" width="36" height="36" />
+        <dc:Bounds x="557" y="452" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="265" y="493" width="0" height="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="7" y="470" />
-        <di:waypoint xsi:type="dc:Point" x="86" y="470" />
+        <di:waypoint x="317" y="470" />
+        <di:waypoint x="396" y="470" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="49" y="470" width="0" height="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="186" y="470" />
-        <di:waypoint xsi:type="dc:Point" x="247" y="470" />
+        <di:waypoint x="496" y="470" />
+        <di:waypoint x="557" y="470" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="221" y="470" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="ScriptTask_0e58tta_di" targetElement="_BPMNShape_ScriptTask_133">
-        <di:waypoint xsi:type="dc:Point" x="786" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="805" y="203" />
-        <di:waypoint xsi:type="dc:Point" x="805" y="202" />
-        <di:waypoint xsi:type="dc:Point" x="861" y="202" />
-        <di:waypoint xsi:type="dc:Point" x="861" y="140" />
-        <di:waypoint xsi:type="dc:Point" x="910" y="140" />
-        <di:waypoint xsi:type="dc:Point" x="984" y="140" />
+        <di:waypoint x="1096" y="203" />
+        <di:waypoint x="1115" y="203" />
+        <di:waypoint x="1115" y="202" />
+        <di:waypoint x="1171" y="202" />
+        <di:waypoint x="1171" y="140" />
+        <di:waypoint x="1220" y="140" />
+        <di:waypoint x="1294" y="140" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="788" y="184" width="90" height="6" />
         </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" y="140" />
-        <di:waypoint xsi:type="dc:Point" x="1200" y="140" />
+        <di:waypoint x="1394" y="140" />
+        <di:waypoint x="1510" y="140" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1127" y="140" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="callRESTQueryNetworkTableRef_ScriptTask">
-        <dc:Bounds x="1341" y="926" width="100" height="80" />
+        <dc:Bounds x="1651" y="926" width="100" height="80" />
       </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" y="1006" />
-        <di:waypoint xsi:type="dc:Point" x="1392" y="1052" />
+        <di:waypoint x="1701" y="1006" />
+        <di:waypoint x="1702" y="1052" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1388" y="1028" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_336" bpmnElement="callRESTReQuery1NetworkID_ScriptTask">
-        <dc:Bounds x="1343" y="576" width="100" height="80" />
+        <dc:Bounds x="1653" y="576" width="100" height="80" />
       </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" y="656" />
-        <di:waypoint xsi:type="dc:Point" x="1393" y="672" />
-        <di:waypoint xsi:type="dc:Point" x="1391" y="672" />
-        <di:waypoint xsi:type="dc:Point" x="1391" y="688" />
+        <di:waypoint x="1703" y="656" />
+        <di:waypoint x="1703" y="672" />
+        <di:waypoint x="1701" y="672" />
+        <di:waypoint x="1701" y="688" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1390" y="666" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1p6n2yy_di" bpmnElement="ScriptTask_1p6n2yy">
-        <dc:Bounds x="601" y="946" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_1kid5y0_di" bpmnElement="CallActivity_1kid5y0">
-        <dc:Bounds x="739" y="946" width="100" height="80" />
+        <dc:Bounds x="911" y="946" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0voqz6r_di" bpmnElement="ScriptTask_0voqz6r">
-        <dc:Bounds x="883" y="946" width="100" height="80" />
+        <dc:Bounds x="1110" y="1138" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0qr4es6_di" bpmnElement="SequenceFlow_0qr4es6">
-        <di:waypoint xsi:type="dc:Point" x="701" y="986" />
-        <di:waypoint xsi:type="dc:Point" x="739" y="986" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="720" y="971" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_04rdjfi_di" bpmnElement="SequenceFlow_04rdjfi">
-        <di:waypoint xsi:type="dc:Point" x="983" y="986" />
-        <di:waypoint xsi:type="dc:Point" x="1029" y="986" />
+        <di:waypoint x="1210" y="1178" />
+        <di:waypoint x="1275" y="1178" />
+        <di:waypoint x="1275" y="986" />
+        <di:waypoint x="1339" y="986" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1006" y="961" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1kjh92x_di" bpmnElement="ExclusiveGateway_1kjh92x" isMarkerVisible="true">
-        <dc:Bounds x="372" y="709" width="50" height="50" />
+        <dc:Bounds x="682" y="709" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="368" y="672" width="76" height="24" />
+          <dc:Bounds x="679" y="672" width="74" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0nrc66n_di" bpmnElement="SequenceFlow_0nrc66n">
-        <di:waypoint xsi:type="dc:Point" x="422" y="734" />
-        <di:waypoint xsi:type="dc:Point" x="493" y="734" />
+        <di:waypoint x="732" y="734" />
+        <di:waypoint x="803" y="734" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="427" y="735" width="14" height="12" />
+          <dc:Bounds x="737" y="735" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0srdlf3_di" bpmnElement="SequenceFlow_0srdlf3">
-        <di:waypoint xsi:type="dc:Point" x="397" y="759" />
-        <di:waypoint xsi:type="dc:Point" x="397" y="884" />
-        <di:waypoint xsi:type="dc:Point" x="626" y="884" />
+        <di:waypoint x="707" y="759" />
+        <di:waypoint x="707" y="884" />
+        <di:waypoint x="936" y="884" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="402" y="760" width="18" height="12" />
+          <dc:Bounds x="712" y="760" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1gedbow_di" bpmnElement="ScriptTask_1gedbow">
-        <dc:Bounds x="-11" y="1138" width="100" height="80" />
+        <dc:Bounds x="299" y="1138" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_053re4q_di" bpmnElement="SequenceFlow_053re4q">
-        <di:waypoint xsi:type="dc:Point" x="89" y="1178" />
-        <di:waypoint xsi:type="dc:Point" x="156" y="1178" />
+        <di:waypoint x="399" y="1178" />
+        <di:waypoint x="466" y="1178" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="123" y="1163" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_1adrta3_di" bpmnElement="ExclusiveGateway_1dcb5p2">
-        <dc:Bounds x="372" y="1153" width="50" height="50" />
+        <dc:Bounds x="682" y="1153" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="397" y="1203" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ze5k6c_di" bpmnElement="SequenceFlow_0ze5k6c">
-        <di:waypoint xsi:type="dc:Point" x="422" y="1178" />
-        <di:waypoint xsi:type="dc:Point" x="933" y="1178" />
-        <di:waypoint xsi:type="dc:Point" x="933" y="1026" />
+        <di:waypoint x="732" y="1178" />
+        <di:waypoint x="1110" y="1178" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="678" y="1163" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="TextAnnotation_0qx19b9_di" bpmnElement="TextAnnotation_0qx19b9">
-        <dc:Bounds x="736" y="808" width="168" height="39" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_10dk4x3_di" bpmnElement="Association_10dk4x3">
-        <di:waypoint xsi:type="dc:Point" x="797" y="946" />
-        <di:waypoint xsi:type="dc:Point" x="816" y="847" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0e58tta_di" bpmnElement="callGetServiceInstance">
-        <dc:Bounds x="686" y="163" width="100" height="80" />
+        <dc:Bounds x="996" y="163" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_06vsf1e_di" bpmnElement="openstackAdapterTask">
+        <dc:Bounds x="1653" y="1190" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1eutzkj_di" bpmnElement="Flow_1eutzkj">
+        <di:waypoint x="1704" y="1270" />
+        <di:waypoint x="1704" y="1430" />
+        <di:waypoint x="1586" y="1430" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn
deleted file mode 100644
index 9d37d8084e..0000000000
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0">
-  <bpmn:process id="DoUpdateNetworkInstanceRollback" name="DoUpdateNetworkInstanceRollback" isExecutable="true">
-    <bpmn:startEvent id="StartEvent_1">
-      <bpmn:outgoing>SequenceFlow_1krl2dg</bpmn:outgoing>
-    </bpmn:startEvent>
-    <bpmn:scriptTask id="Task_0whino1" name="PreProcess Incoming Data" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_1krl2dg</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0u41iz2</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-DoUpdateNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_1krl2dg" sourceRef="StartEvent_1" targetRef="Task_0whino1" />
-    <bpmn:sequenceFlow id="SequenceFlow_0u41iz2" sourceRef="Task_0whino1" targetRef="ExclusiveGateway_0v0en47" />
-    <bpmn:serviceTask id="ServiceTask_0bqh5yl" name="Call Rollback Network">
-      <bpmn:extensionElements>
-        <camunda:connector>
-          <camunda:inputOutput>
-            <camunda:inputParameter name="payload">${UPDNETIR_rollbackNetworkRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}
-]]></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="UPDNETIR_rollbackNetworkReturnCode">${statusCode}</camunda:outputParameter>
-            <camunda:outputParameter name="UPDNETIR_rollbackNetworkResponse">${response}</camunda:outputParameter>
-          </camunda:inputOutput>
-          <camunda:connectorId>http-connector</camunda:connectorId>
-        </camunda:connector>
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_0e1uixp</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_17o4w67</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_0v0en47" name="is PO Network Rollback?" default="SequenceFlow_1lteduj">
-      <bpmn:incoming>SequenceFlow_0u41iz2</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0e1uixp</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_1lteduj</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:callActivity id="CallActivity_1xilevb" name="Call Rollback SDNC Adapter" calledElement="sdncAdapter">
-      <bpmn:extensionElements>
-        <camunda:in source="UPDNETIR_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="UPDNETIR_rollbackSDNCReturnCode" />
-        <camunda:out source="sdncAdapterResponse" target="UPDNETIR_rollbackSDNCResponse" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_101y57s</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0790olb</bpmn:outgoing>
-    </bpmn:callActivity>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_17g4q5c" name="is RSRC SDNC?" default="SequenceFlow_101y57s">
-      <bpmn:incoming>SequenceFlow_0virkpu</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_101y57s</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_0mw0dgd</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:scriptTask id="ScriptTask_1ggaxfu" name="Validate Rollback Responses" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_0qc4v9t</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_0el8yzs</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0yto4gz</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-DoUpdateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_1n5jck8" name="is SDNC Rollback?" default="SequenceFlow_0qc4v9t">
-      <bpmn:incoming>SequenceFlow_1lteduj</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_17o4w67</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0virkpu</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_0qc4v9t</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_0e1uixp" name="Yes" sourceRef="ExclusiveGateway_0v0en47" targetRef="ServiceTask_0bqh5yl">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETIR_rollbackNetworkRequest") != null}]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_1lteduj" name="No" sourceRef="ExclusiveGateway_0v0en47" targetRef="ExclusiveGateway_1n5jck8" />
-    <bpmn:sequenceFlow id="SequenceFlow_0virkpu" name="Yes" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ExclusiveGateway_17g4q5c">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETIR_rollbackSDNCRequest") != null}]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_17o4w67" sourceRef="ServiceTask_0bqh5yl" targetRef="ExclusiveGateway_1n5jck8" />
-    <bpmn:sequenceFlow id="SequenceFlow_101y57s" name="No" sourceRef="ExclusiveGateway_17g4q5c" targetRef="CallActivity_1xilevb" />
-    <bpmn:sequenceFlow id="SequenceFlow_0mw0dgd" name="Yes" sourceRef="ExclusiveGateway_17g4q5c" targetRef="ExclusiveGateway_0b9kbop">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:endEvent id="EndEvent_1fvr7ad">
-      <bpmn:incoming>SequenceFlow_0yto4gz</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_0qc4v9t" name="No" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ScriptTask_1ggaxfu" />
-    <bpmn:sequenceFlow id="SequenceFlow_0790olb" sourceRef="CallActivity_1xilevb" targetRef="ExclusiveGateway_0b9kbop" />
-    <bpmn:subProcess id="SubProcess_1p4663w" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
-      <bpmn:scriptTask id="ScriptTask_0by1uwk" name="Log / Print Unexpected Error" scriptFormat="groovy">
-        <bpmn:incoming>SequenceFlow_0xktw7v</bpmn:incoming>
-        <bpmn:outgoing>SequenceFlow_0soe5t3</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-DoUpdateNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
-      </bpmn:scriptTask>
-      <bpmn:startEvent id="StartEvent_1j0eixl">
-        <bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
-        <bpmn:errorEventDefinition />
-      </bpmn:startEvent>
-      <bpmn:endEvent id="EndEvent_0jxh015">
-        <bpmn:incoming>SequenceFlow_0soe5t3</bpmn:incoming>
-      </bpmn:endEvent>
-      <bpmn:sequenceFlow id="SequenceFlow_0xktw7v" name="" sourceRef="StartEvent_1j0eixl" targetRef="ScriptTask_0by1uwk" />
-      <bpmn:sequenceFlow id="SequenceFlow_0soe5t3" name="" sourceRef="ScriptTask_0by1uwk" targetRef="EndEvent_0jxh015" />
-    </bpmn:subProcess>
-    <bpmn:inclusiveGateway id="ExclusiveGateway_0b9kbop">
-      <bpmn:incoming>SequenceFlow_0790olb</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_0mw0dgd</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0el8yzs</bpmn:outgoing>
-    </bpmn:inclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_0el8yzs" sourceRef="ExclusiveGateway_0b9kbop" targetRef="ScriptTask_1ggaxfu" />
-    <bpmn:sequenceFlow id="SequenceFlow_0yto4gz" sourceRef="ScriptTask_1ggaxfu" targetRef="EndEvent_1fvr7ad" />
-    <bpmn:subProcess id="SubProcess_1b8rnqv" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
-      <bpmn:scriptTask id="ScriptTask_02d3i14" name="Catch Exception">
-        <bpmn:incoming>SequenceFlow_07kf49j</bpmn:incoming>
-        <bpmn:outgoing>SequenceFlow_01syg1x</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-execution.setVariable("workflowException", execution.getVariable("WorkflowException")]]></bpmn:script>
-      </bpmn:scriptTask>
-      <bpmn:startEvent id="StartEvent_0e8yrgo">
-        <bpmn:outgoing>SequenceFlow_07kf49j</bpmn:outgoing>
-        <bpmn:errorEventDefinition />
-      </bpmn:startEvent>
-      <bpmn:endEvent id="EndEvent_1cmovvm">
-        <bpmn:incoming>SequenceFlow_01syg1x</bpmn:incoming>
-      </bpmn:endEvent>
-      <bpmn:sequenceFlow id="SequenceFlow_07kf49j" name="" sourceRef="StartEvent_0e8yrgo" targetRef="ScriptTask_02d3i14" />
-      <bpmn:sequenceFlow id="SequenceFlow_01syg1x" name="" sourceRef="ScriptTask_02d3i14" targetRef="EndEvent_1cmovvm" />
-    </bpmn:subProcess>
-    <bpmn:textAnnotation id="TextAnnotation_000ap15">    <bpmn:text><![CDATA[Include ONLY inputs/varrables:  
-rollbackData, as Map
--rollbackSDNCRequest
--rollbackNetworkRequest
-WorkflowException
- 
-]]></bpmn:text>
-</bpmn:textAnnotation>
-    <bpmn:association id="Association_0ybkmal" sourceRef="Task_0whino1" targetRef="TextAnnotation_000ap15" />
-    <bpmn:textAnnotation id="TextAnnotation_0vwyo82">    <bpmn:text><![CDATA[set value for:
-WorkflowException
-rolledBack
-wasDeleted
-]]></bpmn:text>
-</bpmn:textAnnotation>
-    <bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" />
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateNetworkInstanceRollback">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="240" y="354" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="258" y="390" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1dqe09s_di" bpmnElement="Task_0whino1">
-        <dc:Bounds x="403" y="332" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1krl2dg_di" bpmnElement="SequenceFlow_1krl2dg">
-        <di:waypoint xsi:type="dc:Point" x="276" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="382" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="382" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="403" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="397" y="372" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0u41iz2_di" bpmnElement="SequenceFlow_0u41iz2">
-        <di:waypoint xsi:type="dc:Point" x="503" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="660" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="582" y="357" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ServiceTask_0bqh5yl_di" bpmnElement="ServiceTask_0bqh5yl">
-        <dc:Bounds x="635" y="481" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0v0en47_di" bpmnElement="ExclusiveGateway_0v0en47" isMarkerVisible="true">
-        <dc:Bounds x="660" y="347" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="648" y="312" width="74" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_000ap15_di" bpmnElement="TextAnnotation_000ap15">
-        <dc:Bounds x="469" y="133" width="277" height="115" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_0ybkmal_di" bpmnElement="Association_0ybkmal">
-        <di:waypoint xsi:type="dc:Point" x="487" y="332" />
-        <di:waypoint xsi:type="dc:Point" x="559" y="248" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_1xilevb_di" bpmnElement="CallActivity_1xilevb">
-        <dc:Bounds x="995" y="610" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_17g4q5c_di" bpmnElement="ExclusiveGateway_17g4q5c" isMarkerVisible="true">
-        <dc:Bounds x="879" y="496" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="926" y="474" width="82" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1ggaxfu_di" bpmnElement="ScriptTask_1ggaxfu">
-        <dc:Bounds x="1123" y="332" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1n5jck8_di" bpmnElement="ExclusiveGateway_1n5jck8" isMarkerVisible="true">
-        <dc:Bounds x="879" y="347" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="880" y="308" width="48" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_0vwyo82_di" bpmnElement="TextAnnotation_0vwyo82">
-        <dc:Bounds x="1287" y="410" width="165" height="60" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_1gx121b_di" bpmnElement="Association_1gx121b">
-        <di:waypoint xsi:type="dc:Point" x="1223" y="389" />
-        <di:waypoint xsi:type="dc:Point" x="1287" y="412" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0e1uixp_di" bpmnElement="SequenceFlow_0e1uixp">
-        <di:waypoint xsi:type="dc:Point" x="685" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="685" y="439" />
-        <di:waypoint xsi:type="dc:Point" x="685" y="439" />
-        <di:waypoint xsi:type="dc:Point" x="685" y="481" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="693" y="395" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1lteduj_di" bpmnElement="SequenceFlow_1lteduj">
-        <di:waypoint xsi:type="dc:Point" x="710" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="879" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="716" y="350" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0virkpu_di" bpmnElement="SequenceFlow_0virkpu">
-        <di:waypoint xsi:type="dc:Point" x="904" y="397" />
-        <di:waypoint xsi:type="dc:Point" x="904" y="496" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="914" y="392.7469456247061" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_17o4w67_di" bpmnElement="SequenceFlow_17o4w67">
-        <di:waypoint xsi:type="dc:Point" x="735" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="817" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="817" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="879" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="832" y="446.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_101y57s_di" bpmnElement="SequenceFlow_101y57s">
-        <di:waypoint xsi:type="dc:Point" x="904" y="546" />
-        <di:waypoint xsi:type="dc:Point" x="904" y="650" />
-        <di:waypoint xsi:type="dc:Point" x="995" y="650" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="913" y="544.0784313725491" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0mw0dgd_di" bpmnElement="SequenceFlow_0mw0dgd">
-        <di:waypoint xsi:type="dc:Point" x="929" y="521" />
-        <di:waypoint xsi:type="dc:Point" x="1148" y="521" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="937" y="500" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1fvr7ad_di" bpmnElement="EndEvent_1fvr7ad">
-        <dc:Bounds x="1352" y="354" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1370" y="390" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0qc4v9t_di" bpmnElement="SequenceFlow_0qc4v9t">
-        <di:waypoint xsi:type="dc:Point" x="929" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="1123" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="941" y="351.1191898360114" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0790olb_di" bpmnElement="SequenceFlow_0790olb">
-        <di:waypoint xsi:type="dc:Point" x="1095" y="650" />
-        <di:waypoint xsi:type="dc:Point" x="1173" y="650" />
-        <di:waypoint xsi:type="dc:Point" x="1173" y="546" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1134" y="635" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
-        <dc:Bounds x="61" y="668" width="394" height="188" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
-        <dc:Bounds x="209" y="723" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
-        <dc:Bounds x="94" y="745" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="112" y="786" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
-        <dc:Bounds x="370" y="745" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="388" y="786" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
-        <di:waypoint xsi:type="dc:Point" x="130" y="763" />
-        <di:waypoint xsi:type="dc:Point" x="209" y="763" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="172" y="763" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
-        <di:waypoint xsi:type="dc:Point" x="309" y="763" />
-        <di:waypoint xsi:type="dc:Point" x="370" y="763" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="344" y="763" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="InclusiveGateway_0dot6c9_di" bpmnElement="ExclusiveGateway_0b9kbop">
-        <dc:Bounds x="1148" y="496" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1173" y="546" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0el8yzs_di" bpmnElement="SequenceFlow_0el8yzs">
-        <di:waypoint xsi:type="dc:Point" x="1173" y="496" />
-        <di:waypoint xsi:type="dc:Point" x="1173" y="412" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1188" y="444" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0yto4gz_di" bpmnElement="SequenceFlow_0yto4gz">
-        <di:waypoint xsi:type="dc:Point" x="1223" y="372" />
-        <di:waypoint xsi:type="dc:Point" x="1352" y="372" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1288" y="357" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_1b8rnqv_di" bpmnElement="SubProcess_1b8rnqv" isExpanded="true">
-        <dc:Bounds x="61" y="916" width="394" height="188" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_02d3i14_di" bpmnElement="ScriptTask_02d3i14">
-        <dc:Bounds x="209" y="971" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_0e8yrgo_di" bpmnElement="StartEvent_0e8yrgo">
-        <dc:Bounds x="94" y="993" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="112" y="1034" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_1cmovvm_di" bpmnElement="EndEvent_1cmovvm">
-        <dc:Bounds x="370" y="993" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="388" y="1034" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_07kf49j_di" bpmnElement="SequenceFlow_07kf49j">
-        <di:waypoint xsi:type="dc:Point" x="130" y="1011" />
-        <di:waypoint xsi:type="dc:Point" x="209" y="1011" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="172" y="1011" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_01syg1x_di" bpmnElement="SequenceFlow_01syg1x">
-        <di:waypoint xsi:type="dc:Point" x="309" y="1011" />
-        <di:waypoint xsi:type="dc:Point" x="370" y="1011" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="344" y="1011" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn
index cfda2ad73c..d423ae5cba 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn
@@ -1,13 +1,13 @@
 <?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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoUpdateVfModule" name="DoUpdateVfModule" isExecutable="true">
-    <bpmn2:documentation><![CDATA[This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'.  This flow produces no output.]]></bpmn2:documentation>
+    <bpmn2:documentation>This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'.  This flow produces no output.</bpmn2:documentation>
     <bpmn2:scriptTask id="PrepareUpdateAAIVfModule_prep" name="Prepare Update AAI Vf Module (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script>
+duvm.prepPrepareUpdateAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="PrepareUpdateAAIVfModule_prep" targetRef="ScriptTask_1" />
     <bpmn2:callActivity id="ScriptTask_1" name="Prepare Update AAI Vf Module" calledElement="PrepareUpdateAAIVfModule">
@@ -26,18 +26,18 @@ duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ProcessReceivedRequest" name="Process Received Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.preProcessRequest(execution)]]></bpmn2:script>
+duvm.preProcessRequest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ProcessReceivedRequest" targetRef="PrepareUpdateAAIVfModule_prep" />
     <bpmn2:subProcess id="SubProcess_1" name="Catch Exception" triggeredByEvent="true">
       <bpmn2:scriptTask id="ScriptTask_16" name="Handle Exception" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+        <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.handleWorkflowException(execution)]]></bpmn2:script>
+duvm.handleWorkflowException(execution)</bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:endEvent id="EndEvent_3">
         <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
@@ -63,9 +63,9 @@ duvm.handleWorkflowException(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
+duvm.prepUpdateAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="ScriptTask_10" targetRef="ScriptTask_11" />
     <bpmn2:callActivity id="ScriptTask_11" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
@@ -83,9 +83,9 @@ duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_12" name="SDNC Topology Activate (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script>
+duvm.prepSDNCTopologyAct(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ScriptTask_12" targetRef="ScriptTask_13" />
     <bpmn2:callActivity id="ScriptTask_13" name="SDNCAdapter Topology Activate" calledElement="sdncAdapter">
@@ -104,9 +104,9 @@ duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_14" name="Update AAI Generic Vnf (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+duvm.prepUpdateAAIGenericVnf(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_14" targetRef="ExclusiveGateway_1" />
     <bpmn2:callActivity id="CallActivity_1" name="UpdateAAIGenericVnf" calledElement="UpdateAAIGenericVnf">
@@ -128,7 +128,7 @@ duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_14" name="Do the update" sourceRef="ExclusiveGateway_1" targetRef="CallActivity_1" />
     <bpmn2:sequenceFlow id="SequenceFlow_18" name="Skip the update" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_10">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:startEvent id="StartEvent_1" name="Start">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -138,9 +138,9 @@ duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
+duvm.prepSDNCTopologyChg(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ScriptTask_4" targetRef="ScriptTask_5" />
     <bpmn2:callActivity id="ScriptTask_5" name="SDNC Adapter Topology Change/Assign" calledElement="sdncAdapter">
@@ -156,9 +156,9 @@ duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:callActivity id="ScriptTask_9" name="VnfAdapterRest" calledElement="vnfAdapterTask">
+    <bpmn2:callActivity id="ScriptTask_9" name="VnfAdapterRest" calledElement="openstackAdapterTask">
       <bpmn2:extensionElements>
-        <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="vnfAdapterTaskRequest" />
+        <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="openstackAdapterTaskRequest" />
         <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" />
@@ -171,18 +171,18 @@ duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_8" name="VNF Adapter (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepVnfAdapterRest(execution)]]></bpmn2:script>
+duvm.prepVnfAdapterRest(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_8" targetRef="ScriptTask_9" />
     <bpmn2:scriptTask id="ScriptTask_15" name="Validate SDNC Query Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 String response = execution.getVariable("DOUPVfMod_sdncTopologyResponse")
 def duvm = new DoUpdateVfModule()
-duvm.validateSDNCResponse(execution, response, "query")]]></bpmn2:script>
+duvm.validateSDNCResponse(execution, response, "query")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="ScriptTask_7" name="SDNCAdapter Topology Query" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
@@ -200,19 +200,19 @@ duvm.validateSDNCResponse(execution, response, "query")]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_18" name="Validate SDNC Change/Assign Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 String response = execution.getVariable("DOUPVfMod_sdncChangeAssignResponse")
 def duvm = new DoUpdateVfModule()
-duvm.validateSDNCResponse(execution, response, "changeassign")]]></bpmn2:script>
+duvm.validateSDNCResponse(execution, response, "changeassign")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_5" targetRef="ScriptTask_18" />
     <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_18" targetRef="ScriptTask_6" />
     <bpmn2:scriptTask id="ScriptTask_6" name="SDNC Topology Query (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script>
+duvm.prepSDNCTopologyQuery(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="ScriptTask_6" targetRef="ScriptTask_7" />
     <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_15" />
@@ -241,9 +241,9 @@ duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_2" name="Confirm VolumeGroup Tenant (prep)" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def duvm = new DoUpdateVfModule()
-duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script>
+duvm.prepConfirmVolumeGroupTenant(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_2" targetRef="ScriptTask_3" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="VolumeGroupId 
&#10;&#10;present?" default="SequenceFlow_16">
@@ -252,18 +252,18 @@ duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_10" name="Yes" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_2">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_16" name="No" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_4" />
     <bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="IsBaseVfModule" targetRef="ExclusiveGateway_3">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DOUPVfMod_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DOUPVfMod_isBaseVfModule") == "true"</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:scriptTask id="QueryAAIVfModule" name="Query AAI Vf Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def doUpdateVfModule = new DoUpdateVfModule()
-doUpdateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
+doUpdateVfModule.queryAAIVfModule(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule" />
     <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_3" />
@@ -277,16 +277,16 @@ doUpdateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="ScriptTask_19" name="PostProcess SDNC Adapter Activate" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+      <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
 String response = execution.getVariable("DOUPVfMod_sdncActivateResponse")
 def duvm = new DoUpdateVfModule()
-duvm.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
+duvm.validateSDNCResponse(execution, response, "activate")</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_17" name="Set Success Indicator" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[// This variable is checked by the unit test
-execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)]]></bpmn2:script>
+      <bpmn2:script>// This variable is checked by the unit test
+execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_17" targetRef="EndEvent_1" />
     <bpmn2:endEvent id="EndEvent_1" name="TheEnd">
@@ -299,369 +299,369 @@ execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)]]></bpmn2:script
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateVfModule">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
-        <dc:Bounds x="150" y="214" width="36" height="36" />
+        <dc:Bounds x="230" y="214" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="151" y="255" width="34" height="22" />
+          <dc:Bounds x="236" y="255" width="25" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="ProcessReceivedRequest">
-        <dc:Bounds x="300" y="192" width="100" height="80" />
+        <dc:Bounds x="380" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22">
-        <di:waypoint xsi:type="dc:Point" x="186" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="300" y="232" />
+        <di:waypoint x="266" y="232" />
+        <di:waypoint x="380" y="232" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="208" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="PrepareUpdateAAIVfModule_prep">
-        <dc:Bounds x="456" y="192" width="100" height="80" />
+        <dc:Bounds x="536" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_160">
-        <di:waypoint xsi:type="dc:Point" x="400" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="456" y="232" />
+        <di:waypoint x="480" y="232" />
+        <di:waypoint x="536" y="232" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="492" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_164" bpmnElement="ScriptTask_1">
-        <dc:Bounds x="624" y="192" width="100" height="80" />
+        <dc:Bounds x="704" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ScriptTask_164">
-        <di:waypoint xsi:type="dc:Point" x="556" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="624" y="232" />
+        <di:waypoint x="636" y="232" />
+        <di:waypoint x="704" y="232" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="575" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_88" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds x="1039" y="206" width="50" height="50" />
+        <dc:Bounds x="1119" y="206" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1011" y="172" width="109" height="38" />
+          <dc:Bounds x="1108" y="172" width="76" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_165" bpmnElement="ScriptTask_2">
-        <dc:Bounds x="1152" y="192" width="100" height="80" />
+        <dc:Bounds x="1232" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_88" targetElement="_BPMNShape_ScriptTask_165">
-        <di:waypoint xsi:type="dc:Point" x="1089" y="231" />
-        <di:waypoint xsi:type="dc:Point" x="1118" y="231" />
-        <di:waypoint xsi:type="dc:Point" x="1118" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="1152" y="232" />
+        <di:waypoint x="1169" y="231" />
+        <di:waypoint x="1198" y="231" />
+        <di:waypoint x="1198" y="232" />
+        <di:waypoint x="1232" y="232" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1099" y="231" width="29" height="22" />
+          <dc:Bounds x="1185" y="231" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_166" bpmnElement="ScriptTask_3">
-        <dc:Bounds x="1308" y="192" width="100" height="80" />
+        <dc:Bounds x="1388" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_165" targetElement="_BPMNShape_ScriptTask_166">
-        <di:waypoint xsi:type="dc:Point" x="1252" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="1308" y="232" />
+        <di:waypoint x="1332" y="232" />
+        <di:waypoint x="1388" y="232" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1271" y="232" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_167" bpmnElement="ScriptTask_4">
-        <dc:Bounds x="72" y="420" width="100" height="80" />
+        <dc:Bounds x="152" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="ScriptTask_5">
-        <dc:Bounds x="239" y="420" width="100" height="80" />
+        <dc:Bounds x="319" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_169" bpmnElement="ScriptTask_6">
-        <dc:Bounds x="535" y="420" width="100" height="80" />
+        <dc:Bounds x="615" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_167" targetElement="_BPMNShape_ScriptTask_168">
-        <di:waypoint xsi:type="dc:Point" x="172" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="239" y="460" />
+        <di:waypoint x="252" y="460" />
+        <di:waypoint x="319" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="197" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ExclusiveGateway_88" targetElement="_BPMNShape_ScriptTask_167">
-        <di:waypoint xsi:type="dc:Point" x="1064" y="256" />
-        <di:waypoint xsi:type="dc:Point" x="1064" y="351" />
-        <di:waypoint xsi:type="dc:Point" x="122" y="351" />
-        <di:waypoint xsi:type="dc:Point" x="122" y="420" />
+        <di:waypoint x="1144" y="256" />
+        <di:waypoint x="1144" y="351" />
+        <di:waypoint x="202" y="351" />
+        <di:waypoint x="202" y="420" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1073" y="271" width="22" height="22" />
+          <dc:Bounds x="1157" y="271" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_166" targetElement="_BPMNShape_ScriptTask_167">
-        <di:waypoint xsi:type="dc:Point" x="1358" y="272" />
-        <di:waypoint xsi:type="dc:Point" x="1358" y="352" />
-        <di:waypoint xsi:type="dc:Point" x="639" y="352" />
-        <di:waypoint xsi:type="dc:Point" x="122" y="352" />
-        <di:waypoint xsi:type="dc:Point" x="122" y="420" />
+        <di:waypoint x="1438" y="272" />
+        <di:waypoint x="1438" y="352" />
+        <di:waypoint x="719" y="352" />
+        <di:waypoint x="202" y="352" />
+        <di:waypoint x="202" y="420" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="927" y="352" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="ScriptTask_7">
-        <dc:Bounds x="684" y="420" width="100" height="80" />
+        <dc:Bounds x="764" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ScriptTask_169" targetElement="_BPMNShape_ScriptTask_170">
-        <di:waypoint xsi:type="dc:Point" x="635" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="684" y="460" />
+        <di:waypoint x="715" y="460" />
+        <di:waypoint x="764" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="648" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_171" bpmnElement="ScriptTask_8">
-        <dc:Bounds x="996" y="420" width="100" height="80" />
+        <dc:Bounds x="1076" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ScriptTask_9">
-        <dc:Bounds x="1176" y="420" width="100" height="80" />
+        <dc:Bounds x="1256" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ScriptTask_171" targetElement="_BPMNShape_ScriptTask_172">
-        <di:waypoint xsi:type="dc:Point" x="1096" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="1176" y="460" />
+        <di:waypoint x="1176" y="460" />
+        <di:waypoint x="1256" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1133" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="ScriptTask_10">
-        <dc:Bounds x="466" y="636" width="100" height="80" />
+        <dc:Bounds x="546" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="ScriptTask_11">
-        <dc:Bounds x="624" y="636" width="100" height="80" />
+        <dc:Bounds x="704" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_ScriptTask_219">
-        <di:waypoint xsi:type="dc:Point" x="1226" y="500" />
-        <di:waypoint xsi:type="dc:Point" x="1226" y="576" />
-        <di:waypoint xsi:type="dc:Point" x="194" y="576" />
-        <di:waypoint xsi:type="dc:Point" x="194" y="636" />
+        <di:waypoint x="1306" y="500" />
+        <di:waypoint x="1306" y="576" />
+        <di:waypoint x="274" y="576" />
+        <di:waypoint x="274" y="636" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="821" y="576" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_ScriptTask_174">
-        <di:waypoint xsi:type="dc:Point" x="566" y="676" />
-        <di:waypoint xsi:type="dc:Point" x="624" y="676" />
+        <di:waypoint x="646" y="676" />
+        <di:waypoint x="704" y="676" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="591" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_175" bpmnElement="ScriptTask_12">
-        <dc:Bounds x="804" y="636" width="100" height="80" />
+        <dc:Bounds x="884" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="ScriptTask_13">
-        <dc:Bounds x="984" y="636" width="100" height="80" />
+        <dc:Bounds x="1064" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ScriptTask_174" targetElement="_BPMNShape_ScriptTask_175">
-        <di:waypoint xsi:type="dc:Point" x="724" y="676" />
-        <di:waypoint xsi:type="dc:Point" x="804" y="676" />
+        <di:waypoint x="804" y="676" />
+        <di:waypoint x="884" y="676" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="695" y="674" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_175" targetElement="_BPMNShape_ScriptTask_176">
-        <di:waypoint xsi:type="dc:Point" x="904" y="676" />
-        <di:waypoint xsi:type="dc:Point" x="984" y="676" />
+        <di:waypoint x="984" y="676" />
+        <di:waypoint x="1064" y="676" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="902" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_162" bpmnElement="EndEvent_1">
-        <dc:Bounds x="1208" y="906" width="36" height="36" />
+        <dc:Bounds x="1288" y="906" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1201" y="947" width="50" height="22" />
+          <dc:Bounds x="1287" y="947" width="38" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true">
-        <dc:Bounds x="239" y="924" width="475" height="198" />
+        <dc:Bounds x="319" y="924" width="475" height="198" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="ScriptTask_16">
-        <dc:Bounds x="399" y="984" width="100" height="80" />
+        <dc:Bounds x="479" y="984" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_163" bpmnElement="EndEvent_3">
-        <dc:Bounds x="617" y="1006" width="36" height="36" />
+        <dc:Bounds x="697" y="1006" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="635" y="1047" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_179" targetElement="_BPMNShape_EndEvent_163">
-        <di:waypoint xsi:type="dc:Point" x="499" y="1024" />
-        <di:waypoint xsi:type="dc:Point" x="617" y="1024" />
+        <di:waypoint x="579" y="1024" />
+        <di:waypoint x="697" y="1024" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="555" y="1024" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_46" bpmnElement="BoundaryEvent_1">
-        <dc:Bounds x="696" y="1005" width="36" height="36" />
+        <dc:Bounds x="776" y="1005" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="711" y="1046" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_164" bpmnElement="EndEvent_5">
-        <dc:Bounds x="814" y="1005" width="36" height="36" />
+        <dc:Bounds x="894" y="1005" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="832" y="1046" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_BoundaryEvent_46" targetElement="_BPMNShape_EndEvent_164">
-        <di:waypoint xsi:type="dc:Point" x="732" y="1023" />
-        <di:waypoint xsi:type="dc:Point" x="814" y="1023" />
+        <di:waypoint x="812" y="1023" />
+        <di:waypoint x="894" y="1023" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="770" y="1023" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_56" bpmnElement="StartEvent_3">
-        <dc:Bounds x="305" y="1006" width="36" height="36" />
+        <dc:Bounds x="385" y="1006" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="323" y="1047" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_StartEvent_56" targetElement="_BPMNShape_ScriptTask_179">
-        <di:waypoint xsi:type="dc:Point" x="341" y="1024" />
-        <di:waypoint xsi:type="dc:Point" x="399" y="1024" />
+        <di:waypoint x="421" y="1024" />
+        <di:waypoint x="479" y="1024" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="302" y="1084" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_180" bpmnElement="ScriptTask_17">
-        <dc:Bounds x="1176" y="768" width="100" height="80" />
+        <dc:Bounds x="1256" y="768" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_180" targetElement="_BPMNShape_EndEvent_162">
-        <di:waypoint xsi:type="dc:Point" x="1226" y="848" />
-        <di:waypoint xsi:type="dc:Point" x="1226" y="906" />
+        <di:waypoint x="1306" y="848" />
+        <di:waypoint x="1306" y="906" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1223" y="868" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_219" bpmnElement="ScriptTask_14">
-        <dc:Bounds x="144" y="636" width="100" height="80" />
+        <dc:Bounds x="224" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_2" bpmnElement="CallActivity_1">
-        <dc:Bounds x="300" y="636" width="100" height="80" />
+        <dc:Bounds x="380" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_2" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="400" y="676" />
-        <di:waypoint xsi:type="dc:Point" x="466" y="676" />
+        <di:waypoint x="480" y="676" />
+        <di:waypoint x="546" y="676" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="431" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_219" targetElement="_BPMNShape_ExclusiveGateway_213">
-        <di:waypoint xsi:type="dc:Point" x="194" y="716" />
-        <di:waypoint xsi:type="dc:Point" x="195" y="793" />
-        <di:waypoint xsi:type="dc:Point" x="284" y="793" />
-        <di:waypoint xsi:type="dc:Point" x="324" y="793" />
+        <di:waypoint x="274" y="716" />
+        <di:waypoint x="275" y="793" />
+        <di:waypoint x="364" y="793" />
+        <di:waypoint x="404" y="793" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="191" y="746" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_213" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
-        <dc:Bounds x="324" y="768" width="50" height="50" />
+        <dc:Bounds x="404" y="768" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="349" y="823" width="0" height="0" />
+          <dc:Bounds x="397" y="823" width="65" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_CallActivity_2">
-        <di:waypoint xsi:type="dc:Point" x="349" y="768" />
-        <di:waypoint xsi:type="dc:Point" x="350" y="716" />
+        <di:waypoint x="429" y="768" />
+        <di:waypoint x="430" y="716" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="357" y="733" width="80" height="22" />
+          <dc:Bounds x="442" y="733" width="70" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="374" y="793" />
-        <di:waypoint xsi:type="dc:Point" x="515" y="793" />
-        <di:waypoint xsi:type="dc:Point" x="516" y="716" />
+        <di:waypoint x="454" y="793" />
+        <di:waypoint x="595" y="793" />
+        <di:waypoint x="596" y="716" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="380" y="768" width="97" height="22" />
+          <dc:Bounds x="470" y="768" width="77" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_220" bpmnElement="ScriptTask_15">
-        <dc:Bounds x="840" y="420" width="100" height="80" />
+        <dc:Bounds x="920" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_221" bpmnElement="ScriptTask_18">
-        <dc:Bounds x="384" y="420" width="100" height="80" />
+        <dc:Bounds x="464" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_ScriptTask_221">
-        <di:waypoint xsi:type="dc:Point" x="339" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="384" y="460" />
+        <di:waypoint x="419" y="460" />
+        <di:waypoint x="464" y="460" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_221" targetElement="_BPMNShape_ScriptTask_169">
-        <di:waypoint xsi:type="dc:Point" x="484" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="535" y="460" />
+        <di:waypoint x="564" y="460" />
+        <di:waypoint x="615" y="460" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="511" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_170" targetElement="_BPMNShape_ScriptTask_220">
-        <di:waypoint xsi:type="dc:Point" x="784" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="840" y="460" />
+        <di:waypoint x="864" y="460" />
+        <di:waypoint x="920" y="460" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_220" targetElement="_BPMNShape_ScriptTask_171">
-        <di:waypoint xsi:type="dc:Point" x="940" y="460" />
-        <di:waypoint xsi:type="dc:Point" x="996" y="460" />
+        <di:waypoint x="1020" y="460" />
+        <di:waypoint x="1076" y="460" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_214" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
-        <dc:Bounds x="965" y="206" width="50" height="50" />
+        <dc:Bounds x="1045" y="206" width="50" height="50" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="990" y="261" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="IsBaseVfModule" isMarkerVisible="true">
-        <dc:Bounds x="770" y="206" width="50" height="50" />
+        <dc:Bounds x="850" y="206" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="795" y="261" width="0" height="0" />
+          <dc:Bounds x="848" y="261" width="55" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="QueryAAIVfModule">
-        <dc:Bounds x="849" y="72" width="100" height="80" />
+        <dc:Bounds x="929" y="72" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_164" targetElement="_BPMNShape_ExclusiveGateway_215">
-        <di:waypoint xsi:type="dc:Point" x="724" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="747" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="747" y="231" />
-        <di:waypoint xsi:type="dc:Point" x="770" y="231" />
+        <di:waypoint x="804" y="232" />
+        <di:waypoint x="827" y="232" />
+        <di:waypoint x="827" y="231" />
+        <di:waypoint x="850" y="231" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_ExclusiveGateway_214">
-        <di:waypoint xsi:type="dc:Point" x="820" y="231" />
-        <di:waypoint xsi:type="dc:Point" x="965" y="231" />
+        <di:waypoint x="900" y="231" />
+        <di:waypoint x="1045" y="231" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="888" y="231" width="6" height="6" />
+          <dc:Bounds x="963" y="231" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ExclusiveGateway_214" targetElement="_BPMNShape_ExclusiveGateway_88">
-        <di:waypoint xsi:type="dc:Point" x="1015" y="231" />
-        <di:waypoint xsi:type="dc:Point" x="1039" y="231" />
+        <di:waypoint x="1095" y="231" />
+        <di:waypoint x="1119" y="231" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1015" y="231" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_ScriptTask_285">
-        <di:waypoint xsi:type="dc:Point" x="795" y="206" />
-        <di:waypoint xsi:type="dc:Point" x="795" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="849" y="112" />
+        <di:waypoint x="875" y="206" />
+        <di:waypoint x="875" y="112" />
+        <di:waypoint x="929" y="112" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="770" y="151" width="20" height="22" />
+          <dc:Bounds x="854" y="151" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_285" targetElement="_BPMNShape_ExclusiveGateway_214">
-        <di:waypoint xsi:type="dc:Point" x="949" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="966" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="990" y="112" />
-        <di:waypoint xsi:type="dc:Point" x="990" y="206" />
+        <di:waypoint x="1029" y="112" />
+        <di:waypoint x="1046" y="112" />
+        <di:waypoint x="1070" y="112" />
+        <di:waypoint x="1070" y="206" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="987" y="136" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_286" bpmnElement="ScriptTask_19">
-        <dc:Bounds x="1176" y="636" width="100" height="80" />
+        <dc:Bounds x="1256" y="636" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_176" targetElement="_BPMNShape_ScriptTask_286">
-        <di:waypoint xsi:type="dc:Point" x="1084" y="676" />
-        <di:waypoint xsi:type="dc:Point" x="1176" y="676" />
+        <di:waypoint x="1164" y="676" />
+        <di:waypoint x="1256" y="676" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1121" y="676" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_286" targetElement="_BPMNShape_ScriptTask_180">
-        <di:waypoint xsi:type="dc:Point" x="1226" y="716" />
-        <di:waypoint xsi:type="dc:Point" x="1226" y="768" />
+        <di:waypoint x="1306" y="716" />
+        <di:waypoint x="1306" y="768" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasks.java
index 0ec28d901c..fb5c81a52e 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasks.java
@@ -63,7 +63,7 @@ public class NetworkAdapterCreateTasks {
                     gBBInput.getRequestContext(), gBBInput.getCloudRegion(), gBBInput.getOrchContext(), serviceInstance,
                     l3Network, userInput, cloudRegionPo, gBBInput.getCustomer());
 
-            execution.setVariable("networkAdapterRequest", createNetworkRequest);
+            execution.setVariable("networkAdapterRequest", createNetworkRequest.toXmlString());
         } catch (Exception ex) {
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
         }
@@ -81,13 +81,14 @@ public class NetworkAdapterCreateTasks {
                     execution.setVariable("networkAdapterCreateRollback", true);
                 }
             } else {
-                throw new Exception("No response was sent back from NetworkAdapterRestV1 subflow.");
+                throw new Exception("No response was sent back from NetworkAdapter subflow.");
             }
         } catch (Exception ex) {
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
         }
     }
 
+    // TODO is this even used anywhere?
     public void rollbackCreateNetwork(BuildingBlockExecution execution) {
         try {
             GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterDeleteTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterDeleteTasks.java
index 7a7d681762..df5e7d2b34 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterDeleteTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterDeleteTasks.java
@@ -53,7 +53,7 @@ public class NetworkAdapterDeleteTasks {
             DeleteNetworkRequest deleteNetworkRequest = networkAdapterObjectMapper.deleteNetworkRequestMapper(
                     gBBInput.getRequestContext(), gBBInput.getCloudRegion(), serviceInstance, l3Network);
 
-            execution.setVariable("networkAdapterRequest", deleteNetworkRequest);
+            execution.setVariable("networkAdapterRequest", deleteNetworkRequest.toXmlString());
         } catch (Exception ex) {
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
         }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImpl.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImpl.java
new file mode 100644
index 0000000000..5a84910a29
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImpl.java
@@ -0,0 +1,103 @@
+package org.onap.so.bpmn.infrastructure.adapter.network.tasks;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.util.Optional;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.so.adapters.nwrest.CreateNetworkError;
+import org.onap.so.adapters.nwrest.CreateNetworkRequest;
+import org.onap.so.adapters.nwrest.CreateNetworkResponse;
+import org.onap.so.adapters.nwrest.DeleteNetworkError;
+import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
+import org.onap.so.adapters.nwrest.DeleteNetworkResponse;
+import org.onap.so.adapters.nwrest.UpdateNetworkError;
+import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
+import org.onap.so.adapters.nwrest.UpdateNetworkResponse;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
+import org.onap.so.bpmn.servicedecomposition.tasks.ExtractPojosForBB;
+import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.so.utils.Components;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NetworkAdapterImpl {
+
+    private static final Logger logger = LoggerFactory.getLogger(NetworkAdapterImpl.class);
+
+    @Autowired
+    private ExtractPojosForBB extractPojosForBB;
+
+    @Autowired
+    private ExceptionBuilder exceptionUtil;
+
+    public void preProcessNetworkAdapter(BuildingBlockExecution execution) {
+        try {
+            GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
+            ServiceInstance serviceInstance =
+                    extractPojosForBB.extractByKey(execution, ResourceKey.SERVICE_INSTANCE_ID);
+            execution.setVariable("mso-request-id", gBBInput.getRequestContext().getMsoRequestId());
+            execution.setVariable("mso-service-instance-id", serviceInstance.getServiceInstanceId());
+        } catch (Exception ex) {
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+        }
+    }
+
+    public void postProcessNetworkAdapter(BuildingBlockExecution execution) {
+        try {
+            String workflowResponse = (String) execution.getVariable("WorkflowResponse");
+            if (workflowResponse != null) {
+                Optional<String> responseType = findResponseType(workflowResponse);
+                if ("createNetworkResponse".equals(responseType.get())) {
+                    CreateNetworkResponse createNetworkResponse =
+                            (CreateNetworkResponse) unmarshalXml(workflowResponse, CreateNetworkResponse.class);
+                    execution.setVariable("createNetworkResponse", createNetworkResponse);
+                } else if ("deleteNetworkResponse".equals(responseType.get())) {
+                    DeleteNetworkResponse deleteNetworkResponse =
+                            (DeleteNetworkResponse) unmarshalXml(workflowResponse, DeleteNetworkResponse.class);
+                    execution.setVariable("deleteNetworkResponse", deleteNetworkResponse);
+                } else if ("updateNetworkResponse".equals(responseType.get())) {
+                    UpdateNetworkResponse updateNetworkResponse =
+                            (UpdateNetworkResponse) unmarshalXml(workflowResponse, UpdateNetworkResponse.class);
+                    execution.setVariable("updateNetworkResponse", updateNetworkResponse);
+                } else {
+                    logger.warn("Unable to determine network response type");
+                }
+            }
+        } catch (Exception e) {
+            logger.error("Error Network Adapter post process", e);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, e.getMessage(), Components.OPENSTACK);
+        }
+    }
+
+    protected <T> Object unmarshalXml(String xmlString, Class<T> resultClass) throws JAXBException {
+        StringReader reader = new StringReader(xmlString);
+        JAXBContext context = JAXBContext.newInstance(resultClass);
+        Unmarshaller unmarshaller = context.createUnmarshaller();
+        return unmarshaller.unmarshal(reader);
+    }
+
+    protected Optional<String> findResponseType(String xmlString) {
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            org.w3c.dom.Document doc;
+            doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes("UTF-8")));
+            return Optional.of(doc.getDocumentElement().getNodeName());
+        } catch (Exception e) {
+            logger.error("Error Finding Response Type", e);
+            return Optional.empty();
+        }
+    }
+
+}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterRestV1.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterRestV1.java
deleted file mode 100644
index 2705d00d6b..0000000000
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterRestV1.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2019 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.onap.so.bpmn.infrastructure.adapter.network.tasks;
-
-import java.io.StringReader;
-import java.util.Optional;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.onap.so.adapters.nwrest.CreateNetworkError;
-import org.onap.so.adapters.nwrest.CreateNetworkRequest;
-import org.onap.so.adapters.nwrest.CreateNetworkResponse;
-import org.onap.so.adapters.nwrest.DeleteNetworkError;
-import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
-import org.onap.so.adapters.nwrest.DeleteNetworkResponse;
-import org.onap.so.adapters.nwrest.UpdateNetworkError;
-import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
-import org.onap.so.adapters.nwrest.UpdateNetworkResponse;
-import org.onap.so.client.exception.ExceptionBuilder;
-import org.onap.so.client.orchestration.NetworkAdapterResources;
-import org.onap.logging.filter.base.ONAPComponents;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.onap.so.utils.Components;
-
-@Component
-public class NetworkAdapterRestV1 {
-
-    private static final Logger logger = LoggerFactory.getLogger(NetworkAdapterRestV1.class);
-
-    private static final String NETWORK_REQUEST = "networkAdapterRequest";
-    private static final String NETWORK_MESSAGE = "NetworkAResponse_MESSAGE";
-    private static final String NETWORK_SYNC_CODE = "NETWORKREST_networkAdapterStatusCode";
-    private static final String NETWORK_SYNC_RESPONSE = "NETWORKREST_networkAdapterResponse";
-    private static final String NETWORK_CORRELATOR = "NetworkAResponse_CORRELATOR";
-
-    @Autowired
-    private ExceptionBuilder exceptionBuilder;
-
-    @Autowired
-    private NetworkAdapterResources networkAdapterResources;
-
-    public void callNetworkAdapter(DelegateExecution execution) {
-        try {
-            Object networkAdapterRequest = execution.getVariable(NETWORK_REQUEST);
-            if (networkAdapterRequest != null) {
-                Optional<Response> response = Optional.empty();
-                if (networkAdapterRequest instanceof CreateNetworkRequest) {
-                    CreateNetworkRequest createNetworkRequest = (CreateNetworkRequest) networkAdapterRequest;
-                    execution.setVariable(NETWORK_CORRELATOR, createNetworkRequest.getMessageId());
-                    response = networkAdapterResources.createNetworkAsync(createNetworkRequest);
-                } else if (networkAdapterRequest instanceof DeleteNetworkRequest) {
-                    DeleteNetworkRequest deleteNetworkRequest = (DeleteNetworkRequest) networkAdapterRequest;
-                    execution.setVariable(NETWORK_CORRELATOR, deleteNetworkRequest.getMessageId());
-                    response = networkAdapterResources.deleteNetworkAsync(deleteNetworkRequest);
-                } else if (networkAdapterRequest instanceof UpdateNetworkRequest) {
-                    UpdateNetworkRequest updateNetworkRequest = (UpdateNetworkRequest) networkAdapterRequest;
-                    execution.setVariable(NETWORK_CORRELATOR, updateNetworkRequest.getMessageId());
-                    response = networkAdapterResources.updateNetworkAsync(updateNetworkRequest);
-                }
-                if (response.isPresent()) {
-                    String statusCode = Integer.toString(response.get().getStatus());
-                    String responseString = "";
-                    if (response.get().getEntity() != null) {
-                        responseString = (String) response.get().getEntity();
-                    }
-                    execution.setVariable(NETWORK_SYNC_CODE, statusCode);
-                    execution.setVariable(NETWORK_SYNC_RESPONSE, responseString);
-                } else {
-                    throw new Exception("No Ack response from Openstack Adapter");
-                }
-            } else {
-                throw new Exception("No Network Request was created. networkAdapterRequest was null.");
-            }
-        } catch (Exception ex) {
-            exceptionBuilder.buildAndThrowWorkflowException(execution, 7000, ex, ONAPComponents.SO);
-        }
-    }
-
-    public void processCallback(DelegateExecution execution) {
-        try {
-            Object networkAdapterRequest = execution.getVariable(NETWORK_REQUEST);
-            String callback = (String) execution.getVariable(NETWORK_MESSAGE);
-            String logCallbackMessage = "Callback from OpenstackAdapter: " + callback;
-            logger.debug(logCallbackMessage);
-            if (networkAdapterRequest != null) {
-                if (networkAdapterRequest instanceof CreateNetworkRequest) {
-                    if (callback.contains("createNetworkError")) {
-                        CreateNetworkError createNetworkError =
-                                (CreateNetworkError) unmarshalXml(callback, CreateNetworkError.class);
-                        throw new Exception(createNetworkError.getMessage());
-                    } else {
-                        CreateNetworkResponse createNetworkResponse =
-                                (CreateNetworkResponse) unmarshalXml(callback, CreateNetworkResponse.class);
-                        execution.setVariable("createNetworkResponse", createNetworkResponse);
-                    }
-                } else if (networkAdapterRequest instanceof DeleteNetworkRequest) {
-                    if (callback.contains("deleteNetworkError")) {
-                        DeleteNetworkError deleteNetworkError =
-                                (DeleteNetworkError) unmarshalXml(callback, DeleteNetworkError.class);
-                        throw new Exception(deleteNetworkError.getMessage());
-                    } else {
-                        DeleteNetworkResponse deleteNetworkResponse =
-                                (DeleteNetworkResponse) unmarshalXml(callback, DeleteNetworkResponse.class);
-                        execution.setVariable("deleteNetworkResponse", deleteNetworkResponse);
-                    }
-                } else if (networkAdapterRequest instanceof UpdateNetworkRequest) {
-                    if (callback.contains("updateNetworkError")) {
-                        UpdateNetworkError updateNetworkError =
-                                (UpdateNetworkError) unmarshalXml(callback, UpdateNetworkError.class);
-                        throw new Exception(updateNetworkError.getMessage());
-                    } else {
-                        UpdateNetworkResponse updateNetworkResponse =
-                                (UpdateNetworkResponse) unmarshalXml(callback, UpdateNetworkResponse.class);
-                        execution.setVariable("updateNetworkResponse", updateNetworkResponse);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            logger.error("Error in Openstack Adapter callback", e);
-            exceptionBuilder.buildAndThrowWorkflowException(execution, 7000, e.getMessage(), Components.OPENSTACK);
-        }
-    }
-
-    protected <T> Object unmarshalXml(String xmlString, Class<T> resultClass) throws JAXBException {
-        StringReader reader = new StringReader(xmlString);
-        JAXBContext context = JAXBContext.newInstance(resultClass);
-        Unmarshaller unmarshaller = context.createUnmarshaller();
-        return unmarshaller.unmarshal(reader);
-    }
-
-    public void handleTimeOutException(DelegateExecution execution) {
-        exceptionBuilder.buildAndThrowWorkflowException(execution, 7000,
-                "Error timed out waiting on Openstack Async-Response", ONAPComponents.SO);
-    }
-
-    public void handleSyncError(DelegateExecution execution) {
-        String statusCode = (String) execution.getVariable(NETWORK_SYNC_CODE);
-        String responseString = (String) execution.getVariable(NETWORK_SYNC_RESPONSE);
-        String errorMessage = "Error with Openstack Adapter Sync Request: StatusCode = " + statusCode + " Response = "
-                + responseString;
-        exceptionBuilder.buildAndThrowWorkflowException(execution, 7000, errorMessage, Components.OPENSTACK);
-    }
-}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasks.java
index e238a4fdd3..c64491f71a 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasks.java
@@ -55,7 +55,7 @@ public class NetworkAdapterUpdateTasks {
             UpdateNetworkRequest updateNetworkRequest = networkAdapterObjectMapper.createNetworkUpdateRequestMapper(
                     gBBInput.getRequestContext(), gBBInput.getCloudRegion(), gBBInput.getOrchContext(), serviceInstance,
                     l3Network, gBBInput.getUserInput(), gBBInput.getCustomer());
-            execution.setVariable("networkAdapterRequest", updateNetworkRequest);
+            execution.setVariable("networkAdapterRequest", updateNetworkRequest.toXmlString());
 
         } catch (Exception ex) {
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasksTest.java
index 00dfd4e236..60bed17447 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterCreateTasksTest.java
@@ -89,7 +89,7 @@ public class NetworkAdapterCreateTasksTest extends BaseTaskTest {
         networkAdapterCreateTasks.createNetwork(execution);
         verify(networkAdapterObjectMapper, times(1)).createNetworkRequestMapper(requestContext, cloudRegion,
                 orchestrationContext, serviceInstance, l3Network, userInput, cloudRegionPo, customer);
-        assertEquals(createNetworkRequest, execution.getVariable("networkAdapterRequest"));
+        assertEquals(createNetworkRequest.toXmlString(), execution.getVariable("networkAdapterRequest"));
     }
 
     @Test
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImplTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImplTest.java
new file mode 100644
index 0000000000..10cc09cdcc
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImplTest.java
@@ -0,0 +1,30 @@
+package org.onap.so.bpmn.infrastructure.adapter.network.tasks;
+
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+import static org.junit.Assert.assertNotNull;
+import javax.xml.bind.JAXBException;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.onap.so.FileUtil;
+import org.onap.so.adapters.nwrest.CreateNetworkResponse;
+import org.onap.so.bpmn.BaseTaskTest;
+
+public class NetworkAdapterImplTest extends BaseTaskTest {
+
+    @InjectMocks
+    private NetworkAdapterImpl networkAdapterImpl = new NetworkAdapterImpl();
+
+    private static final String RESPONSE =
+            FileUtil.readResourceFile("__files/BuildingBlocks/Network/createNetworkResponse.xml");
+
+    @Test
+    public void postProcessNetworkAdapter() throws JAXBException {
+        execution.setVariable("WorkflowResponse", RESPONSE);
+        networkAdapterImpl.postProcessNetworkAdapter(execution);
+        assertNotNull(execution.getVariable("createNetworkResponse"));
+        assertThat(networkAdapterImpl.unmarshalXml(RESPONSE, CreateNetworkResponse.class),
+                sameBeanAs(execution.getVariable("createNetworkResponse")));
+    }
+
+}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterRestV1Test.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterRestV1Test.java
deleted file mode 100644
index 67ce6bfbe9..0000000000
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterRestV1Test.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2018 Nokia.
- * ================================================================================
- * 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.onap.so.bpmn.infrastructure.adapter.network.tasks;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.xml.bind.JAXBException;
-import org.camunda.bpm.engine.delegate.BpmnError;
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.camunda.bpm.extension.mockito.delegate.DelegateExecutionFake;
-import org.glassfish.jersey.message.internal.OutboundJaxrsResponse;
-import org.glassfish.jersey.message.internal.OutboundMessageContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.onap.so.adapters.nwrest.CreateNetworkRequest;
-import org.onap.so.adapters.nwrest.CreateNetworkResponse;
-import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
-import org.onap.so.adapters.nwrest.DeleteNetworkResponse;
-import org.onap.so.adapters.nwrest.NetworkRequestCommon;
-import org.onap.so.adapters.nwrest.UpdateNetworkError;
-import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
-import org.onap.so.adapters.nwrest.UpdateNetworkResponse;
-import org.onap.so.client.exception.ExceptionBuilder;
-import org.onap.so.client.orchestration.NetworkAdapterResources;
-import org.onap.so.utils.Components;
-import org.onap.logging.filter.base.ONAPComponents;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-public class NetworkAdapterRestV1Test {
-
-    @Mock
-    private ExceptionBuilder exceptionBuilder;
-    @Mock
-    private NetworkAdapterResources networkAdapterResources;
-    @InjectMocks
-    private NetworkAdapterRestV1 networkAdapterRestV1Tasks;
-
-    private DelegateExecution delegateExecution;
-
-    private static final String CREATE_NETWORK_RESPONSE = "createNetworkResponse";
-    private static final String DELETE_NETWORK_RESPONSE = "deleteNetworkResponse";
-    private static final String CREATE_NETWORK_ERROR = "createNetworkError";
-    private static final String DELETE_NETWORK_ERROR = "deleteNetworkError";
-    private static final String NET_ID_FOR_CREATE_NETWORK_RESPONSE = "netIdForCreateNetworkResponse";
-    private static final String NET_ID_FOR_DELETE_NETWORK_RESPONSE = "netIdForDeleteNetworkResponse";
-    private static final String CREATE_NETWORK_ERROR_MESSAGE = "createNetErrorMessage";
-    private static final String DELETE_NETWORK_ERROR_MESSAGE = "deleteNetErrorMessage";
-
-    @Before
-    public void setup() {
-        initMocks(this);
-        delegateExecution = new DelegateExecutionFake();
-    }
-
-    @Test
-    public void testUnmarshalXml() throws JAXBException {
-        String xml =
-                "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><createNetworkResponse><messageId>ec37c121-e3ec-4697-8adf-2d7dca7044fc</messageId><networkCreated>true</networkCreated><networkFqdn>someNetworkFqdn</networkFqdn><networkId>991ec7bf-c9c4-4ac1-bb9c-4b61645bddb3</networkId><networkStackId>someStackId</networkStackId><neutronNetworkId>9c47521a-2916-4018-b2bc-71ab767497e3</neutronNetworkId><rollback><cloudId>someCloudId</cloudId><modelCustomizationUuid>b7171cdd-8b05-459b-80ef-2093150e8983</modelCustomizationUuid><msoRequest><requestId>90b32315-176e-4dab-bcf1-80eb97a1c4f4</requestId><serviceInstanceId>71e7db22-7907-4d78-8fcc-8d89d28e90be</serviceInstanceId></msoRequest><networkCreated>true</networkCreated><networkStackId>someStackId</networkStackId><networkType>SomeNetworkType</networkType><neutronNetworkId>9c47521a-2916-4018-b2bc-71ab767497e3</neutronNetworkId><tenantId>b60da4f71c1d4b35b8113d4eca6deaa1</tenantId></rollback><subnetMap><entry><key>6b381fa9-48ce-4e16-9978-d75309565bb6</key><value>bc1d5537-860b-4894-8eba-6faff41e648c</value></entry></subnetMap></createNetworkResponse>";
-        CreateNetworkResponse response =
-                (CreateNetworkResponse) new NetworkAdapterRestV1().unmarshalXml(xml, CreateNetworkResponse.class);
-        String returnedXml = response.toXmlString();
-        System.out.println(returnedXml);
-    }
-
-    @Test
-    public void testUnmarshalXmlUpdate() throws JAXBException {
-        UpdateNetworkResponse expectedResponse = new UpdateNetworkResponse();
-        expectedResponse.setMessageId("ec100bcc-2659-4aa4-b4d8-3255715c2a51");
-        expectedResponse.setNetworkId("80de31e3-cc78-4111-a9d3-5b92bf0a39eb");
-        Map<String, String> subnetMap = new HashMap<>();
-        subnetMap.put("95cd8437-25f1-4238-8720-cbfe7fa81476", "d8d16606-5d01-4822-b160-9a0d257303e0");
-        expectedResponse.setSubnetMap(subnetMap);
-        String xml =
-                "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><updateNetworkResponse><messageId>ec100bcc-2659-4aa4-b4d8-3255715c2a51</messageId><networkId>80de31e3-cc78-4111-a9d3-5b92bf0a39eb</networkId><subnetMap><entry><key>95cd8437-25f1-4238-8720-cbfe7fa81476</key><value>d8d16606-5d01-4822-b160-9a0d257303e0</value></entry></subnetMap></updateNetworkResponse>";
-        UpdateNetworkResponse response =
-                (UpdateNetworkResponse) new NetworkAdapterRestV1().unmarshalXml(xml, UpdateNetworkResponse.class);
-        assertThat(expectedResponse, sameBeanAs(response));
-    }
-
-    @Test
-    public void processCallbackTest() {
-        UpdateNetworkRequest updateNetworkRequest = new UpdateNetworkRequest();
-        UpdateNetworkResponse updateNetworkResponse = new UpdateNetworkResponse();
-        updateNetworkResponse.setMessageId("messageId");
-        updateNetworkResponse.setNetworkId("networkId");
-        delegateExecution.setVariable("networkAdapterRequest", updateNetworkRequest);
-        delegateExecution.setVariable("NetworkAResponse_MESSAGE", updateNetworkResponse.toXmlString());
-
-        networkAdapterRestV1Tasks.processCallback(delegateExecution);
-
-        assertThat(updateNetworkResponse, sameBeanAs(delegateExecution.getVariable("updateNetworkResponse")));
-    }
-
-    @Test
-    public void processCallbackErrorTest() {
-        UpdateNetworkRequest updateNetworkRequest = new UpdateNetworkRequest();
-        UpdateNetworkError updateNetworkResponse = new UpdateNetworkError();
-        updateNetworkResponse.setMessageId("messageId");
-        updateNetworkResponse.setMessage("test error message");
-        delegateExecution.setVariable("networkAdapterRequest", updateNetworkRequest);
-        delegateExecution.setVariable("NetworkAResponse_MESSAGE", updateNetworkResponse.toXmlString());
-
-        doThrow(new BpmnError("MSOWorkflowException")).when(exceptionBuilder).buildAndThrowWorkflowException(
-                any(DelegateExecution.class), anyInt(), any(String.class), any(ONAPComponents.class));
-
-        try {
-            networkAdapterRestV1Tasks.processCallback(delegateExecution);
-        } catch (BpmnError be) {
-            assertEquals("MSOWorkflowException", be.getErrorCode());
-        }
-        assertNull(delegateExecution.getVariable("updateNetworkResponse"));
-        verify(exceptionBuilder, times(1)).buildAndThrowWorkflowException(any(DelegateExecution.class), eq(7000),
-                eq("test error message"), eq(Components.OPENSTACK));
-    }
-
-    @Test
-    public void processCallback_createNetworkResponse() {
-        delegateExecution.setVariable("networkAdapterRequest", new CreateNetworkRequest());
-        delegateExecution.setVariable("NetworkAResponse_MESSAGE",
-                createNetworkResponse(CREATE_NETWORK_RESPONSE, NET_ID_FOR_CREATE_NETWORK_RESPONSE));
-        networkAdapterRestV1Tasks.processCallback(delegateExecution);
-
-        Object result = delegateExecution.getVariable("createNetworkResponse");
-        assertTrue(result instanceof CreateNetworkResponse);
-        CreateNetworkResponse createNetworkResponse = (CreateNetworkResponse) result;
-        assertEquals(createNetworkResponse.getNetworkId(), NET_ID_FOR_CREATE_NETWORK_RESPONSE);
-    }
-
-    @Test
-    public void processCallback_deleteNetworkResponse() {
-        delegateExecution.setVariable("networkAdapterRequest", new DeleteNetworkRequest());
-        delegateExecution.setVariable("NetworkAResponse_MESSAGE",
-                createNetworkResponse(DELETE_NETWORK_RESPONSE, NET_ID_FOR_DELETE_NETWORK_RESPONSE));
-        networkAdapterRestV1Tasks.processCallback(delegateExecution);
-
-        Object result = delegateExecution.getVariable("deleteNetworkResponse");
-        assertTrue(result instanceof DeleteNetworkResponse);
-        DeleteNetworkResponse deleteNetworkResponse = (DeleteNetworkResponse) result;
-        assertEquals(deleteNetworkResponse.getNetworkId(), NET_ID_FOR_DELETE_NETWORK_RESPONSE);
-    }
-
-    @Test
-    public void processCallback_createNetworkError() {
-        try {
-            delegateExecution.setVariable("networkAdapterRequest", new CreateNetworkRequest());
-            delegateExecution.setVariable("NetworkAResponse_MESSAGE",
-                    createNetworkError(CREATE_NETWORK_ERROR, CREATE_NETWORK_ERROR_MESSAGE));
-            networkAdapterRestV1Tasks.processCallback(delegateExecution);
-        } catch (Exception e) {
-            assertEquals(e.getMessage(), CREATE_NETWORK_ERROR_MESSAGE);
-        }
-    }
-
-    @Test
-    public void processCallback_deleteNetworkError() {
-        try {
-            delegateExecution.setVariable("networkAdapterRequest", new DeleteNetworkRequest());
-            delegateExecution.setVariable("NetworkAResponse_MESSAGE",
-                    createNetworkError(DELETE_NETWORK_ERROR, DELETE_NETWORK_ERROR_MESSAGE));
-            networkAdapterRestV1Tasks.processCallback(delegateExecution);
-        } catch (Exception e) {
-            assertEquals(e.getMessage(), DELETE_NETWORK_ERROR_MESSAGE);
-        }
-    }
-
-    @Test
-    public void callNetworkAdapter_CreateNetworkRequestSuccess() throws Exception {
-        // given
-        String messageId = "createNetReqMessageId";
-        CreateNetworkRequest createNetworkRequest = new CreateNetworkRequest();
-        createNetworkRequest.setMessageId(messageId);
-        delegateExecution.setVariable("networkAdapterRequest", createNetworkRequest);
-        Status status = Status.OK;
-        String responseEntity = "createNetworkResponse";
-        Optional<Response> response = Optional.of(createResponse(status, responseEntity));
-        when(networkAdapterResources.createNetworkAsync(createNetworkRequest)).thenReturn(response);
-        // when
-        networkAdapterRestV1Tasks.callNetworkAdapter(delegateExecution);
-        // then
-        verifyExecutionContent(status, responseEntity, messageId);
-    }
-
-    @Test
-    public void callNetworkAdapter_DeleteNetworkRequestSuccess() throws Exception {
-        // given
-        String messageId = "DeleteNetReqMessageId";
-        DeleteNetworkRequest deleteNetworkRequest = new DeleteNetworkRequest();
-        deleteNetworkRequest.setMessageId(messageId);
-        delegateExecution.setVariable("networkAdapterRequest", deleteNetworkRequest);
-        Status status = Status.OK;
-        String responseEntity = "deleteNetworkResponse";
-        Optional<Response> response = Optional.of(createResponse(status, responseEntity));
-        when(networkAdapterResources.deleteNetworkAsync(deleteNetworkRequest)).thenReturn(response);
-        // when
-        networkAdapterRestV1Tasks.callNetworkAdapter(delegateExecution);
-        // then
-        verifyExecutionContent(status, responseEntity, messageId);
-    }
-
-    @Test
-    public void callNetworkAdapter_UpdateNetworkRequestSuccess() throws Exception {
-        // given
-        String messageId = "UpdateNetReqMessageId";
-        UpdateNetworkRequest updateNetworkRequest = new UpdateNetworkRequest();
-        updateNetworkRequest.setMessageId(messageId);
-        delegateExecution.setVariable("networkAdapterRequest", updateNetworkRequest);
-        Status status = Status.OK;
-        String responseEntity = "updateNetworkResponse";
-        Optional<Response> response = Optional.of(createResponse(status, responseEntity));
-        when(networkAdapterResources.updateNetworkAsync(updateNetworkRequest)).thenReturn(response);
-        // when
-        networkAdapterRestV1Tasks.callNetworkAdapter(delegateExecution);
-        // then
-        verifyExecutionContent(status, responseEntity, messageId);
-    }
-
-    @Test
-    public void callNetworkAdapterError_networkAdapterRequestIsNull() {
-        // when
-        networkAdapterRestV1Tasks.callNetworkAdapter(delegateExecution);
-        // then
-        verify(exceptionBuilder, times(1)).buildAndThrowWorkflowException(any(DelegateExecution.class), eq(7000),
-                any(Exception.class), eq(ONAPComponents.SO));
-    }
-
-    @Test
-    public void callNetworkAdapterError_noResponse() throws Exception {
-        // given
-        String messageId = "UpdateNetReqMessageId";
-        UpdateNetworkRequest updateNetworkRequest = new UpdateNetworkRequest();
-        updateNetworkRequest.setMessageId(messageId);
-        delegateExecution.setVariable("networkAdapterRequest", updateNetworkRequest);
-        when(networkAdapterResources.updateNetworkAsync(updateNetworkRequest)).thenReturn(Optional.empty());
-        // when
-        networkAdapterRestV1Tasks.callNetworkAdapter(delegateExecution);
-        // then
-        verify(exceptionBuilder, times(1)).buildAndThrowWorkflowException(any(DelegateExecution.class), eq(7000),
-                any(Exception.class), eq(ONAPComponents.SO));
-    }
-
-    private void verifyExecutionContent(Status status, String responseEntity, String messageId) {
-        assertEquals(delegateExecution.getVariable("NETWORKREST_networkAdapterStatusCode"),
-                Integer.toString(status.getStatusCode()));
-        assertEquals(delegateExecution.getVariable("NETWORKREST_networkAdapterResponse"), responseEntity);
-        assertEquals(delegateExecution.getVariable("NetworkAResponse_CORRELATOR"), messageId);
-    }
-
-    private Response createResponse(Status status, String responseEntity) {
-        OutboundMessageContext outboundMessageContext = new OutboundMessageContext();
-        outboundMessageContext.setEntity(responseEntity);
-        return new OutboundJaxrsResponse(status, outboundMessageContext);
-    }
-
-    private String createNetworkResponse(String networkResponseType, String networkId) {
-
-        return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><" + networkResponseType + "><networkId>"
-                + networkId + "</networkId></" + networkResponseType + ">";
-    }
-
-    private String createNetworkError(String networkErrorType, String message) {
-
-        return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><" + networkErrorType + "><message>"
-                + message + "</message></" + networkErrorType + ">";
-    }
-
-}
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasksTest.java
index af97c3d038..64a315ad4d 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterUpdateTasksTest.java
@@ -95,7 +95,7 @@ public class NetworkAdapterUpdateTasksTest extends BaseTaskTest {
         networkAdapterUpdateTasks.updateNetwork(execution);
         verify(networkAdapterObjectMapper, times(1)).createNetworkUpdateRequestMapper(requestContext, cloudRegion,
                 orchestrationContext, serviceInstance, network, userInput, customer);
-        assertEquals(updateNetworkRequest, execution.getVariable("networkAdapterRequest"));
+        assertEquals(updateNetworkRequest.toXmlString(), execution.getVariable("networkAdapterRequest"));
     }