219 files changed, 8991 insertions, 4766 deletions
diff --git a/bpmn/MSOCockpit/pom.xml b/bpmn/MSOCockpit/pom.xml
index be3f9dafb5..bb54fe66c7 100644
--- a/bpmn/MSOCockpit/pom.xml
+++ b/bpmn/MSOCockpit/pom.xml
@@ -51,11 +51,11 @@
 			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>org.openecomp.so</groupId>
 			<artifactId>cockpit-urnmap-plugin</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCoreBPMN</artifactId>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index a54ff91f55..c0e657479f 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -1,604 +1,510 @@
-<?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.openecomp.so</groupId>
-		<artifactId>bpmn</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>MSOCommonBPMN</artifactId>
-	<name>MSOCommonBPMN</name>
-	<packaging>war</packaging>
-
-	<properties>
-		<camunda.version>7.6.0</camunda.version>
-		<spring.version>4.3.2.RELEASE</spring.version>
-		<httpclient.version>3.1</httpclient.version>
-		<jax.ws.rs>2.0.1</jax.ws.rs>
-		<jackson.version>1.1.1</jackson.version>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-	</properties>
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>test-compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>testCompile</goal>
-						</goals>
-						<configuration>
-							<skip>false</skip>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<!-- Build MSOCommonBPMN-${version}.jar -->
-						<id>default-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<excludes>
-								<exclude>org/openecomp/mso/bpmn/common/MSOCommonApplication.class</exclude>
-								<!-- <exclude>META-INF/</exclude> -->
-							</excludes>
-						</configuration>
-					</execution>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-						<configuration>
-							<forceCreation>true</forceCreation>
-							<skip>false</skip>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
-									<type>jar</type>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.cxf</groupId>
-				<artifactId>cxf-codegen-plugin</artifactId>
-				<version>2.5.2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.8</version>
-				<configuration>
-					<additionalProjectnatures>
-						<projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>
-					</additionalProjectnatures>
-					<sourceIncludes>
-						<sourceInclude>**/*.groovy</sourceInclude>
-					</sourceIncludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<phase>compile</phase>
-						<configuration>
-							<tasks>
-								<mkdir dir="${basedir}/src/main/groovy" />
-								<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
-									<classpath refid="maven.compile.classpath" />
-								</taskdef>
-								<mkdir dir="${project.build.outputDirectory}" />
-								<groovyc destdir="${project.build.outputDirectory}"
-									srcdir="${basedir}/src/main/groovy/" listfiles="true">
-									<classpath refid="maven.compile.classpath" />
-								</groovyc>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<phase>test-compile</phase>
-						<configuration>
-							<tasks>
-								<mkdir dir="${basedir}/src/test/groovy" />
-								<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
-									<classpath refid="maven.test.classpath" />
-								</taskdef>
-								<mkdir dir="${project.build.testOutputDirectory}" />
-								<groovyc destdir="${project.build.testOutputDirectory}"
-									srcdir="${basedir}/src/test/groovy/" listfiles="true">
-									<classpath refid="maven.test.classpath" />
-								</groovyc>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jaxb2-maven-plugin</artifactId>
-				<version>2.3</version>
-				<executions>
-					<execution>
-						<id>xjc</id>
-						<goals>
-							<goal>xjc</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<extension>true</extension>
-					<arguments>
-						<argument>-Xannotate</argument>
-						<argument>-Xcommons-lang</argument>
-					</arguments>
-					<sources>
-						<source>src/main/resources/xsd</source>
-					</sources>
-					<xjbSources>
-						<xjbSource>src/main/resources/xjb</xjbSource>
-					</xjbSources>
-					<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.jvnet.jaxb2_commons</groupId>
-						<artifactId>jaxb2-basics-annotate</artifactId>
-						<version>0.6.4</version>
-					</dependency>
-					<dependency>
-						<groupId>org.jvnet.jaxb2_commons</groupId>
-						<artifactId>jaxb2-commons-lang</artifactId>
-						<version>2.3</version>
-					</dependency>
-					<dependency>
-						<groupId>com.sun.codemodel</groupId>
-						<artifactId>codemodel</artifactId>
-						<version>2.6</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-antrun-plugin
-										</artifactId>
-										<versionRange>
-											[1.3,)
-										</versionRange>
-										<goals>
-											<goal>run</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-
-
-			</plugins>
-		</pluginManagement>
-	</build>
-
-	<dependencies>
-
-		<dependency>
-			<!-- process engine, in compile scope to include it in the war file -->
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine</artifactId>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!-- Using the `DefaultEjbProcessApplication` result in: `java.sql.SQLException: 
-			You cannot commit during a managed transaction!` -->
-		<dependency>
-			<!-- CDI integration, needs to be included in WAR, otherwise CDI can not 
-				work correctly -->
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine-cdi</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.camunda.bpm.extension</groupId>
-			<artifactId>camunda-bpm-assert</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<!-- Spin dataformat support, in compile scope to include it in the war 
-			file -->
-		<dependency>
-			<groupId>org.camunda.spin</groupId>
-			<artifactId>camunda-spin-dataformat-all</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine-plugin-spin</artifactId>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine-plugin-connect</artifactId>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<!-- Bootstrap for styling via Webjars project -->
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>2.3.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-client</artifactId>
-			<version>3.0.19.Final</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>httpclient</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<!-- Needed for InMemoryH2Test -->
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.uuid</groupId>
-			<artifactId>java-uuid-generator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-all</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.so</groupId>
-			<artifactId>MSOCoreBPMN</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<!-- unit test utilities -->
-			<groupId>org.openecomp.so</groupId>
-			<artifactId>MSOCoreBPMN</artifactId>
-			<version>${project.version}</version>
-			<classifier>tests</classifier>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-            <groupId>org.openecomp.so</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0</version>
-		</dependency>
-		<!-- for encoding the url the same way A&AI does -->
-		<dependency>
-			<groupId>org.openecomp.so</groupId>
-			<artifactId>MSOMockServer</artifactId>
-			<version>${project.version}</version>
-			<classifier>classes</classifier>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.so</groupId>
-			<artifactId>MSORESTClient</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock</artifactId>
-			<version>1.56</version>
-			<scope>test</scope>
-			<classifier>standalone</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mortbay.jetty</groupId>
-					<artifactId>jetty</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-annotations</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>httpclient</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.skyscreamer</groupId>
-					<artifactId>jsonassert</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xmlunit</groupId>
-					<artifactId>xmlunit</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.jayway.jsonpath</groupId>
-					<artifactId>json-path</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>net.sf.jopt-simple</groupId>
-					<artifactId>jopt-simple</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine-spring</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>4.3.2.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.7</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.8.7</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>2.4.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.6.12</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>${httpclient.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.appc.client</groupId>
-			<artifactId>client-kit</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.appc.client</groupId>
-			<artifactId>client-lib</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.onap.aai.aai-common</groupId>
-			<artifactId>aai-schema</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
-		</dependency>
-		
-		
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.7</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.openpojo</groupId>
-			<artifactId>openpojo</artifactId>
-			<version>0.8.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jayway.jsonpath</groupId>
-			<artifactId>json-path</artifactId>
-			<version>2.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>${httpclient.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>${jax.ws.rs}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.openecomp.appc.client</groupId>
-			<artifactId>client-kit</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.appc.client</groupId>
-			<artifactId>client-lib</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.7</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.7</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>2.4.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.6.12</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-		</dependency>
-		<dependency>
-			<groupId>com.att.nsa</groupId>
-			<artifactId>dmaapClient</artifactId>
-			<version>0.2.12</version>
-		</dependency>
-		<dependency>
-			<!-- Optional Plugin for Camunda BPM Workbench -->
-			<groupId>org.camunda.bpm.workbench</groupId>
-			<artifactId>camunda-workbench-dist-embeddable</artifactId>
-			<version>1.0.0-alpha8</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-       <groupId>org.jboss.resteasy</groupId>
-       <artifactId>resteasy-jackson2-provider</artifactId>
-       <version>3.0.11.Final</version>
-    </dependency>
-				
-	</dependencies>
-</project>
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.openecomp.so</groupId>
+		<artifactId>bpmn</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>MSOCommonBPMN</artifactId>
+	<name>MSOCommonBPMN</name>
+	<packaging>jar</packaging>
+
+	<properties>
+		<camunda.version>7.6.0</camunda.version>
+		<spring.version>4.3.2.RELEASE</spring.version>
+		<httpclient.version>3.1</httpclient.version>
+		<jax.ws.rs>2.0.1</jax.ws.rs>
+		<jackson.version>1.1.1</jackson.version>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>test-compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+						<configuration>
+							<skip>false</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+						<configuration>
+							<skip>false</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.cxf</groupId>
+				<artifactId>cxf-codegen-plugin</artifactId>
+				<version>2.5.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<additionalProjectnatures>
+						<projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>
+					</additionalProjectnatures>
+					<sourceIncludes>
+						<sourceInclude>**/*.groovy</sourceInclude>
+					</sourceIncludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>compile</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="${basedir}/src/main/groovy" />
+								<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
+									<classpath refid="maven.compile.classpath" />
+								</taskdef>
+								<mkdir dir="${project.build.outputDirectory}" />
+								<groovyc destdir="${project.build.outputDirectory}"
+									srcdir="${basedir}/src/main/groovy/" listfiles="true">
+									<classpath refid="maven.compile.classpath" />
+								</groovyc>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>test-compile</id>
+						<phase>test-compile</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="${basedir}/src/test/groovy" />
+								<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc">
+									<classpath refid="maven.test.classpath" />
+								</taskdef>
+								<mkdir dir="${project.build.testOutputDirectory}" />
+								<groovyc destdir="${project.build.testOutputDirectory}"
+									srcdir="${basedir}/src/test/groovy/" listfiles="true">
+									<classpath refid="maven.test.classpath" />
+								</groovyc>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxb2-maven-plugin</artifactId>
+				<version>2.3</version>
+				<executions>
+					<execution>
+						<id>xjc</id>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<extension>true</extension>
+					<arguments>
+						<argument>-Xannotate</argument>
+						<argument>-Xcommons-lang</argument>
+					</arguments>
+					<sources>
+						<source>src/main/resources/xsd</source>
+					</sources>
+					<xjbSources>
+						<xjbSource>src/main/resources/xjb</xjbSource>
+					</xjbSources>
+					<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.jvnet.jaxb2_commons</groupId>
+						<artifactId>jaxb2-basics-annotate</artifactId>
+						<version>0.6.4</version>
+					</dependency>
+					<dependency>
+						<groupId>org.jvnet.jaxb2_commons</groupId>
+						<artifactId>jaxb2-commons-lang</artifactId>
+						<version>2.3</version>
+					</dependency>
+					<dependency>
+						<groupId>com.sun.codemodel</groupId>
+						<artifactId>codemodel</artifactId>
+						<version>2.6</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-antrun-plugin
+										</artifactId>
+										<versionRange>
+											[1.3,)
+										</versionRange>
+										<goals>
+											<goal>run</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.camunda.bpm</groupId>
+			<artifactId>camunda-engine</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.camunda.bpm</groupId>
+			<artifactId>camunda-engine-cdi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.camunda.bpm.extension</groupId>
+			<artifactId>camunda-bpm-assert</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.camunda.spin</groupId>
+			<artifactId>camunda-spin-dataformat-all</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.camunda.bpm</groupId>
+			<artifactId>camunda-engine-plugin-spin</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.camunda.bpm</groupId>
+			<artifactId>camunda-engine-plugin-connect</artifactId>
+		</dependency>
+		<dependency>
+			<!-- Bootstrap for styling via Webjars project -->
+			<groupId>org.webjars</groupId>
+			<artifactId>bootstrap</artifactId>
+			<version>2.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-client</artifactId>
+			<version>3.0.19.Final</version>
+		</dependency>
+		<dependency>
+			<!-- Needed for InMemoryH2Test -->
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.uuid</groupId>
+			<artifactId>java-uuid-generator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.so</groupId>
+			<artifactId>MSOCoreBPMN</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<!-- unit test utilities -->
+			<groupId>org.openecomp.so</groupId>
+			<artifactId>MSOCoreBPMN</artifactId>
+			<version>${project.version}</version>
+			<classifier>tests</classifier>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.so</groupId>
+			<artifactId>common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.so</groupId>
+			<artifactId>MSORESTClient</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.tomakehurst</groupId>
+			<artifactId>wiremock</artifactId>
+			<version>1.56</version>
+			<scope>test</scope>
+			<classifier>standalone</classifier>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>jetty</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-databind</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>httpclient</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.skyscreamer</groupId>
+					<artifactId>jsonassert</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xmlunit</groupId>
+					<artifactId>xmlunit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.jayway.jsonpath</groupId>
+					<artifactId>json-path</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>net.sf.jopt-simple</groupId>
+					<artifactId>jopt-simple</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.camunda.bpm</groupId>
+			<artifactId>camunda-engine-spring</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>4.3.2.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>2.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>1.6.12</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>${httpclient.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.appc.client</groupId>
+			<artifactId>client-kit</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.appc.client</groupId>
+			<artifactId>client-lib</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.aai.aai-common</groupId>
+			<artifactId>aai-schema</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>com.openpojo</groupId>
+			<artifactId>openpojo</artifactId>
+			<version>0.8.6</version>
+		</dependency>
+		<dependency>
+			<groupId>com.jayway.jsonpath</groupId>
+			<artifactId>json-path</artifactId>
+			<version>2.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>${httpclient.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>${jax.ws.rs}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.appc.client</groupId>
+			<artifactId>client-kit</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.appc.client</groupId>
+			<artifactId>client-lib</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>2.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>1.6.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+		</dependency>
+		<dependency>
+			<groupId>com.att.nsa</groupId>
+			<artifactId>dmaapClient</artifactId>
+			<version>0.2.12</version>
+		</dependency>
+		<dependency>
+			<!-- Optional Plugin for Camunda BPM Workbench -->
+			<groupId>org.camunda.bpm.workbench</groupId>
+			<artifactId>camunda-workbench-dist-embeddable</artifactId>
+			<version>1.0.0-alpha8</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-jackson2-provider</artifactId>
+			<version>3.0.11.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>22.0</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/Homing.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/Homing.groovy
index dcbb73c7db..0abab94597 100755
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/Homing.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/Homing.groovy
@@ -1,5 +1,21 @@
 /*
- * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
+ * ============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.openecomp.mso.bpmn.common.scripts
 
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy
index cd5ae79bd3..06992455a2 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy
@@ -59,6 +59,21 @@ class MsoUtils {
 		}
 		return nodes
 	}
+	/**
+	 * Note: this uses XmlParser instead of XmlSlurper, thus it is not as
+	 * efficient because it instantiates the whole DOM tree.
+	 * @param xmlInput
+	 * @param element
+	 * @return a list of Nodes, or {@code null} if <i>xmlInput</i> is {@code null}
+	 */
+	def getMultNodeObjects(xmlInput, element){
+		def nodes=null
+		if(xmlInput!=null){
+			def xml= new XmlParser().parseText(xmlInput)
+			nodes = xml.'**'.findAll{ node-> node.name() == element }
+		}
+		return nodes
+	}
 	def getNodeText1(xmlInput,element){
 		def rtn=null
 		if(xmlInput!=null){
@@ -283,7 +298,7 @@ class MsoUtils {
 	def log(logmode,logtxt,isDebugLogEnabled="false"){
 		MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
 		if ("INFO"==logmode) {
-			msoLogger.info(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, logtxt);
+			msoLogger.info(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, logtxt, "BPMN", MsoLogger.getServiceName());
 		} else if ("WARN"==logmode) {
 			// to see the warning text displayed in the log entry, the text must also be passed as arg0 (2nd argument) to invoke the correct MsoLogger warn() method
 			msoLogger.warn (MessageEnum.BPMN_GENERAL_WARNING, logtxt, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, logtxt);
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
index b35616680b..437d592bb6 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.*
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution
 import org.openecomp.mso.bpmn.core.WorkflowException
-import org.openecomp.mso.bpmn.core.json.JsonUtils;
+import org.openecomp.mso.bpmn.core.json.JsonUtils
 import org.springframework.web.util.UriUtils
 
 
@@ -675,12 +675,12 @@ class SDNCAdapterUtils {
 						   <service-information>
 						      <service-id>${serviceId}</service-id>
 						      <subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-							  <ecomp-model-information>
+							  <onap-model-information>
 								   <model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>
 								   <model-uuid>${serviceModelUuid}</model-uuid>
 								   <model-version>${serviceModelVersion}</model-version>
 								   <model-name>${serviceModelName}</model-name>
-                              </ecomp-model-information>
+                              </onap-model-information>
 						      <service-instance-id>${serviceInstanceId}</service-instance-id>
 						      <global-customer-id>${globalCustomerId}</global-customer-id>
 						      <subscriber-name>${subscriberName}</subscriber-name>
@@ -688,13 +688,13 @@ class SDNCAdapterUtils {
 						   <network-information>
 						      <network-id>${networkId}</network-id>
 						      <network-type>${networkType}</network-type>
-							  <ecomp-model-information>
+							  <onap-model-information>
 								   <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
 								   <model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>
 								   <model-uuid>${modelUuid}</model-uuid>
 								   <model-version>${modelVersion}</model-version>
 								   <model-name>${modelName}</model-name>
-							  </ecomp-model-information>
+							  </onap-model-information>
 						   </network-information>
 						   <network-request-input>
 						     <network-name>${networkName}</network-name>
@@ -730,13 +730,8 @@ class SDNCAdapterUtils {
 					taskProcessor.utils.log("DEBUG", response + ' is empty');
 					exceptionUtil.buildAndThrowWorkflowException(execution, 500, "SDNCAdapter Workflow Response is Empty")
 				}else{
-
 					// we need to peer into the request data for error
-					def String sdncAdapterWorkflowResponse = taskProcessor.utils.getNodeXml(response, 'response-data', false)
-					def String decodedXml = decodeXML(sdncAdapterWorkflowResponse).replace('<?xml version="1.0" encoding="UTF-8"?>', "")
-
-					// change '&' to "&amp; (if present as data, ex: subscriber-name = 'FOUR SEASONS HEATING & COOLING_8310006378683'
-					decodedXml = decodedXml.replace("&", "&amp;")
+					def String decodedXml = taskProcessor.utils.getNodeText1(response, "RequestData")
 
 					taskProcessor.utils.log("DEBUG","decodedXml:\n" + decodedXml, isDebugLogEnabled)
 
@@ -745,12 +740,14 @@ class SDNCAdapterUtils {
 
 					try{
 						if (taskProcessor.utils.nodeExists(decodedXml, "response-message")) {
-							requestDataResponseMessage = taskProcessor.utils.getNodeText(decodedXml, "response-message")
-						} else if (taskProcessor.utils.nodeExists(decodedXml, "ResponseMessage")) {
-							requestDataResponseMessage = taskProcessor.utils.getNodeText(decodedXml, "ResponseMessage")
+							requestDataResponseMessage = taskProcessor.utils.getNodeText1(decodedXml, "response-message")
+							
+							// note: ResponseMessage appears within "response", not "decodedXml"
+						} else if (taskProcessor.utils.nodeExists(response, "ResponseMessage")) {
+							requestDataResponseMessage = taskProcessor.utils.getNodeText1(response, "ResponseMessage")
 						}
 					}catch(Exception e){
-						taskProcessor.utils.log("DEBUG", 'Error caught while decoding resposne ' + e.getMessage(), isDebugLogEnabled)
+						taskProcessor.utils.log("DEBUG", 'Error caught while decoding response ' + e.getMessage(), isDebugLogEnabled)
 					}
 
 					if(taskProcessor.utils.nodeExists(decodedXml, "response-code")) {
@@ -761,18 +758,20 @@ class SDNCAdapterUtils {
 							taskProcessor.utils.log("DEBUG","response-code node is empty", isDebugLogEnabled)
 							requestDataResponseCode = 0
 						}else{
-							requestDataResponseCode  = code.toInteger()
+							requestDataResponseCode  = code as Integer
 							taskProcessor.utils.log("DEBUG","response-code is: " + requestDataResponseCode, isDebugLogEnabled)
 						}
-					}else if(taskProcessor.utils.nodeExists(decodedXml, "ResponseCode")){
+						
+						// note: ResponseCode appears within "response", not "decodedXml"
+					}else if(taskProcessor.utils.nodeExists(response, "ResponseCode")){
 						taskProcessor.utils.log("DEBUG","ResponseCode node Exist ", isDebugLogEnabled)
-						String code = taskProcessor.utils.getNodeText1(decodedXml, "ResponseCode")
+						String code = taskProcessor.utils.getNodeText1(response, "ResponseCode")
 						if(code.isEmpty() || code.equals("")){
 							// if ResponseCode blank then Success
 							taskProcessor.utils.log("DEBUG","ResponseCode node is empty", isDebugLogEnabled)
 							requestDataResponseCode = 0
 						}else{
-							requestDataResponseCode  = code.toInteger()
+							requestDataResponseCode  = code as Integer
 							taskProcessor.utils.log("DEBUG","ResponseCode is: " + requestDataResponseCode, isDebugLogEnabled)
 						}
 					}else{
@@ -952,13 +951,13 @@ class SDNCAdapterUtils {
 		}		
 		String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName")
 		String ecompModelInformation =
-				"""<ecomp-model-information>
+				"""<onap-model-information>
 						<model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
 						<model-uuid>${modelUuid}</model-uuid>
 						${modelCustomizationString}
 						<model-version>${modelVersion}</model-version>
 						<model-name>${modelName}</model-name>
-				</ecomp-model-information>"""
+				</onap-model-information>"""
 
 		return ecompModelInformation		
 	} 
@@ -975,4 +974,4 @@ class SDNCAdapterUtils {
 	
 	
 
-}
-\ No newline at end of file
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/MSOCommonApplication.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/MSOCommonApplication.java
deleted file mode 100644
index 3e8fd6ee05..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/MSOCommonApplication.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.openecomp.mso.bpmn.common;
-/*-
- * ============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=========================================================
- */
-
-
-
-import java.util.List;
-
-import org.camunda.bpm.application.PostDeploy;
-import org.camunda.bpm.application.PreUndeploy;
-import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.ProcessApplicationInfo;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
-import org.camunda.bpm.engine.ProcessEngine;
-
-import org.openecomp.mso.logger.MsoLogger;
-
-/**
- * @since Version 1.0
- *
- */
-@ProcessApplication(name="MSO Common Application", deploymentDescriptors={"../processes.xml"})
-public class MSOCommonApplication extends ServletProcessApplication {
-	
-	private MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
-	
-	@PostDeploy
-	public void postDeploy(ProcessEngine processEngineInstance) {
-		long startTime = System.currentTimeMillis();
-		
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Post deployment complete...");		
-	}
-	
-	@PreUndeploy
-	public void cleanup(ProcessEngine processEngine, ProcessApplicationInfo processApplicationInfo, List<ProcessEngine> processEngines) {
-		long startTime = System.currentTimeMillis();
-		
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Pre Undeploy complete...");	
-		
-	}
-	
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
index 72f8810655..c3912b48bc 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/MsoRequest.java
@@ -1,114 +1,115 @@
-/*-
- * ============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.openecomp.mso.bpmn.common.adapter.vnf;
-
-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;
-    }
-    
-    public String toString() {
-    	String request = "";
-    	request =
-       "<requestId>"+requestId+"</requestId>" + '\n' +
-       "<serviceInstanceId>"+serviceInstanceId+"</serviceInstanceId>";
-    	return request; 
-    }
-
-}
+/*-
+ * ============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.openecomp.mso.bpmn.common.adapter.vnf;
+
+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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder request = new StringBuilder();
+        request.append("<requestId>"+requestId+"</requestId>");
+        request.append('\n');
+        request.append("<serviceInstanceId>"+serviceInstanceId+"</serviceInstanceId>");
+        return request.toString();
+    }
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
index e938a25fab..787453ed28 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoHandler.java
@@ -28,9 +28,9 @@ public class CryptoHandler implements ICryptoHandler {
 	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
 
 	private static String msoKey = "aa3871669d893c7fb8abbcda31b88b4f";
-	//private static String msoAaiPwd = "mso0206";
 	private static String msoAaiEncryptedPwd = "C1FC4A39E16419DD41DFC1212843F440";
 
+        @Override
 	public String getMsoAaiPassword() {
 		try {
 			return CryptoUtils.decrypt(msoAaiEncryptedPwd, msoKey);
@@ -41,6 +41,7 @@ public class CryptoHandler implements ICryptoHandler {
 	}
 
 
+	@Override
 	public String encryptMsoPassword(String plainMsoPwd) {
 		try {
 			return CryptoUtils.encrypt(plainMsoPwd, msoKey);
@@ -50,7 +51,7 @@ public class CryptoHandler implements ICryptoHandler {
 		}
 	}
 
-
+	@Override
 	public String decryptMsoPassword(String encryptedPwd) {
 		try {
 			return CryptoUtils.decrypt(encryptedPwd, msoKey);
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
index b1d1085b43..d65311dfe8 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
@@ -25,9 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.camunda.bpm.BpmPlatform;
 import org.camunda.bpm.engine.MismatchingMessageCorrelationException;
-import org.camunda.bpm.engine.ProcessEngineServices;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.runtime.Execution;
 import org.camunda.bpm.engine.runtime.MessageCorrelationResult;
@@ -38,7 +36,7 @@ import org.openecomp.mso.logger.MsoLogger;
 /**
  * Abstract base class for callback services.
  */
-public abstract class AbstractCallbackService {
+public abstract class AbstractCallbackService extends ProcessEngineAwareService {
 	public static final long DEFAULT_TIMEOUT_SECONDS = 60;
 	public static final long FAST_POLL_DUR_SECONDS = 5;
 	public static final long FAST_POLL_INT_MS = 100;
@@ -46,8 +44,6 @@ public abstract class AbstractCallbackService {
 	
 	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
 
-	protected volatile ProcessEngineServices pes4junit = null;
-	
 	/**
 	 * Parameterized callback handler.
 	 */
@@ -368,16 +364,4 @@ public abstract class AbstractCallbackService {
 				+ ":" + execution.getId() + "]";
 		}
 	}
-	
-	protected ProcessEngineServices getProcessEngineServices() {
-		if (pes4junit == null) {
-			return BpmPlatform.getDefaultProcessEngine();
-		} else {
-			return pes4junit;
-		}
-	}
-
-	public void setProcessEngineServices4junit(ProcessEngineServices pes) {
-		pes4junit = pes;
-	}
-}
-\ No newline at end of file
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/ProcessEngineAwareService.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/ProcessEngineAwareService.java
new file mode 100644
index 0000000000..dbb6674a64
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/ProcessEngineAwareService.java
@@ -0,0 +1,64 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * 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.openecomp.mso.bpmn.common.workflow.service;
+
+import java.util.Optional;
+
+import org.camunda.bpm.engine.ProcessEngineServices;
+import org.camunda.bpm.engine.ProcessEngines;
+
+/**
+ * Base class for services that must be process-engine aware. The only
+ * process engine currently supported is the "default" process engine.
+ */
+public class ProcessEngineAwareService {
+	
+	private final String processEngineName = "default";
+	private volatile Optional<ProcessEngineServices> pes4junit = Optional.empty();
+	
+	/**
+	 * Gets the process engine name.
+	 * @return the process engine name
+	 */
+	public String getProcessEngineName() {
+		return processEngineName;
+	}
+
+	/**
+	 * Gets process engine services.
+	 * @return process engine services
+	 */
+	public ProcessEngineServices getProcessEngineServices() {
+		return pes4junit.orElse(ProcessEngines.getProcessEngine(
+				getProcessEngineName()));
+	}
+
+	/**
+	 * Allows a particular process engine to be specified, overriding the
+	 * usual process engine lookup by name.  Intended primarily for the
+	 * unit test environment.
+	 * @param pes process engine services
+	 */
+	public void setProcessEngineServices4junit(ProcessEngineServices pes) {
+		pes4junit = Optional.ofNullable(pes);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
index 2186e071f4..c5f0d02dff 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/SDNCAdapterCallbackServiceImpl.java
@@ -20,9 +20,6 @@
 
 package org.openecomp.mso.bpmn.common.workflow.service;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebResult;
@@ -30,16 +27,9 @@ import javax.jws.WebService;
 import javax.ws.rs.core.Context;
 import javax.xml.ws.WebServiceContext;
 
-import org.camunda.bpm.BpmPlatform;
-import org.camunda.bpm.engine.MismatchingMessageCorrelationException;
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.RuntimeService;
-import org.camunda.bpm.engine.runtime.ExecutionQuery;
 import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterCallbackRequest;
 import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCAdapterResponse;
 import org.openecomp.mso.bpmn.common.adapter.sdnc.SDNCCallbackAdapterPortType;
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
-import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoLogger;
 
 /**
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
index 4f621128f2..608adcf756 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncResource.java
@@ -53,7 +53,7 @@ import org.slf4j.MDC;
  * For asynchronous process - the activity may send a acknowledgement response and then proceed further on executing the process
  */
 @Path("/async")
-public abstract class WorkflowAsyncResource {
+public class WorkflowAsyncResource extends ProcessEngineAwareService {
 
 	private static final WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance();
 	protected Optional<ProcessEngineServices> pes4junit = Optional.empty();
@@ -261,7 +261,10 @@ public abstract class WorkflowAsyncResource {
 	}
 
 	private static String getKeyValueFromInputVariables(Map<String,Object> inputVariables, String key) {
-		if (inputVariables == null) return "";
+		if (inputVariables == null) {
+			return "";
+		}
+
 		return Objects.toString(inputVariables.get(key), "N/A");
 	}
 
@@ -271,19 +274,15 @@ public abstract class WorkflowAsyncResource {
 	}
 	
 	
-	protected abstract ProcessEngineServices getProcessEngineServices();
-	
-	public void setProcessEngineServices4junit(ProcessEngineServices pes) {
-		pes4junit = Optional.ofNullable(pes);
-	}
-
 	private static Map<String, Object> getInputVariables(VariableMapImpl variableMap) {
-		Map<String, Object> inputVariables = new HashMap<String,Object>();
+		Map<String, Object> inputVariables = new HashMap<>();
 		@SuppressWarnings("unchecked")
 		Map<String, Object> vMap = (Map<String, Object>) variableMap.get("variables");
-		for (String vName : vMap.keySet()) {
+		for (Map.Entry<String, Object> entry : vMap.entrySet()) {
+			String vName = entry.getKey();
+			Object value = entry.getValue();
 			@SuppressWarnings("unchecked")
-			Map<String, Object> valueMap = (Map<String,Object>)vMap.get(vName); // value, type
+			Map<String, Object> valueMap = (Map<String,Object>)value; // value, type
 			inputVariables.put(vName, valueMap.get("value"));
 		}
 		return inputVariables;
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java
index 05c0688b21..731b18db36 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContextHolder.java
@@ -1,188 +1,188 @@
-/*-
- * ============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.openecomp.mso.bpmn.common.workflow.service;
-
-import java.util.concurrent.DelayQueue;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.core.Response;
-
-import org.jboss.resteasy.spi.AsynchronousResponse;
-import org.slf4j.MDC;
-
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
-
-/**
- * Workflow Context Holder instance which can be accessed elsewhere either in groovy scripts or Java
- * @version 1.0
- *
- */
-public class WorkflowContextHolder {
-
-	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
-	private static final String logMarker = "[WORKFLOW-CONTEXT-HOLDER]";
-	private static WorkflowContextHolder instance = null;
-
-	/**
-	 * Delay Queue which holds workflow context holder objects
-	 */
-	private final DelayQueue<WorkflowContext> responseQueue = new DelayQueue<WorkflowContext>();
-	private final TimeoutThread timeoutThread = new TimeoutThread();
-
-	private WorkflowContextHolder() {
-		timeoutThread.start();
-	}
-
-	/**
-	 * Singleton holder which eliminates hot lock
-	 * Since the JVM synchronizes static method there is no synchronization needed for this method
-	 * @return
-	 */
-	public static synchronized WorkflowContextHolder getInstance() {
-		if (instance == null) {
-			instance = new WorkflowContextHolder();
-		}
-		return instance;
-	}
-	
-	public void put(WorkflowContext context) {
-		msoLogger.debug(logMarker + " Adding context to the queue: "
-			+ context.getRequestId());
-		responseQueue.put(context);
-	}
-	
-	public void remove(WorkflowContext context) {
-		msoLogger.debug(logMarker + " Removing context from the queue: "
-			+ context.getRequestId());
-		responseQueue.remove(context);
-	}
-	
-	public WorkflowContext getWorkflowContext(String requestId) {
-		// Note: DelayQueue interator is threadsafe
-		for (WorkflowContext context : responseQueue) {
-			if (requestId.equals(context.getRequestId())) {
-				msoLogger.debug("Found context for request id: " + requestId);
-				return context;
-			}
-		}
-
-		msoLogger.debug("Unable to find context for request id: " + requestId);
-		return null;
-	}
-	
-	/**
-	 * Builds the callback response object to respond to client
-	 * @param processKey
-	 * @param processInstanceId
-	 * @param requestId
-	 * @param callbackResponse
-	 * @return
-	 */
-	public Response processCallback(String processKey, String processInstanceId,
-			String requestId, WorkflowCallbackResponse callbackResponse) {
-		WorkflowResponse workflowResponse = new WorkflowResponse();
-		WorkflowContext workflowContext = getWorkflowContext(requestId);
-
-		if (workflowContext == null) {
-			msoLogger.debug("Unable to correlate workflow context for request id: " + requestId
-				+ ":processInstance Id:" + processInstanceId
-				+ ":process key:" + processKey);
-			workflowResponse.setMessage("Fail");
-			workflowResponse.setMessageCode(400);
-			workflowResponse.setResponse("Unable to correlate workflow context, bad request. Request Id: " + requestId);
-			return Response.serverError().entity(workflowResponse).build();
-		}
-
-		responseQueue.remove(workflowContext);
-
-		msoLogger.debug("Using callback response for request id: " + requestId);
-		workflowResponse.setResponse(callbackResponse.getResponse());
-		workflowResponse.setProcessInstanceID(processInstanceId);
-		workflowResponse.setMessageCode(callbackResponse.getStatusCode());
-		workflowResponse.setMessage(callbackResponse.getMessage());
-		sendWorkflowResponseToClient(processKey, workflowContext, workflowResponse);
-		return Response.ok().entity(workflowResponse).build();
-	}
-	
-	/**
-	 * Send the response to client asynchronously when invoked by the BPMN process
-	 * @param processKey
-	 * @param workflowContext
-	 * @param workflowResponse
-	 */
-	private void sendWorkflowResponseToClient(String processKey, WorkflowContext workflowContext,
-			WorkflowResponse workflowResponse) {
-		msoLogger.debug(logMarker + "Sending the response for request id: " + workflowContext.getRequestId());
-		recordEvents(processKey, workflowResponse, workflowContext.getStartTime());
-		Response response = Response.status(workflowResponse.getMessageCode()).entity(workflowResponse).build();
-		AsynchronousResponse asyncResp = workflowContext.getAsynchronousResponse();
-		asyncResp.setResponse(response);
-	}
-
-	/**
-	 * Timeout thread which monitors the delay queue for expired context and send timeout response
-	 * to client
-	 *
-	 * */
-	private class TimeoutThread extends Thread {
-		public void run() {
-			while (!isInterrupted()) {
-				try {
-					WorkflowContext requestObject = responseQueue.take();					
-					msoLogger.debug("Time remaining for request id: " + requestObject.getRequestId() + ":" + requestObject.getDelay(TimeUnit.MILLISECONDS));
-					msoLogger.debug("Preparing timeout response for " + requestObject.getProcessKey() + ":" + ":" + requestObject.getRequestId());
-					WorkflowResponse response = new WorkflowResponse();
-					response.setMessage("Fail");
-					response.setResponse("Request timedout, request id:" + requestObject.getRequestId());
-					//response.setProcessInstanceID(requestObject.getProcessInstance().getProcessInstanceId());
-					recordEvents(requestObject.getProcessKey(), response, requestObject.getStartTime());
-					response.setMessageCode(500);
-					Response result = Response.status(500).entity(response).build();
-					requestObject.getAsynchronousResponse().setResponse(result);
-					msoLogger.debug("Sending timeout response for request id:" + requestObject.getRequestId() + ":response:" + response);
-				} catch (InterruptedException e) {
-					break;
-				} catch (Exception e) {
-					msoLogger.debug("WorkflowContextHolder timeout thread caught exception: " + e);
-				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
-						MsoLogger.ErrorCode.UnknownError, "Error in WorkflowContextHolder timeout thread");
-				
-				}
-			}
-
-			msoLogger.debug("WorkflowContextHolder timeout thread interrupted, quitting");
-		}
-	}
-	
-	private static void recordEvents(String processKey, WorkflowResponse response,
-			long startTime) {
-
-		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
-				logMarker + response.getMessage() + " for processKey: "
-				+ processKey + " with response: " + response.getResponse(), "BPMN", MDC.get(processKey), null);
-		
-		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 
-				+ response.getMessage() + " for processKey: " 
-				+ processKey + " with response: " + response.getResponse());
-		
-	}
-}
+/*-
+ * ============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.openecomp.mso.bpmn.common.workflow.service;
+
+import java.util.concurrent.DelayQueue;
+import java.util.concurrent.TimeUnit;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.spi.AsynchronousResponse;
+import org.slf4j.MDC;
+
+import org.openecomp.mso.logger.MessageEnum;
+import org.openecomp.mso.logger.MsoLogger;
+
+/**
+ * Workflow Context Holder instance which can be accessed elsewhere either in groovy scripts or Java
+ * @version 1.0
+ *
+ */
+public class WorkflowContextHolder {
+
+	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private static final String logMarker = "[WORKFLOW-CONTEXT-HOLDER]";
+	private static WorkflowContextHolder instance = null;
+
+	/**
+	 * Delay Queue which holds workflow context holder objects
+	 */
+	private final DelayQueue<WorkflowContext> responseQueue = new DelayQueue<>();
+	private final TimeoutThread timeoutThread = new TimeoutThread();
+
+	private WorkflowContextHolder() {
+		timeoutThread.start();
+	}
+
+	/**
+	 * Singleton holder which eliminates hot lock
+	 * Since the JVM synchronizes static method there is no synchronization needed for this method
+	 * @return
+	 */
+	public static synchronized WorkflowContextHolder getInstance() {
+		if (instance == null) {
+			instance = new WorkflowContextHolder();
+		}
+		return instance;
+	}
+	
+	public void put(WorkflowContext context) {
+		msoLogger.debug(logMarker + " Adding context to the queue: "
+			+ context.getRequestId());
+		responseQueue.put(context);
+	}
+	
+	public void remove(WorkflowContext context) {
+		msoLogger.debug(logMarker + " Removing context from the queue: "
+			+ context.getRequestId());
+		responseQueue.remove(context);
+	}
+	
+	public WorkflowContext getWorkflowContext(String requestId) {
+		// Note: DelayQueue interator is threadsafe
+		for (WorkflowContext context : responseQueue) {
+			if (requestId.equals(context.getRequestId())) {
+				msoLogger.debug("Found context for request id: " + requestId);
+				return context;
+			}
+		}
+
+		msoLogger.debug("Unable to find context for request id: " + requestId);
+		return null;
+	}
+	
+	/**
+	 * Builds the callback response object to respond to client
+	 * @param processKey
+	 * @param processInstanceId
+	 * @param requestId
+	 * @param callbackResponse
+	 * @return
+	 */
+	public Response processCallback(String processKey, String processInstanceId,
+			String requestId, WorkflowCallbackResponse callbackResponse) {
+		WorkflowResponse workflowResponse = new WorkflowResponse();
+		WorkflowContext workflowContext = getWorkflowContext(requestId);
+
+		if (workflowContext == null) {
+			msoLogger.debug("Unable to correlate workflow context for request id: " + requestId
+				+ ":processInstance Id:" + processInstanceId
+				+ ":process key:" + processKey);
+			workflowResponse.setMessage("Fail");
+			workflowResponse.setMessageCode(400);
+			workflowResponse.setResponse("Unable to correlate workflow context, bad request. Request Id: " + requestId);
+			return Response.serverError().entity(workflowResponse).build();
+		}
+
+		responseQueue.remove(workflowContext);
+
+		msoLogger.debug("Using callback response for request id: " + requestId);
+		workflowResponse.setResponse(callbackResponse.getResponse());
+		workflowResponse.setProcessInstanceID(processInstanceId);
+		workflowResponse.setMessageCode(callbackResponse.getStatusCode());
+		workflowResponse.setMessage(callbackResponse.getMessage());
+		sendWorkflowResponseToClient(processKey, workflowContext, workflowResponse);
+		return Response.ok().entity(workflowResponse).build();
+	}
+	
+	/**
+	 * Send the response to client asynchronously when invoked by the BPMN process
+	 * @param processKey
+	 * @param workflowContext
+	 * @param workflowResponse
+	 */
+	private void sendWorkflowResponseToClient(String processKey, WorkflowContext workflowContext,
+			WorkflowResponse workflowResponse) {
+		msoLogger.debug(logMarker + "Sending the response for request id: " + workflowContext.getRequestId());
+		recordEvents(processKey, workflowResponse, workflowContext.getStartTime());
+		Response response = Response.status(workflowResponse.getMessageCode()).entity(workflowResponse).build();
+		AsynchronousResponse asyncResp = workflowContext.getAsynchronousResponse();
+		asyncResp.setResponse(response);
+	}
+
+	/**
+	 * Timeout thread which monitors the delay queue for expired context and send timeout response
+	 * to client
+	 *git review -R
+	 * */
+	private class TimeoutThread extends Thread {
+		public void run() {
+			while (!isInterrupted()) {
+				try {
+					WorkflowContext requestObject = responseQueue.take();
+					msoLogger.debug("Time remaining for request id: " + requestObject.getRequestId() + ":" + requestObject.getDelay(TimeUnit.MILLISECONDS));
+					msoLogger.debug("Preparing timeout response for " + requestObject.getProcessKey() + ":" + ":" + requestObject.getRequestId());
+					WorkflowResponse response = new WorkflowResponse();
+					response.setMessage("Fail");
+					response.setResponse("Request timedout, request id:" + requestObject.getRequestId());
+					//response.setProcessInstanceID(requestObject.getProcessInstance().getProcessInstanceId());
+					recordEvents(requestObject.getProcessKey(), response, requestObject.getStartTime());
+					response.setMessageCode(500);
+					Response result = Response.status(500).entity(response).build();
+					requestObject.getAsynchronousResponse().setResponse(result);
+					msoLogger.debug("Sending timeout response for request id:" + requestObject.getRequestId() + ":response:" + response);
+				} catch (InterruptedException e) {
+					break;
+				} catch (Exception e) {
+					msoLogger.debug("WorkflowContextHolder timeout thread caught exception: " + e);
+				msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), 
+						MsoLogger.ErrorCode.UnknownError, "Error in WorkflowContextHolder timeout thread");
+				
+				}
+			}
+
+			msoLogger.debug("WorkflowContextHolder timeout thread interrupted, quitting");
+		}
+	}
+	
+	private static void recordEvents(String processKey, WorkflowResponse response,
+			long startTime) {
+
+		msoLogger.recordMetricEvent ( startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, 
+				logMarker + response.getMessage() + " for processKey: "
+				+ processKey + " with response: " + response.getResponse(), "BPMN", MDC.get(processKey), null);
+		
+		msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, logMarker 
+				+ response.getMessage() + " for processKey: " 
+				+ processKey + " with response: " + response.getResponse());
+		
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
index 7a537218b3..76ff221018 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
@@ -39,7 +39,6 @@ import javax.ws.rs.core.UriInfo;
 import org.camunda.bpm.engine.HistoryService;
 import org.camunda.bpm.engine.ProcessEngineException;
 import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.ProcessEngines;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.history.HistoricVariableInstance;
 import org.camunda.bpm.engine.runtime.ProcessInstance;
@@ -53,10 +52,8 @@ import org.openecomp.mso.logger.MsoLogger;
 import org.slf4j.MDC;
 
 @Path("/workflow")
-public class WorkflowResource {
+public class WorkflowResource extends ProcessEngineAwareService {
 	
-	private ProcessEngineServices pes4junit = null;
-
 	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
 	private static final String LOGMARKER = "[WRKFLOW-RESOURCE]";
 
@@ -615,16 +612,4 @@ public class WorkflowResource {
 		
 		return response;
 	}
-
-	private ProcessEngineServices getProcessEngineServices() {
-		if (pes4junit == null) {
-			return ProcessEngines.getDefaultProcessEngine();
-		} else {
-			return pes4junit;
-		}
-	}
-
-	public void setProcessEngineServices4junit(ProcessEngineServices pes) {
-		pes4junit = pes;
-	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResourceApplication.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResourceApplication.java
index 4f99edd660..193b8fe903 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResourceApplication.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResourceApplication.java
@@ -26,23 +26,12 @@ import java.util.Set;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;
-
-/**
- * @version 1.0
- * RESTeasy workflow application which wires synchronous and asynchronous response
- *
- */
 @ApplicationPath("/")
 public class WorkflowResourceApplication extends Application {
     private Set<Object> singletons = new HashSet<Object>();
     private Set<Class<?>> classes = new HashSet<Class<?>>();
 
     public WorkflowResourceApplication() {
-        singletons.add(new WorkflowResource());
-        singletons.add(new WorkflowAsyncCommonResource());
-        singletons.add(new WorkflowMessageResource());
     }
 
     @Override
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncCommonResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/PreconditionFailedException.java
index 249283923a..df28baac74 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowAsyncCommonResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/PreconditionFailedException.java
@@ -1,32 +1,35 @@
-/*-
- * ============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.openecomp.mso.bpmn.common.workflow.service;
-
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.ProcessEngines;
-
-
-public class WorkflowAsyncCommonResource extends WorkflowAsyncResource {
-
-    protected ProcessEngineServices getProcessEngineServices() {
-        return pes4junit.orElse(ProcessEngines.getProcessEngine("common"));
-    }
-}
+/*-
+ * ============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.openecomp.mso.client;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+public class PreconditionFailedException extends WebApplicationException {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PreconditionFailedException(String message) {
+        super(message, Response.Status.PRECONDITION_FAILED);
+    }
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/ResponseExceptionMapper.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/ResponseExceptionMapper.java
new file mode 100644
index 0000000000..e0e3e936be
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/ResponseExceptionMapper.java
@@ -0,0 +1,98 @@
+/*-
+ * ============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.openecomp.mso.client;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+
+import javax.annotation.Priority;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.ForbiddenException;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.NotAcceptableException;
+import javax.ws.rs.NotAllowedException;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Priority(value = 1)
+public abstract class ResponseExceptionMapper implements ClientResponseFilter {
+
+	@Override
+	public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
+		if (responseContext.getStatus() >= 300) {
+			String message = "empty message";
+			if (responseContext.hasEntity()) {
+				Optional<String> result = this.extractMessage(responseContext.getEntityStream());
+				if (result.isPresent()) {
+					message = result.get();
+				}
+			}
+			Response.Status status = Response.Status.fromStatusCode(responseContext.getStatus());
+			WebApplicationException webAppException;
+			switch (status) {
+			case BAD_REQUEST:
+				webAppException = new BadRequestException(message);
+				break;
+			case UNAUTHORIZED:
+				webAppException = new NotAuthorizedException(message);
+				break;
+			case FORBIDDEN:
+				webAppException = new ForbiddenException(message);
+				break;
+			case NOT_FOUND:
+				webAppException = new NotFoundException(message);
+				break;
+			case METHOD_NOT_ALLOWED:
+				webAppException = new NotAllowedException(message);
+				break;
+			case NOT_ACCEPTABLE:
+				webAppException = new NotAcceptableException(message);
+				break;
+			case PRECONDITION_FAILED:
+				webAppException = new PreconditionFailedException(message);
+				break;
+			case UNSUPPORTED_MEDIA_TYPE:
+				webAppException = new NotSupportedException(message);
+				break;
+			case INTERNAL_SERVER_ERROR:
+				webAppException = new InternalServerErrorException(message);
+				break;
+			case SERVICE_UNAVAILABLE:
+				webAppException = new WebApplicationException(message);
+				break;
+			default:
+				webAppException = new WebApplicationException(message);
+			}
+			throw webAppException;
+		}
+	}
+	
+	public abstract Optional<String> extractMessage(InputStream stream) throws IOException;
+}
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResource.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/ResponseExceptionMapperImpl.java
index e8e5e47c07..0845a2fbcd 100644
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResource.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/ResponseExceptionMapperImpl.java
@@ -1,41 +1,39 @@
-/*-
- * ============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.openecomp.camunda.bpmn.plugin.urnmap.resources;
-
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import org.camunda.bpm.cockpit.plugin.resource.AbstractPluginRootResource;
-import org.openecomp.camunda.bpmn.plugin.urnmap.URNMapPlugin;
-
-@SuppressWarnings("deprecation")
-@Path("plugin/" + URNMapPlugin.ID)
-public class URNMapPluginRootResource extends AbstractPluginRootResource
-{
-	  public URNMapPluginRootResource() {
-		  	  super(URNMapPlugin.ID);
-	  }
-
-	  @Path("{engineName}/process-instance") 
-	  public URNResource getProcessInstanceResource(@PathParam("engineName") String engineName) {
-	    return subResource(new URNResource(engineName), engineName);
-	  }
-}
+/*-
+ * ============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.openecomp.mso.client;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+
+import org.apache.commons.io.IOUtils;
+
+public class ResponseExceptionMapperImpl extends ResponseExceptionMapper {
+
+	@Override
+	public Optional<String> extractMessage(InputStream stream) throws IOException {
+		final String input = IOUtils.toString(stream, "UTF-8");
+		IOUtils.closeQuietly(stream);
+		return Optional.of(input);
+	}
+	
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/RestProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/RestProperties.java
new file mode 100644
index 0000000000..ae8862de5e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/RestProperties.java
@@ -0,0 +1,30 @@
+/*-
+ * ============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.openecomp.mso.client;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public interface RestProperties {
+
+	public URL getEndpoint() throws MalformedURLException;
+	public String getSystemName();
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/RestPropertiesLoader.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/RestPropertiesLoader.java
new file mode 100644
index 0000000000..6d49d9800f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/RestPropertiesLoader.java
@@ -0,0 +1,55 @@
+/*-
+ * ============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.openecomp.mso.client;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+public class RestPropertiesLoader {
+
+	private final ServiceLoader<RestProperties> services;
+	private RestPropertiesLoader() {
+		services = ServiceLoader.load(RestProperties.class);
+	}
+	
+	private static class Helper {
+		private static final RestPropertiesLoader INSTANCE = new RestPropertiesLoader();
+	}
+	
+	public static RestPropertiesLoader getInstance() {
+		return Helper.INSTANCE;
+	}
+	
+	public <T> T getImpl(Class<? extends RestProperties> clazz) {
+		T result = null;
+		Iterator<RestProperties> propertyImpls = services.iterator();
+		RestProperties item;
+		while (propertyImpls.hasNext()) {
+			item = propertyImpls.next();
+			if (clazz.isAssignableFrom(item.getClass())) {
+				result = (T)item;
+				break;
+			}
+		}
+		
+		return result;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/Consumer.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/Consumer.java
index f1bafde997..0e00ae5da8 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/Consumer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/Consumer.java
@@ -22,33 +22,5 @@ package org.openecomp.mso.client.dmaap;
 
 public interface Consumer {
 
-	/**
-	 * Should this consumer continue to consume messages from the topic?
-	 * @return
-	 */
-	public boolean continuePolling();
-	/**
-	 * Process a message from a DMaaP topic
-	 * 
-	 * @param message
-	 * @throws Exception
-	 */
-	public void processMessage(String message) throws Exception;
-	/**
-	 * Has the request been accepted by the receiving system?
-	 * Should the consumer move to processing messages?
-	 * 
-	 * @param message
-	 * @return
-	 */
-	public boolean isAccepted(String message);
-	/**
-	 * The request id to filter messages on
-	 * @return
-	 */
-	public String getRequestId();
-	/**
-	 * Logic that defines when the consumer should stop processing messages
-	 */
-	public void stopProcessingMessages();
+	public Iterable<String> fetch();
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DefaultDmaapPropertiesImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DefaultDmaapPropertiesImpl.java
new file mode 100644
index 0000000000..9af1fd3f7e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DefaultDmaapPropertiesImpl.java
@@ -0,0 +1,38 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap;
+
+import java.util.Map;
+
+import org.openecomp.mso.bpmn.core.PropertyConfiguration;
+
+public class DefaultDmaapPropertiesImpl implements DmaapProperties {
+
+	private final Map<String, String> properties;
+	public DefaultDmaapPropertiesImpl() {
+		this.properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+	}
+	@Override
+	public Map<String, String> getProperties() {
+		return this.properties;
+	} 
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapClient.java
new file mode 100644
index 0000000000..7862c9d41d
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapClient.java
@@ -0,0 +1,68 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Map;
+import java.util.Properties;
+
+import org.openecomp.mso.bpmn.core.PropertyConfiguration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+public abstract class DmaapClient {
+	
+	protected final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+	protected final Map<String, String> msoProperties;
+	protected final Properties properties;
+	public DmaapClient(String filepath) throws FileNotFoundException, IOException {
+		Resource resource = new ClassPathResource(filepath);
+		DmaapProperties dmaapProperties = DmaapPropertiesLoader.getInstance().getImpl();
+		if (dmaapProperties == null) {
+			dmaapProperties = new DefaultDmaapPropertiesImpl();
+		}
+		this.msoProperties = dmaapProperties.getProperties();
+		this.properties = new Properties();
+		this.properties.load(resource.getInputStream());
+		this.properties.put("password", this.deobfuscatePassword(this.getPassword()));
+		this.properties.put("username", this.getUserName());
+		this.properties.put("topic", this.getTopic());
+	}
+	protected String deobfuscatePassword(String password) {
+		
+		try {
+			return new String(Base64.getDecoder().decode(password.getBytes()));
+		} catch(IllegalArgumentException iae) {
+			
+			return password;
+		}
+	}
+	
+	
+	public abstract String getUserName();
+	public abstract String getPassword();
+	public abstract String getTopic();
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapConsumer.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapConsumer.java
index 2a618763ff..033951612d 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapConsumer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapConsumer.java
@@ -22,39 +22,110 @@ package org.openecomp.mso.client.dmaap;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
+import org.openecomp.mso.client.dmaap.exceptions.DMaaPConsumerFailure;
+import org.openecomp.mso.client.dmaap.exceptions.ExceededMaximumPollingTime;
+import org.openecomp.mso.client.dmaap.rest.RestConsumer;
 
-public class DmaapConsumer {
+import com.google.common.base.Stopwatch;
 
-	private final MRConsumer mrConsumer;
-	public DmaapConsumer() {
-		mrConsumer = null;
-	}
-	public DmaapConsumer (String filepath) throws FileNotFoundException, IOException {
-		
-		mrConsumer = MRClientFactory.createConsumer(filepath);
+public abstract class DmaapConsumer extends DmaapClient {
+
+	public DmaapConsumer() throws FileNotFoundException, IOException {
+		super("dmaap/default-consumer.properties");
 	}
 	
-	
-	public MRConsumer getMRConsumer() {
-		return mrConsumer;
+	public Consumer getConsumer() throws FileNotFoundException, IOException {
+		return new RestConsumer(this.properties);
 	}
-	public boolean consume(Consumer consumer) throws Exception {
+	public boolean consume() throws Exception {
+		
+		Consumer mrConsumer = this.getConsumer();
+		int iterations = 0;
 		boolean accepted = false;
-		while (consumer.continuePolling()) {
-			for (String message : this.getMRConsumer().fetch()) {
-				if (!accepted && consumer.isAccepted(message)) {
-					accepted = true;
-				} 
-				if (accepted) {
-					consumer.processMessage(message);
+		Stopwatch stopwatch = Stopwatch.createUnstarted();
+		try {
+			while (this.continuePolling()) {
+				if (stopwatch.elapsed(TimeUnit.MILLISECONDS) >= this.getMaximumElapsedTime()) {
+					final String message = "exceeded maximum retries on " + this.getRequestId() + " on " + this.getTopic();
+					auditLogger.error(message);
+					throw new ExceededMaximumPollingTime(message);
 				}
+				stopwatch.start();
+				Iterable<String> itr = mrConsumer.fetch();
+				stopwatch.stop();
+				for (String message : itr) {
+					if (!accepted && this.isAccepted(message)) {
+						auditLogger.info("accepted message found for " + this.getRequestId() + " on " + this.getTopic());
+						accepted = true;
+					} 
+					if (accepted) {
+						if (this.isFailure(message)) {
+							this.stopProcessingMessages();
+							auditLogger.info("received dmaap message: " + message);
+							final String errorMsg = "failure received from dmaap topic " + this.getTopic();
+							auditLogger.error(errorMsg);
+							throw new DMaaPConsumerFailure(errorMsg);
+						} else {
+							auditLogger.info("received dmaap message: " + message);
+							this.processMessage(message);
+						}
+					}
+				}
+				iterations++;
+			}
+			return true;
+		} catch (Exception e ) {
+			throw e;
+		} finally {
+			if (stopwatch.isRunning()) {
+				stopwatch.stop();
 			}
 		}
-		
-		return true;
 	}
 	
+	/**
+	 * Should this consumer continue to consume messages from the topic?
+	 * @return
+	 */
+	public abstract boolean continuePolling();
+	/**
+	 * Process a message from a DMaaP topic
+	 * 
+	 * @param message
+	 * @throws Exception
+	 */
+	public abstract void processMessage(String message) throws Exception;
+	/**
+	 * Has the request been accepted by the receiving system?
+	 * Should the consumer move to processing messages?
+	 * 
+	 * @param message
+	 * @return
+	 */
+	public abstract boolean isAccepted(String message);
+	/**
+	 * has the request failed?
+	 * 
+	 * @param message
+	 * @return
+	 */
+	public abstract boolean isFailure(String message);
+	/**
+	 * The request id to filter messages on
+	 * @return
+	 */
+	public abstract String getRequestId();
+	/**
+	 * Logic that defines when the consumer should stop processing messages
+	 */
+	public abstract void stopProcessingMessages();
+	
+	/**
+	 * time in milliseconds
+	 */
+	public int getMaximumElapsedTime() {
+		return 180000;
+	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapProperties.java
new file mode 100644
index 0000000000..7bdd7dfe40
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapProperties.java
@@ -0,0 +1,32 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap;
+
+import java.util.Map;
+
+public interface DmaapProperties {
+
+	/**
+	 * A map of strings which contains the properties for a dmaap client
+	 * @return
+	 */
+	public Map<String, String> getProperties();
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPropertiesLoader.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPropertiesLoader.java
new file mode 100644
index 0000000000..a21dbe8477
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPropertiesLoader.java
@@ -0,0 +1,49 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+public class DmaapPropertiesLoader {
+
+	private final ServiceLoader<DmaapProperties> services;
+	private DmaapPropertiesLoader() {
+		services = ServiceLoader.load(DmaapProperties.class);
+	}
+	
+	private static class Helper {
+		private static final DmaapPropertiesLoader INSTANCE = new DmaapPropertiesLoader();
+	}
+	
+	public static DmaapPropertiesLoader getInstance() {
+		return Helper.INSTANCE;
+	}
+	
+	public DmaapProperties getImpl() {
+		Iterator<DmaapProperties> propertyImpls = services.iterator();
+		while (propertyImpls.hasNext()) {
+			return propertyImpls.next();
+		}
+		
+		return null;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPublisher.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPublisher.java
index 4d70a16b73..d2752c531b 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPublisher.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/DmaapPublisher.java
@@ -22,29 +22,30 @@ package org.openecomp.mso.client.dmaap;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRClientFactory;
+import org.openecomp.mso.client.dmaap.rest.RestPublisher;
 
-public class DmaapPublisher {
+public abstract class DmaapPublisher extends DmaapClient {
 	
-	private final long seconds;
-	private final MRBatchingPublisher publisher;
-	
-	public DmaapPublisher(String filepath) throws FileNotFoundException, IOException {
+	private long seconds;
+	private final Publisher publisher;
+	public DmaapPublisher() throws FileNotFoundException, IOException {
+		super("dmaap/default-consumer.properties");
+		this.publisher = new RestPublisher(properties);
 		this.seconds = 20;
-		this.publisher = MRClientFactory.createBatchingPublisher(filepath);
+		
 	}
 	
-	public DmaapPublisher(String filepath, long seconds) throws FileNotFoundException, IOException {
+	public DmaapPublisher(long seconds) throws FileNotFoundException, IOException {
+		this();
 		this.seconds = seconds;
-		this.publisher = MRClientFactory.createBatchingPublisher(filepath);
 	}
 	
 	public void send(String json) throws IOException, InterruptedException {
+		auditLogger.info("publishing message to dmaap topic " + this.getTopic() + ": " + json);
 		publisher.send(json);
-		publisher.close(seconds, TimeUnit.SECONDS);
+		//publisher.close(seconds, TimeUnit.SECONDS);
 	}
 
+
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/Publisher.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/Publisher.java
new file mode 100644
index 0000000000..d89ee6e5c6
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/Publisher.java
@@ -0,0 +1,26 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap;
+
+public interface Publisher {
+
+	public void send(String json);
+}
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNData.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/exceptions/DMaaPConsumerFailure.java
index b2dcefb304..29472b2180 100644
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNData.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/exceptions/DMaaPConsumerFailure.java
@@ -1,47 +1,34 @@
-/*-
- * ============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.openecomp.camunda.bpmn.plugin.urnmap.db;
-
-public class URNData {
-
-	  private String URNName;
-	  private String URNValue;
-	  private String Ver_;
-	public String getURNName() {
-		return URNName;
-	}
-	public void setURNName(String uRNName) {
-		URNName = uRNName;
-	}
-	public String getURNValue() {
-		return URNValue;
-	}
-	public void setURNValue(String uRNValue) {
-		URNValue = uRNValue;
-	}
-	public String getVer_() {
-		return Ver_;
-	}
-	public void setVer_(String ver_) {
-		Ver_ = ver_;
-	}
-	  
-}
+/*-
+ * ============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.openecomp.mso.client.dmaap.exceptions;
+
+public class DMaaPConsumerFailure extends Exception {
+
+	private static final long serialVersionUID = 2499229901897110362L;
+
+	public DMaaPConsumerFailure() {
+		super();
+	}
+	
+	public DMaaPConsumerFailure(String message) {
+		super(message);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/exceptions/ExceededMaximumPollingTime.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/exceptions/ExceededMaximumPollingTime.java
new file mode 100644
index 0000000000..c9d675067e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/exceptions/ExceededMaximumPollingTime.java
@@ -0,0 +1,34 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap.exceptions;
+
+public class ExceededMaximumPollingTime extends RuntimeException  {
+
+	private static final long serialVersionUID = 2331207691092906423L;
+
+	public ExceededMaximumPollingTime() {
+		super();
+	}
+	
+	public ExceededMaximumPollingTime(String message) {
+		super(message);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/DMaaPRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/DMaaPRestClient.java
new file mode 100644
index 0000000000..124e2c3a28
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/DMaaPRestClient.java
@@ -0,0 +1,57 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap.rest;
+
+import java.net.URL;
+import java.util.Base64;
+import java.util.Map;
+import java.util.Optional;
+
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.openecomp.mso.client.ResponseExceptionMapperImpl;
+import org.openecomp.mso.client.policy.RestClient;
+
+public class DMaaPRestClient  extends RestClient {
+
+	private final String username;
+	private final String password;
+	public DMaaPRestClient(URL url, String contentType, String username, String password) {
+		super(url, contentType);
+		this.username = username;
+		this.password = password;
+	}
+
+	@Override
+	protected void initializeHeaderMap(Map<String, String> headerMap) {
+		headerMap.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(new String(username + ":" + password).getBytes()));
+	}
+
+	@Override
+	protected Optional<ClientResponseFilter> addResponseFilter() {
+		return Optional.of(new ResponseExceptionMapperImpl());
+	}
+
+	@Override
+	public RestClient addRequestId(String requestId) {
+		return null;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/PropertiesBean.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/PropertiesBean.java
new file mode 100644
index 0000000000..fb914a0c13
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/PropertiesBean.java
@@ -0,0 +1,131 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap.rest;
+
+import java.util.Properties;
+
+public class PropertiesBean {
+
+	private String username;
+	private String password;
+	private String environment;
+	private String partition;
+	private String contentType;
+	private String host;
+	private String topic;
+	private String timeout;
+	
+	
+	public PropertiesBean(Properties properties) {
+		this.withUsername(properties.getProperty("username"))
+		.withPassword(properties.getProperty("password"))
+		.withTopic(properties.getProperty("topic"))
+		.withEnvironment(properties.getProperty("environment"))
+		.withHost(properties.getProperty("host"))
+		.withTimeout(properties.getProperty("timeout", "20000"))
+		.withPartition(properties.getProperty("partition"))
+		.withContentType(properties.getProperty("contentType", "application/json"));
+	}
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	public PropertiesBean withUsername(String username) {
+		this.username = username;
+		return this;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	public PropertiesBean withPassword(String password) {
+		this.password = password;
+		return this;
+	}
+	public String getEnvironment() {
+		return environment;
+	}
+	public void setEnvironment(String environment) {
+		this.environment = environment;
+	}
+	public PropertiesBean withEnvironment(String environment) {
+		this.environment = environment;
+		return this;
+	}
+	public String getPartition() {
+		return partition;
+	}
+	public void setPartition(String partition) {
+		this.partition = partition;
+	}
+	public PropertiesBean withPartition(String partition) {
+		this.partition = partition;
+		return this;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public PropertiesBean withContentType(String contentType) {
+		this.contentType = contentType;
+		return this;
+	}
+	public String getHost() {
+		return host;
+	}
+	public void setHost(String host) {
+		this.host = host;
+	}
+	public PropertiesBean withHost(String host) {
+		this.host = host;
+		return this;
+	}
+	public String getTopic() {
+		return topic;
+	}
+	public void setTopic(String topic) {
+		this.topic = topic;
+	}
+	public PropertiesBean withTopic(String topic) {
+		this.topic = topic;
+		return this;
+	}
+	public String getTimeout() {
+		return timeout;
+	}
+	public void setTimeout(String timeout) {
+		this.timeout = timeout;
+	}
+	public PropertiesBean withTimeout(String timeout) {
+		this.timeout = timeout;
+		return this;
+	}
+	
+	
+	
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/RestConsumer.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/RestConsumer.java
new file mode 100644
index 0000000000..ff199e2373
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/RestConsumer.java
@@ -0,0 +1,60 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap.rest;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.Properties;
+
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.UriBuilder;
+
+import org.openecomp.mso.client.dmaap.Consumer;
+import org.openecomp.mso.client.policy.RestClient;
+
+public class RestConsumer implements Consumer {
+
+	private final RestClient client;
+	public RestConsumer(Properties properties) {
+		PropertiesBean bean = new PropertiesBean(properties);
+		client = new DMaaPRestClient(this.createURL(bean), bean.getContentType(), bean.getUsername(), bean.getPassword());
+	}
+	
+	private URL createURL(PropertiesBean properties) {
+		try {
+			return UriBuilder.fromUri("http://" + properties.getHost())
+					.path("events").path(properties.getTopic())
+					.path(properties.getPartition())
+					.path("consumer1")
+					.queryParam("timeout",  properties.getTimeout()).build().toURL();
+		} catch (MalformedURLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	@Override
+	public Iterable<String> fetch() {
+		
+		return client.get(new GenericType<List<String>>() {});
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/RestPublisher.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/RestPublisher.java
new file mode 100644
index 0000000000..e8e685932a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/dmaap/rest/RestPublisher.java
@@ -0,0 +1,56 @@
+/*-
+ * ============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.openecomp.mso.client.dmaap.rest;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriBuilderException;
+
+import org.openecomp.mso.client.dmaap.Publisher;
+import org.openecomp.mso.client.policy.RestClient;
+
+public class RestPublisher implements Publisher {
+
+	private final RestClient client;
+
+	public RestPublisher(Properties properties) {
+		PropertiesBean bean = new PropertiesBean(properties);
+		client = new DMaaPRestClient(this.createURL(bean), bean.getContentType(), bean.getUsername(), bean.getPassword());
+	}
+	
+	private URL createURL(PropertiesBean properties) {
+		try {
+			return UriBuilder.fromUri("http://" + properties.getHost())
+					.path("events").path(properties.getTopic())
+					.queryParam("timeout",  properties.getTimeout()).build().toURL();
+		} catch (MalformedURLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	@Override
+	public void send(String json) {
+		client.post(json);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java
index 665b9052eb..e02941944a 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/LoggingFilter.java
@@ -1,130 +1,138 @@
-/*-
- * ============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.openecomp.mso.client.policy;
-
-import java.io.BufferedInputStream;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.logging.Logger;
-import javax.annotation.Priority;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.ext.WriterInterceptor;
-import javax.ws.rs.ext.WriterInterceptorContext;
-
-@Priority(Integer.MIN_VALUE)
-public class LoggingFilter implements ClientRequestFilter, ClientResponseFilter, WriterInterceptor {
-
-	private static final Logger logger = Logger.getLogger(LoggingFilter.class.getName());
-	private static final String ENTITY_STREAM_PROPERTY = "LoggingFilter.entityStream";
-	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
-	private final int maxEntitySize = 1024 * 8;
-
-	private void log(StringBuilder sb) {
-		logger.info(sb.toString());
-	}
-
-	private InputStream logInboundEntity(final StringBuilder b, InputStream stream, final Charset charset)
-			throws IOException {
-		InputStream inputStream = stream;
-		if (!inputStream.markSupported()) {
-			inputStream = new BufferedInputStream(inputStream);
-		}
-		inputStream.mark(maxEntitySize + 1);
-		final byte[] entity = new byte[maxEntitySize + 1];
-		final int entitySize = inputStream.read(entity);
-		b.append(new String(entity, 0, Math.min(entitySize, maxEntitySize), charset));
-		if (entitySize > maxEntitySize) {
-			b.append("...more...");
-		}
-		b.append('\n');
-		inputStream.reset();
-		return inputStream;
-	}
-
-	@Override
-	public void filter(ClientRequestContext requestContext) throws IOException {
-		if (requestContext.hasEntity()) {
-			final OutputStream stream = new LoggingStream(requestContext.getEntityStream());
-			requestContext.setEntityStream(stream);
-			requestContext.setProperty(ENTITY_STREAM_PROPERTY, stream);
-		}
-	}
-
-	@Override
-	public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
-		final StringBuilder sb = new StringBuilder();
-		if (responseContext.hasEntity()) {
-			responseContext.setEntityStream(logInboundEntity(sb, responseContext.getEntityStream(), DEFAULT_CHARSET));
-			log(sb);
-		}
-
-	}
-
-	@Override
-	public void aroundWriteTo(WriterInterceptorContext context) throws IOException, WebApplicationException {
-		final LoggingStream stream = (LoggingStream) context.getProperty(ENTITY_STREAM_PROPERTY);
-		context.proceed();
-		if (stream != null) {
-			log(stream.getStringBuilder(DEFAULT_CHARSET));
-		}
-	}
-
-	private class LoggingStream extends FilterOutputStream {
-
-		private final StringBuilder sb = new StringBuilder();
-		private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-		LoggingStream(OutputStream out) {
-			super(out);
-		}
-
-		StringBuilder getStringBuilder(Charset charset) {
-			// write entity to the builder
-			final byte[] entity = baos.toByteArray();
-
-			sb.append(new String(entity, 0, entity.length, charset));
-			if (entity.length > maxEntitySize) {
-				sb.append("...more...");
-			}
-			sb.append('\n');
-
-			return sb;
-		}
-
-		@Override
-		public void write(final int i) throws IOException {
-			if (baos.size() <= maxEntitySize) {
-				baos.write(i);
-			}
-			out.write(i);
-		}
-	}
-}
+/*-
+ * ============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.openecomp.mso.client.policy;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.Logger;
+
+import javax.annotation.Priority;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.ext.WriterInterceptor;
+import javax.ws.rs.ext.WriterInterceptorContext;
+
+@Priority(Integer.MIN_VALUE)
+public class LoggingFilter implements ClientRequestFilter, ClientResponseFilter, WriterInterceptor {
+
+	private static final Logger logger = Logger.getLogger(LoggingFilter.class.getName());
+	private static final String ENTITY_STREAM_PROPERTY = "LoggingFilter.entityStream";
+	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
+	private final int maxEntitySize;
+
+	public LoggingFilter() {
+		maxEntitySize = 1024 * 1024;
+	}
+
+	public LoggingFilter(int maxPayloadSize) {
+		this.maxEntitySize = Integer.min(maxPayloadSize, 1024 * 1024);
+	}
+
+	private void log(StringBuilder sb) {
+		logger.info(sb.toString());
+	}
+
+	private InputStream logInboundEntity(final StringBuilder b, InputStream stream, final Charset charset)
+			throws IOException {
+		if (!stream.markSupported()) {
+			stream = new BufferedInputStream(stream);
+		}
+		stream.mark(maxEntitySize + 1);
+		final byte[] entity = new byte[maxEntitySize + 1];
+		final int entitySize = stream.read(entity);
+		if (entitySize != -1) {
+			b.append(new String(entity, 0, Math.min(entitySize, maxEntitySize), charset));
+		}
+		if (entitySize > maxEntitySize) {
+			b.append("...more...");
+		}
+		b.append('\n');
+		stream.reset();
+		return stream;
+	}
+
+	@Override
+	public void filter(ClientRequestContext requestContext) throws IOException {
+		if (requestContext.hasEntity()) {
+			final OutputStream stream = new LoggingStream(requestContext.getEntityStream());
+			requestContext.setEntityStream(stream);
+			requestContext.setProperty(ENTITY_STREAM_PROPERTY, stream);
+		}
+	}
+
+	@Override
+	public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
+		final StringBuilder sb = new StringBuilder();
+		if (responseContext.hasEntity()) {
+			responseContext.setEntityStream(logInboundEntity(sb, responseContext.getEntityStream(), DEFAULT_CHARSET));
+			log(sb);
+		}
+	}
+
+	@Override
+	public void aroundWriteTo(WriterInterceptorContext context) throws IOException, WebApplicationException {
+		final LoggingStream stream = (LoggingStream) context.getProperty(ENTITY_STREAM_PROPERTY);
+		context.proceed();
+		if (stream != null) {
+			log(stream.getStringBuilder(DEFAULT_CHARSET));
+		}
+	}
+
+	private class LoggingStream extends FilterOutputStream {
+
+		private final StringBuilder sb = new StringBuilder();
+		private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+		LoggingStream(OutputStream out) {
+			super(out);
+		}
+
+		StringBuilder getStringBuilder(Charset charset) {
+			// write entity to the builder
+			final byte[] entity = baos.toByteArray();
+
+			sb.append(new String(entity, 0, entity.length, charset));
+			if (entity.length > maxEntitySize) {
+				sb.append("...more...");
+			}
+			sb.append('\n');
+
+			return sb;
+		}
+
+		@Override
+		public void write(final int i) throws IOException {
+			if (baos.size() <= maxEntitySize) {
+				baos.write(i);
+			}
+			out.write(i);
+		}
+	}
+}
+\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
index 71ae56f55b..4ed2a887ef 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP - SO
+ * OPENECOMP - MSO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -20,50 +20,47 @@
 
 package org.openecomp.mso.client.policy;
 
+import java.net.MalformedURLException;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriBuilderException;
 
+import org.openecomp.mso.client.ResponseExceptionMapperImpl;
+import org.openecomp.mso.client.RestProperties;
+import org.openecomp.mso.client.policy.entities.PolicyServiceType;
 import org.springframework.stereotype.Service;
 
 @Service
 public class PolicyRestClient extends RestClient {
 
-	private static final String ENDPOINT_KEY = "policy.endpoint";
 	private static final String X_ECOMP_REQUESTID = String.valueOf(UUID.randomUUID());
-
-	public PolicyRestClient() {
-		super(ENDPOINT_KEY);
+	private final PolicyRestProperties properties;
+	public PolicyRestClient(PolicyRestProperties props, PolicyServiceType serviceType) {
+		super(props, Optional.of(UriBuilder.fromPath(serviceType.toString()).build()));
+		this.properties = props;
+		this.getClient();
 	}
 
 	@Override
 	protected void initializeHeaderMap(Map<String, String> headerMap) {
-		headerMap.put("ClientAuth", properties.get("policy.client.auth"));
-		headerMap.put("Authorization", properties.get("policy.auth"));
-		headerMap.put("Environment", properties.get("policy.environment"));
-		headerMap.put("X-ECOMP-RequestID", X_ECOMP_REQUESTID);
+		headerMap.put("ClientAuth", properties.getClientAuth());
+		headerMap.put("Authorization", properties.getAuth());
+		headerMap.put("Environment", properties.getEnvironment());
+		this.addRequestId(X_ECOMP_REQUESTID);
 	}
 
-	public PolicyDecision getDecision(String serviceType, String vnfType, String bbID, String workStep,
-			String errorCode) {
-		DecisionAttributes decisionAttributes = new DecisionAttributes();
-		decisionAttributes.setServiceType(serviceType);
-		decisionAttributes.setVNFType(vnfType);
-		decisionAttributes.setBBID(bbID);
-		decisionAttributes.setWorkStep(workStep);
-		decisionAttributes.setErrorCode(errorCode);
-
-		return this.getDecision(decisionAttributes);
+	@Override
+	protected Optional<ClientResponseFilter> addResponseFilter() {
+		return Optional.of(new ResponseExceptionMapperImpl());
 	}
 
-	private PolicyDecision getDecision(DecisionAttributes decisionAttributes) {
-		PolicyDecisionRequest decisionRequest = new PolicyDecisionRequest();
-		decisionRequest.setDecisionAttributes(decisionAttributes);
-		decisionRequest.setEcompcomponentName(ECOMP_COMPONENT_NAME);
-
-		return this.getBuilder().accept(MediaType.APPLICATION_JSON_TYPE)
-				.post(Entity.entity(decisionRequest, MediaType.APPLICATION_JSON)).readEntity(PolicyDecision.class);
+	@Override
+	public RestClient addRequestId(String requestId) {
+		this.headerMap.put("X-ECOMP-RequestID", requestId);
+		return this;
 	}
 }
 \ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestProperties.java
new file mode 100644
index 0000000000..d9336768fc
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestProperties.java
@@ -0,0 +1,64 @@
+/*-
+ * ============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.openecomp.mso.client.policy;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+
+import org.openecomp.mso.bpmn.core.PropertyConfiguration;
+import org.openecomp.mso.client.RestProperties;
+
+public class PolicyRestProperties implements RestProperties {
+
+	
+	final Map<String, String> props;
+	public PolicyRestProperties() {
+		this.props = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+
+	}
+	@Override
+	public URL getEndpoint() {
+		try {
+			return new URL(props.getOrDefault("policy.endpoint", ""));
+		} catch (MalformedURLException e) {
+			return null;
+		}
+	}
+
+	@Override
+	public String getSystemName() {
+		return "MSO";
+	}
+	
+	public String getClientAuth() {
+		return props.get("policy.client.auth");
+	}
+	
+	public String getAuth() {
+		return props.get("policy.auth");
+	}
+	
+	public String getEnvironment() {
+		return props.get("policy.environment");
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java
index 81c072ff33..74b1c3f802 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java
@@ -20,51 +20,104 @@
 
 package org.openecomp.mso.client.policy;
 
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.logging.Logger;
+import java.util.Optional;
 
+import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.ext.ContextResolver;
 
-
-import org.openecomp.mso.bpmn.core.PropertyConfiguration;
+import org.apache.log4j.Logger;
+import org.openecomp.mso.client.RestProperties;
 import org.openecomp.mso.logger.MsoLogger;
 import org.springframework.stereotype.Service;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @Service
 public abstract class RestClient {
 	protected static final String ECOMP_COMPONENT_NAME = "MSO";
-
+	
+	private static final int MAX_PAYLOAD_SIZE = 1024 * 1024;
 	private WebTarget webTarget;
 
 	protected final Map<String, String> headerMap;
 	protected final MsoLogger msoLogger;
-	protected Map<String, String> properties;
-	protected String host;
+	protected URL host;
+	protected Optional<URI> path;
+	protected Logger logger;
+	protected String accept;
+	protected String contentType;
 
-	protected RestClient(String endpointKey) {
-		Logger logger = Logger.getLogger(getClass().getName());
+	protected RestClient(RestProperties props, Optional<URI> path) {
+		logger = Logger.getLogger(getClass().getName());
 		msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL);
-		
-		properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+
 		headerMap = new HashMap<>();
-		initializeHeaderMap(headerMap);
+		try {
+			host = props.getEndpoint();
+		} catch (MalformedURLException e) {
+			logger.error("url not valid", e);
+			throw new RuntimeException(e);
+		}
+		
+		this.path = path;
+		initializeClient(getClient());
+	}
 
-		host = this.getHost(endpointKey);
+	protected RestClient(RestProperties props, Optional<URI> path, String accept, String contentType) {
+		this(props, path);
+		this.accept = accept;
+		this.contentType = contentType;
 
-		webTarget = ClientBuilder.newClient().register(logger).register(new LoggingFilter())
-				.register(new CommonObjectMapperProvider()).target(host);
 	}
 
-	private String getHost(String key) {
-		return properties.get(key);
+	protected RestClient(URL host, String contentType) {
+		headerMap = new HashMap<>();
+		logger = Logger.getLogger(getClass().getName());
+		msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL);
+		this.path = Optional.empty();
+		this.host = host;
+		this.contentType = contentType;
+		initializeClient(getClient());
+	}
+
+	/**
+	 * Override method to return false to disable logging.
+	 * 
+	 * @return true - to enable logging, false otherwise
+	 */
+	protected boolean enableLogging() {
+		return true;
+	}
+	
+	/**
+	 * Override method to return custom value for max payload size.
+	 * 
+	 * @return Default value for MAX_PAYLOAD_SIZE = 1024 * 1024
+	 */
+	protected int getMaxPayloadSize()
+	{
+		return MAX_PAYLOAD_SIZE;
 	}
 
 	protected Builder getBuilder() {
+
 		Builder builder = webTarget.request();
+		initializeHeaderMap(headerMap);
 
 		for (Entry<String, String> entry : headerMap.entrySet()) {
 			builder.header(entry.getKey(), entry.getValue());
@@ -73,4 +126,100 @@ public abstract class RestClient {
 	}
 
 	protected abstract void initializeHeaderMap(Map<String, String> headerMap);
+
+	protected abstract Optional<ClientResponseFilter> addResponseFilter();
+
+	public abstract RestClient addRequestId(String requestId);
+
+	protected ContextResolver<ObjectMapper> getMapper() {
+		return new CommonObjectMapperProvider();
+	}
+
+	protected String getAccept() {
+		return accept;
+	}
+
+	protected String getContentType() {
+		return contentType;
+	}
+
+	protected String getMergeContentType() {
+		return "application/merge-patch+json";
+	}
+
+	protected Client getClient() {
+		return ClientBuilder.newBuilder().build();
+	}
+
+	protected void initializeClient(Client client) {
+		if (this.enableLogging()) {
+			client.register(logger).register(new LoggingFilter(this.getMaxPayloadSize()));
+		}
+		client.register(this.getMapper());
+		Optional<ClientResponseFilter> responseFilter = this.addResponseFilter();
+		if (responseFilter.isPresent()) {
+			client.register(responseFilter.get());
+		}
+		if (!path.isPresent()) {
+			webTarget = client.target(host.toString());
+		} else {
+			webTarget = client.target(UriBuilder.fromUri(host + path.get().toString()));
+		}
+		this.accept = MediaType.APPLICATION_JSON;
+		this.contentType = MediaType.APPLICATION_JSON;
+	}
+
+	public Response get() {
+		return this.getBuilder().accept(this.getAccept()).get();
+	}
+
+	public Response post(Object obj) {
+		return this.getBuilder().accept(this.getAccept()).post(Entity.entity(obj, this.getContentType()));
+	}
+
+	public Response patch(Object obj) {
+		return this.getBuilder().header("X-HTTP-Method-Override", "PATCH").accept(this.getAccept())
+				.post(Entity.entity(obj, this.getMergeContentType()));
+	}
+
+	public Response put(Object obj) {
+		return this.getBuilder().accept(this.getAccept()).put(Entity.entity(obj, this.getContentType()));
+	}
+
+	public Response delete() {
+		return this.getBuilder().accept(this.getAccept()).delete();
+	}
+
+	public Response delete(Object obj) {
+		return this.getBuilder().header("X-HTTP-Method-Override", "DELETE").accept(this.getAccept())
+				.put(Entity.entity(obj, this.getContentType()));
+	}
+
+	public <T> T get(Class<T> resultClass) {
+		return this.get().readEntity(resultClass);
+	}
+
+	public <T> T get(GenericType<T> resultClass) {
+		return this.get().readEntity(resultClass);
+	}
+
+	public <T> T post(Object obj, Class<T> resultClass) {
+		return this.post(obj).readEntity(resultClass);
+	}
+
+	public <T> T patch(Object obj, Class<T> resultClass) {
+		return this.patch(obj).readEntity(resultClass);
+	}
+
+	public <T> T put(Object obj, Class<T> resultClass) {
+		return this.put(obj).readEntity(resultClass);
+	}
+
+	public <T> T delete(Class<T> resultClass) {
+		return this.delete().readEntity(resultClass);
+	}
+	
+	public <T> T delete(Object obj, Class<T> resultClass) {
+		return this.delete(obj).readEntity(resultClass);
+	}
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/entities/PolicyServiceType.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/entities/PolicyServiceType.java
new file mode 100644
index 0000000000..b5ab63ce35
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/entities/PolicyServiceType.java
@@ -0,0 +1,48 @@
+/*-
+ * ============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.openecomp.mso.client.policy.entities;
+
+public enum PolicyServiceType {
+	GET_CONFIG("getConfig"),
+	SEND_EVENT("sendEvent"),
+	PUSH_POLICY("pushPolicy"),
+	CREATE_POLICY("createPolicy"),
+	UPDATE_POLICY("updatePolicy"),
+	GET_DECISION("getDecision"),
+	GET_METRICS("getMetrics"),
+	DELETE_POLICY("deletePolicy"),
+	LIST_CONFIG("listConfig"),
+	CREATE_DICTIONARY_ITEM("createDictionaryItem"),
+	UPDATE_DICTIONARY_ITEM("updateDictionaryItem"),
+	GET_DICTIONARY_ITEMS("getDictionaryItems");
+	
+	private final String name;
+	
+	private PolicyServiceType(String name) {
+		this.name = name;
+	}
+	
+	@Override
+	public String toString() {
+		return name;
+	}
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidator.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidator.java
index 950dc7b83b..c746c0d448 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidator.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidator.java
@@ -22,9 +22,16 @@ package org.openecomp.mso.client.sdno;
 
 import java.io.IOException;
 
-@FunctionalInterface
 public interface SDNOValidator {
 	
-	void healthDiagnostic(String vnfName, String uuid) throws IOException, Exception;
+	/**
+	 * Issues a health diagnostic request for a given vnf to SDN-O
+	 * 
+	 * @param vnfName
+	 * @param uuid
+	 * @throws IOException
+	 * @throws Exception
+	 */
+	public void healthDiagnostic(String vnfId, String requestingUserId) throws IOException, Exception;
 
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidatorImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidatorImpl.java
index 92a00eee65..bdb4aa94ee 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidatorImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNOValidatorImpl.java
@@ -30,7 +30,7 @@ import org.openecomp.mso.client.dmaap.DmaapPublisher;
 import org.openecomp.mso.client.exceptions.SDNOException;
 import org.openecomp.mso.jsonpath.JsonPathUtil;
 
-public class SDNOValidatorImpl implements SDNOValidator, Consumer {
+public class SDNOValidatorImpl implements SDNOValidator {
 
 	private final static String aafUserName = "something";
 	private final static String clientName = "MSO";
@@ -51,103 +51,4 @@ public class SDNOValidatorImpl implements SDNOValidator, Consumer {
 		//block and continue to poll waiting for response
 	}
 
-	protected SDNO buildRequestDiagnostic(String vnfName, String uuid, String oamIp) {
-		
-		Input input = new Input();
-		SDNO parentRequest = new SDNO();
-		Body body = new Body();
-		parentRequest.setBody(body);
-		parentRequest.setNodeType("vPE");
-		parentRequest.setOperation("health-diagnostic");
-		
-		body.setInput(input);
-		
-		RequestHealthDiagnostic request = new RequestHealthDiagnostic();
-		request.setRequestClientName(clientName);
-		request.setRequestNodeName(vnfName);
-		request.setRequestNodeIp(oamIp); //generic-vnf oam ip
-		request.setRequestUserId(aafUserName); //mech id?
-		request.setRequestId(uuid); //something to identify this request by for polling
-		
-		input.setRequestHealthDiagnostic(request);
-		
-		return parentRequest;
-	}
-	protected void submitRequest(String json) throws FileNotFoundException, IOException, InterruptedException {
-		DmaapPublisher publisher = new DmaapPublisher(this.producerFilePath);
-		publisher.send(json);
-	}
-	protected boolean pollForResponse(DmaapConsumer consumer, String uuid) throws Exception {
-		this.uuid = uuid;
-		return consumer.consume(this);
-	}
-	
-	@Override
-	public boolean continuePolling() {
-		return continuePolling;
-	}
-	
-	@Override
-	public void stopProcessingMessages() {
-		continuePolling = false;
-	}
-	@Override
-	public void processMessage(String message) throws Exception {
-		if (isHealthDiagnostic(message, this.getRequestId())) {
-			if (!healthDiagnosticSuccessful(message)) {
-				Optional<String> statusMessage = this.getStatusMessage(message);
-				if (statusMessage.isPresent()) {
-					throw new SDNOException(statusMessage.get());
-				} else {
-					throw new SDNOException();
-				}
-			} else {
-				stopProcessingMessages();
-			}
-		}
-	}
-	
-	@Override
-	public boolean isAccepted(String message) {
-		if (isResultInfo(message)) {
-			Optional<String> code = isAccepted(message, this.getRequestId());
-			if (code.isPresent()) {
-				if ("202".equals(code.get())) {
-					return true;
-				} else {
-					//TODO check other statuses 400 and 500
-				}
-			} else {
-				//TODO throw error
-			}
-		}
-		
-		return false;
-	}
-	
-	@Override
-	public String getRequestId() {
-		return uuid;
-	}
-	
-	protected Optional<String> isAccepted(String json, String uuid) {
-		return JsonPathUtil.getInstance().locateResult(json, String.format("$.result-info[?(@.status=='ACCEPTED' && @.request-id=='%s')].code", uuid));
-	}
-	
-	protected boolean isResultInfo(String json) {
-		return JsonPathUtil.getInstance().pathExists(json, "$[?(@.result-info)]");
-	}
-	
-	protected boolean isHealthDiagnostic(String json, String uuid) {
-		return JsonPathUtil.getInstance().pathExists(json, String.format("$[?(@.result-info.request-id=='%s')].%s", uuid, healthDiagnosticPath));
-	}
-	
-	protected boolean healthDiagnosticSuccessful(String json) {
-		return JsonPathUtil.getInstance().pathExists(json, "$." + healthDiagnosticPath + "[?(@.response-status=='Success')]");
-	}
-	
-	protected Optional<String> getStatusMessage(String json) {
-		return JsonPathUtil.getInstance().locateResult(json, "$." + healthDiagnosticPath + ".response-details-json");
-	}
-	
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Body.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/Body.java
index 2db4dea069..cc8ce81dec 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Body.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/Body.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdno;
+package org.openecomp.mso.client.sdno.beans;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -41,7 +41,7 @@ public class Body implements Serializable
     @JsonProperty("input")
     private Input input;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
     private final static long serialVersionUID = 9101706044452851559L;
 
     @JsonProperty("input")
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Input.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/Input.java
index 25eb2ed270..7b9bf6f2c7 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/Input.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/Input.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdno;
+package org.openecomp.mso.client.sdno.beans;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -33,15 +33,17 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "request-healthdiagnostic"
+    "request-healthdiagnostic",
+    "request-hd-custom"
 })
 public class Input implements Serializable
 {
 
     @JsonProperty("request-healthdiagnostic")
     private RequestHealthDiagnostic RequestHealthDiagnostic;
+    
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
     private final static long serialVersionUID = 7155546785389227528L;
 
     @JsonProperty("request-healthdiagnostic")
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/RequestHealthDiagnostic.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/RequestHealthDiagnostic.java
index b1ed77b513..104dbb7ee6 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/RequestHealthDiagnostic.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/RequestHealthDiagnostic.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdno;
+package org.openecomp.mso.client.sdno.beans;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -59,7 +59,7 @@ public class RequestHealthDiagnostic implements Serializable
     @JsonProperty("health-diagnostic-code")
     private String healthDiagnosticCode;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
     private final static long serialVersionUID = 1166788526178388021L;
 
     @JsonProperty("request-client-name")
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/ResultInfo.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/ResultInfo.java
index 0997b2df90..4d029cb8cb 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/ResultInfo.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/ResultInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdno;
+package org.openecomp.mso.client.sdno.beans;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -51,7 +51,7 @@ private String requestId;
 @JsonProperty("status")
 private String status;
 @JsonIgnore
-private Map<String, Object> additionalProperties = new HashMap<>();
+private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
 @JsonProperty("client-name")
 public String getClientName() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNO.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/SDNO.java
index caa3ff58e9..4edd54ca09 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/SDNO.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/SDNO.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.client.sdno;
+package org.openecomp.mso.client.sdno.beans;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -34,6 +34,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
     "operation",
+    "nodeLoc",
     "nodeType",
     "body"
 })
@@ -42,12 +43,14 @@ public class SDNO implements Serializable
 
     @JsonProperty("operation")
     private String operation;
+    @JsonProperty("nodeLoc")
+    private String nodeLoc;
     @JsonProperty("nodeType")
     private String nodeType;
     @JsonProperty("body")
     private Body body;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<>();
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
     private final static long serialVersionUID = -5303297382564282650L;
 
     @JsonProperty("operation")
@@ -59,8 +62,23 @@ public class SDNO implements Serializable
     public void setOperation(String operation) {
         this.operation = operation;
     }
+    
+    @JsonProperty("nodeLoc")
+    public String getNodeLoc() {
+		return nodeLoc;
+	}
+    
+    @JsonProperty("nodeLoc")
+	public void setNodeLoc(String nodeLoc) {
+		this.nodeLoc = nodeLoc;
+	}
+    
+    public SDNO withNodeLoc(String nodeLoc) {
+    	this.nodeLoc = nodeLoc;
+    	return this;
+    }
 
-    public SDNO withOperation(String operation) {
+	public SDNO withOperation(String operation) {
         this.operation = operation;
         return this;
     }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java
new file mode 100644
index 0000000000..f23d882b53
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java
@@ -0,0 +1,156 @@
+/*-
+ * ============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.openecomp.mso.client.sdno.dmaap;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Optional;
+
+import org.openecomp.mso.client.dmaap.DmaapConsumer;
+import org.openecomp.mso.client.exceptions.SDNOException;
+import org.openecomp.mso.jsonpath.JsonPathUtil;
+
+public class SDNOHealthCheckDmaapConsumer extends DmaapConsumer {
+
+	private final String uuid;
+	private boolean continuePolling = true;
+	private final static String healthDiagnosticPath = "body.output.*";
+
+	public SDNOHealthCheckDmaapConsumer() throws FileNotFoundException, IOException {
+		this("none");
+	}
+	
+	public SDNOHealthCheckDmaapConsumer(String uuid) throws FileNotFoundException, IOException {
+		super();
+		this.uuid = uuid;
+	}
+	
+	@Override
+	public String getUserName() {
+		return msoProperties.get("sdno.health-check.dmaap.username");
+	}
+
+	@Override
+	public String getPassword() {
+		return msoProperties.get("sdno.health-check.dmaap.password");
+	}
+
+	@Override
+	public String getTopic() {
+		return msoProperties.get("sdno.health-check.dmaap.subscriber.topic");
+	}
+
+	@Override
+	public boolean continuePolling() {
+		return continuePolling;
+	}
+	
+	@Override
+	public void stopProcessingMessages() {
+		continuePolling = false;
+	}
+	@Override
+	public void processMessage(String message) throws Exception {
+		if (isHealthDiagnostic(message, this.getRequestId())) {
+			if (!healthDiagnosticSuccessful(message)) {
+				Optional<String> statusMessage = this.getStatusMessage(message);
+				if (statusMessage.isPresent()) {
+					throw new SDNOException("failed with message " + statusMessage.get());
+				} else {
+					throw new SDNOException("failed with no status message");
+				}
+			} else {
+				auditLogger.info("successful health diagnostic found for request: " + this.getRequestId());
+				stopProcessingMessages();
+			}
+		}
+	}
+	
+	@Override
+	public boolean isAccepted(String message) {
+		if (isResultInfo(message)) {
+			Optional<String> code = isAccepted(message, this.getRequestId());
+			if (code.isPresent()) {
+				if ("202".equals(code.get())) {
+					return true;
+				} else {
+					//TODO check other statuses 400 and 500
+				}
+			} else {
+				//TODO throw error
+			}
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public boolean isFailure(String message) {
+		if (isResultInfo(message)) {
+			Optional<String> code = isFailure(message, this.getRequestId());
+			if (code.isPresent()) {
+				if ("500".equals(code.get())) {
+					return true;
+				} else {
+					//TODO check other statuses 400 and 500
+				}
+			} else {
+				//TODO throw error
+			}
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public String getRequestId() {
+		return uuid;
+	}
+	
+	protected Optional<String> isAccepted(String json, String uuid) {
+		return JsonPathUtil.getInstance().locateResult(json, String.format("$.result-info[?(@.status=='ACCEPTED' && @.request-id=='%s')].code", uuid));
+	}
+	
+	protected Optional<String> isFailure(String json, String uuid) {
+		return JsonPathUtil.getInstance().locateResult(json, String.format("$.result-info[?(@.status=='FAILURE' && @.request-id=='%s')].code", uuid));
+	}
+	
+	protected boolean isResultInfo(String json) {
+		return JsonPathUtil.getInstance().pathExists(json, "$[?(@.result-info)]");
+	}
+	
+	protected boolean isHealthDiagnostic(String json, String uuid) {
+		return JsonPathUtil.getInstance().pathExists(json, String.format("$[?(@.result-info.request-id=='%s')].%s", uuid, healthDiagnosticPath));
+	}
+	
+	protected boolean healthDiagnosticSuccessful(String json) {
+		return JsonPathUtil.getInstance().pathExists(json, "$." + healthDiagnosticPath + "[?(@.response-status=='Success')]");
+	}
+	
+	protected Optional<String> getStatusMessage(String json) {
+		return JsonPathUtil.getInstance().locateResult(json, "$." + healthDiagnosticPath + ".error-message");
+	}
+	
+	@Override
+	public int getMaximumElapsedTime() {
+		return 300000;
+	}
+}
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java
index 4f6ead0299..73f06b8e58 100644
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java
@@ -1,54 +1,50 @@
-/*-
- * ============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.openecomp.camunda.bpmn.plugin.urnmap;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.camunda.bpm.cockpit.plugin.spi.impl.AbstractCockpitPlugin;
-import org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNMapPluginRootResource;
-
- 
-
-public class URNMapPlugin  extends AbstractCockpitPlugin{
-	public static final String ID = "urnMap-plugin";
-	  
-	  @Override
-	  public String getId() {
-	    return ID;
-	  }
-
-	  @Override
-	  public Set<Class<?>> getResourceClasses() {
-	    Set<Class<?>> classes = new HashSet<>();
-
-	    classes.add(URNMapPluginRootResource.class);
-
-	    return classes;
-	  }
-
-	  @Override
-	  public List<String> getMappingFiles() {
-		  return Arrays.asList("org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml");
-	  }
-}
+/*-
+ * ============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.openecomp.mso.client.sdno.dmaap;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.openecomp.mso.client.dmaap.DmaapPublisher;
+
+public class SDNOHealthCheckDmaapPublisher extends DmaapPublisher {
+	
+	public SDNOHealthCheckDmaapPublisher() throws FileNotFoundException, IOException {
+		super();
+	}
+	
+	@Override
+	public String getUserName() {
+		return msoProperties.get("sdno.health-check.dmaap.username");
+	}
+
+	@Override
+	public String getPassword() {
+		return msoProperties.get("sdno.health-check.dmaap.password");
+	}
+
+	@Override
+	public String getTopic() {
+		return msoProperties.get("sdno.health-check.dmaap.publisher.topic");
+	}
+	
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
index d328246b2c..772867d3f2 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
+++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml
@@ -22,7 +22,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <process-archive name="MSOCommonBPMN">
-        <process-engine>infrastructure</process-engine>
+        <process-engine>default</process-engine>
         <properties>
             <property name="isDeleteUponUndeploy">false</property>
             <property name="isScanForProcessDefinitions">true</property>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
index 2629ea7437..9bfd4535ea 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
@@ -50,7 +50,7 @@ completeMsoProcess.setUpdateDBstatustoSuccessPayload(execution)]]></bpmn2:script
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("CMSO_setUpdateDBstatustoSuccessPayload")}]]></camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
index 4ac34f9210..4f27e0026a 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
@@ -133,7 +133,7 @@ falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestInfraRespons
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
index e743dc754e..a8b5fcc945 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
+++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	<!--
-		=========================================================================
-		AT&T Proprietary (Internal Use Only) Not for use or disclosure outside
-		the AT&T companies except under written agreement (c) 2015 AT&T
-		Intellectual Property. All rights reserved. AT&T and the AT&T logo are
-		trademarks of AT&T Intellectual Property.
-		=======================================================================
+		============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=========================================================
 	-->
 	<!--
 		================================================================
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
index ce92a4909b..dcf52e30e5 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
+++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-		=========================================================================
-		AT&T Proprietary (Internal Use Only) Not for use or disclosure outside
-		the AT&T companies except under written agreement (c) 2015 AT&T
-		Intellectual Property. All rights reserved. AT&T and the AT&T logo are
-		trademarks of AT&T Intellectual Property.
-		=======================================================================
+		============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=========================================================
 	-->
 <!--
 		================================================================
diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/applicationContext.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index 6f61c8fbf4..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <!-- Spring bean to be invoked through the ApplicationContextElResolver -->
-
-</beans>
diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index b68ebd943c..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<jboss-deployment-structure>
-	<deployment>
-		<!-- Exclusions allow you to prevent the server from automatically adding some dependencies -->
-		<exclusions>
-			<module name="org.apache.log4j" />
-			<module name="org.slf4j" />
-			<module name="org.slf4j.impl" />
-			<module name="org.jboss.resteasy.resteasy-jackson-provider" />
-			<module name="org.jboss.resteasy.resteasy-jettison-provider" />
-		</exclusions>
-		<dependencies>
-			<module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
-			<!-- This module contain the ProviderBase class: -->
-			<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true"/>
-		</dependencies>
-	</deployment>
-</jboss-deployment-structure>
-
diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-web.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-web.xml
deleted file mode 100644
index a9a263b684..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-  
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
-<jboss-web>
-  <security-domain>other</security-domain>
-  <context-root>/mso/common</context-root>
-</jboss-web>  
diff --git a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml b/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3a42877715..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
-  <display-name>MSO Common BPMN Workflow Servlet</display-name>
-  <servlet>
-    <servlet-name>resteasy-servlet</servlet-name>
-    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
-    <init-param>
-      <param-name>javax.ws.rs.Application</param-name>
-      <param-value>org.openecomp.mso.bpmn.common.workflow.service.WorkflowResourceApplication</param-value>
-    </init-param>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>resteasy-servlet</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>/WEB-INF/applicationContext.xml</param-value>
-  </context-param>
-  <context-param>
-    <param-name>mso.configuration</param-name>
-    <param-value>MSO_PROP_TOPOLOGY=topology.properties</param-value>
-  </context-param>
-  <context-param>
-    <param-name>log.configuration</param-name>
-    <param-value>logback.bpmn.xml</param-value>
-  </context-param>
-  <context-param>
-    <param-name>resteasy.resources</param-name>
-    <param-value>org.openecomp.mso.logger.MsoLoggingServlet,org.openecomp.mso.bpmn.core.HealthCheckHandler</param-value>
-  </context-param>
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-  <filter>
-    <filter-name>LogFilter</filter-name>
-    <filter-class>org.openecomp.mso.logger.LogFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>LogFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>HTTPBasicAuth</web-resource-name>
-      <description>Authentication for Client Apps</description>
-      <url-pattern>/workflow/*</url-pattern>
-      <http-method>GET</http-method>
-      <http-method>POST</http-method>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>BPMN-Client</role-name>
-    </auth-constraint>
-  </security-constraint>
-  <login-config>
-    <auth-method>BASIC</auth-method>
-    <realm-name>ApplicationRealm</realm-name>
-  </login-config>
-  <security-role>
-    <role-name>BPMN-Client</role-name>
-  </security-role>
-</web-app>
-\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
new file mode 100644
index 0000000000..2b63100510
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtilsTest.groovy
@@ -0,0 +1,180 @@
+/*- 
+ * ============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.openecomp.mso.bpmn.common.scripts;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import org.junit.Before
+import org.junit.Test
+import org.camunda.bpm.engine.delegate.BpmnError
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.runtime.Execution
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
+
+import org.openecomp.mso.bpmn.mock.FileUtil
+
+public class SDNCAdapterUtilsTest {
+	
+	private def map
+	private ExecutionEntity svcex
+	private WorkflowException wfex
+	private AbstractServiceTaskProcessor tp
+	private String resp
+	private SDNCAdapterUtils utils
+	
+	@Before
+	public void init()
+	{
+		map = new HashMap<String,Object>()
+		svcex = mock(ExecutionEntity.class)
+		wfex = null
+		tp = new AbstractServiceTaskProcessor() {
+			@Override
+			public void preProcessRequest(Execution execution) {
+			}
+		};
+		utils = new SDNCAdapterUtils(tp)
+		
+		// svcex gets its variables from "map"
+		when(svcex.getVariable(any())).thenAnswer(
+			{ invocation ->
+				return map.get(invocation.getArgumentAt(0, String.class)) })
+		
+		// svcex puts its variables into "map"
+		when(svcex.setVariable(any(), any())).thenAnswer(
+			{ invocation ->
+				return map.put(
+							invocation.getArgumentAt(0, String.class),
+							invocation.getArgumentAt(1, String.class)) })
+		
+		map.put("isDebugLogEnabled", "true")
+		map.put("prefix", "mypfx-")
+		map.put("testProcessKey", "mykey")
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_Success_NoCode() {
+		resp = """<no-response/>"""
+		
+		utils.validateSDNCResponse(svcex, resp, wfex, true)
+		
+		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("0", map.get("mypfx-sdncRequestDataResponseCode"))
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_200() {
+		utils.validateSDNCResponse(svcex, makeResp("200", "OK", ""), wfex, true)
+		
+		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_408() {
+		try {
+			utils.validateSDNCResponse(svcex, makeResp("408", "failed", ""), wfex, true)
+			
+			// this has been commented out as, currently, the code doesn't
+			// throw an exception in this case
+//			fail("missing exception")
+			
+		} catch(BpmnError ex) {
+			ex.printStackTrace()
+		}
+		
+		assertEquals(false, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("408", map.get("mypfx-sdncRequestDataResponseCode"))
+		
+		wfex = map.get("WorkflowException")
+		assertNotNull(wfex)
+		
+		assertEquals(5320, wfex.getErrorCode())
+		assertEquals("Received error from SDN-C: failed", wfex.getErrorMessage())
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_408_200() {
+		
+		utils.validateSDNCResponse(svcex, makeResp("408", "failed", makeReq("200", "ok")), wfex, true)
+		
+		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))		
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+				  								
+	@Test
+	public void testValidateSDNCResponse_408_200_WithEmbeddedLt() {
+		
+		utils.validateSDNCResponse(svcex, makeResp("408", "failed", makeReq("200", "<success> message")), wfex, true)
+		
+		assertEquals(true, map.get("mypfx-sdncResponseSuccess"))
+		assertEquals("200", map.get("mypfx-sdncRequestDataResponseCode"))		
+		assertFalse(map.containsKey("WorkflowException"))
+	}
+	
+	
+	private String makeResp(String respcode, String respmsg, String reqdata) {
+		def rc = encodeXml(respcode)
+		def rm = encodeXml(respmsg)
+		
+		return """
+<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
+                                                 xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"
+                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <sdncadapterworkflow:response-data>
+      <tag0:CallbackHeader>
+         <tag0:RequestId>myreq</tag0:RequestId>
+         <tag0:ResponseCode>${rc}</tag0:ResponseCode>
+         <tag0:ResponseMessage>${rm}</tag0:ResponseMessage>
+      </tag0:CallbackHeader>
+	  ${reqdata}
+   </sdncadapterworkflow:response-data>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
+"""
+	
+	}
+	
+	private String makeReq(String respcode, String respmsg) {
+		def rc = encodeXml(respcode)
+		def rm = encodeXml(respmsg)
+		
+		def output = """
+<output xmlns="org:onap:sdnc:northbound:generic-resource">
+		<svc-request-id>8b46e36e-b44f-4085-9404-427be1bc8a3</svc-request-id>
+		<response-code>${rc}</response-code>
+		<response-message>${rm}</response-message>
+		<ack-final-indicator>Y</ack-final-indicator>
+</output>
+"""
+		output = encodeXml(output)
+		
+		return """<tag0:RequestData xsi:type="xs:string">${output}</tag0:RequestData>"""
+	}
+	
+	private String encodeXml(String txt) {
+		return txt.replace("&", "&amp;").replace("<", "&lt;")
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
index f60d984a6d..eef9ed8ee0 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
@@ -42,7 +42,6 @@ import org.camunda.bpm.engine.variable.impl.VariableMapImpl;
 import org.jboss.resteasy.spi.AsynchronousResponse;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncCommonResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
@@ -201,7 +200,7 @@ public class BPMNUtil {
 	 * @param variables
 	 */
 	private static void executeAsyncFlow(ProcessEngineServices processEngineServices, String processKey, AsynchronousResponse asyncResponse, Map<String,String> variables) {
-		WorkflowAsyncResource workflowResource = new WorkflowAsyncCommonResource();
+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();
 		VariableMapImpl variableMap = new VariableMapImpl();
 
 		Map<String, Object> variableValueType = new HashMap<String, Object>();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
index 7c9247addb..8281687dec 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
@@ -40,6 +40,11 @@ import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
  */
 public class FalloutHandlerTest extends WorkflowTest {
 	private void setupMocks() {
+		stubFor(post(urlEqualTo("/dbadapters/MsoRequestsDbAdapter"))
+				.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBody("<DbTag>Notified</DbTag>")));
 		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
 				.willReturn(aResponse()
 				.withStatus(200)
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
index 51a1484cf9..426bceef4b 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
@@ -31,7 +31,7 @@ import org.camunda.bpm.engine.test.Deployment;
 import org.camunda.bpm.engine.variable.impl.VariableMapImpl;
 import org.jboss.resteasy.spi.AsynchronousResponse;
 import org.junit.Test;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncCommonResource;
+import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
 
 public class WorkflowAsyncResourceTest extends WorkflowTest {
@@ -53,7 +53,7 @@ public class WorkflowAsyncResourceTest extends WorkflowTest {
 	}
 
 	private void executeWorkflow(String request, String requestId, AsynchronousResponse asyncResponse, String processKey) {
-		WorkflowAsyncCommonResource workflowResource = new WorkflowAsyncCommonResource();
+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();
 		VariableMapImpl variableMap = new VariableMapImpl();
 
 		Map<String, Object> variableValueType = new HashMap<String, Object>();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
index 63403f40ce..15dc4f4609 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
@@ -75,7 +75,6 @@ import org.openecomp.mso.bpmn.common.adapter.vnf.UpdateVnfNotification;
 import org.openecomp.mso.bpmn.common.adapter.vnf.VnfRollback;
 import org.openecomp.mso.bpmn.common.workflow.service.SDNCAdapterCallbackServiceImpl;
 import org.openecomp.mso.bpmn.common.workflow.service.VnfAdapterNotifyServiceImpl;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncCommonResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
@@ -273,7 +272,7 @@ public class WorkflowTest {
 		VariableMapImpl variableMapImpl = createVariableMapImpl(variables);
 
 		System.out.println("Sending " + request + " to " + processKey + " process");
-		WorkflowAsyncResource workflowResource = new WorkflowAsyncCommonResource();
+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();
 		workflowResource.setProcessEngineServices4junit(processEngineRule);
 
 		TestAsyncResponse asyncResponse = new TestAsyncResponse();
@@ -306,7 +305,7 @@ public class WorkflowTest {
 		VariableMapImpl variableMapImpl = createVariableMapImpl(variables);
 
 		System.out.println("Sending " + request + " to " + processKey + " process");
-		WorkflowAsyncResource workflowResource = new WorkflowAsyncCommonResource();
+		WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();
 		workflowResource.setProcessEngineServices4junit(processEngineRule);
 
 		TestAsyncResponse asyncResponse = new TestAsyncResponse();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java
new file mode 100644
index 0000000000..2ebb44a644
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java
@@ -0,0 +1,80 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.openecomp.mso.logger.MsoLogger;
+
+/**
+ * 
+ * File utility class.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version     ONAP  Sep 15, 2017
+ */
+public class FileUtil {
+
+    private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+    
+    private FileUtil() {
+        /**
+         * Constructor.
+         */
+    }
+	/**
+	 * Read the specified resource file and return the contents as a String.
+	 * 
+	 * @param fileName Name of the resource file
+	 * @return the contents of the resource file as a String
+	 * @throws IOException if there is a problem reading the file
+	 */
+	public static String readResourceFile(String fileName) {
+		InputStream stream;
+		try {
+			stream = getResourceAsStream(fileName);
+			byte[] bytes;
+			bytes = new byte[stream.available()];
+			stream.read(bytes);
+			stream.close();
+			return new String(bytes);
+		} catch (IOException e) {
+		    LOGGER.debug("Exception:", e);
+			return "";
+		}
+	}
+	
+	/**
+	 * Get an InputStream for the resource specified.
+	 * 
+	 * @param resourceName Name of resource for which to get InputStream.
+	 * @return an InputStream for the resource specified.
+	 * @throws IOException If we can't get the InputStream for whatever reason.
+	 */
+	private static InputStream getResourceAsStream(String resourceName) throws IOException {
+		InputStream stream =
+				FileUtil.class.getClassLoader().getResourceAsStream(resourceName);
+		if (stream == null) {
+			throw new IOException("Can't access resource '" + resourceName + "'");
+		}
+		return stream;
+	}		
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResource.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResource.java
new file mode 100644
index 0000000000..fc97e69c5c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResource.java
@@ -0,0 +1,205 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+
+/**
+ * 
+ * Mock Resource which is used to start, stop the WireMock Server
+ * Also up to 50 mock properties can be added at run-time to change the properties used in transformers such as sdnc_delay in SDNCAdapterMockTransformer
+ * You can also selectively setup a stub (use reset before setting up), reset all stubs
+ */
+@Path("/server")
+public class MockResource {
+
+	private boolean started = false;
+	private final Integer defaultPort = 28090;
+	private WireMockServer wireMockServer = null;
+	private static Map<String,String> mockProperties = new HashMap<String,String>();
+
+	public static String getMockProperties(String key) {
+		return mockProperties.get(key);
+	}
+
+	private synchronized void initMockServer(int portNumber) {
+		String path = FileUtil.class.getClassLoader().getResource("__files/sdncSimResponse.xml").getFile();
+		path = path.substring(0,path.indexOf("__files/"));
+
+		wireMockServer = new WireMockServer(wireMockConfig().port(portNumber).extensions("org.openecomp.mso.bpmn.mock.SDNCAdapterMockTransformer")
+																			.extensions("org.openecomp.mso.bpmn.mock.SDNCAdapterNetworkTopologyMockTransformer")
+																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterCreateMockTransformer")
+																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterDeleteMockTransformer")
+																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterUpdateMockTransformer")
+																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterRollbackMockTransformer")
+																			.extensions("org.openecomp.mso.bpmn.mock.VnfAdapterQueryMockTransformer"));
+																			//.withRootDirectory(path));
+		//Mocks were failing - commenting out for now, both mock and transformers seem to work fine
+		WireMock.configureFor("localhost", portNumber);
+		wireMockServer.start();
+//		StubResponse.setupAllMocks();
+		started= true;
+	}
+
+	public static void main(String [] args) {
+		MockResource mockresource = new MockResource();
+		mockresource.start(28090);
+		mockresource.reset();
+//		mockresource.setupStub("MockCreateTenant");
+	}
+	
+	/**
+	 * Starts the wiremock server in default port
+	 * @return
+	 */
+	@GET
+	@Path("/start")
+	@Produces("application/json")
+	public Response start() {
+		return startMockServer(defaultPort);
+	}
+
+	private Response startMockServer(int port) {
+		if (!started) {
+			initMockServer(defaultPort);
+			System.out.println("Started Mock Server in port " + port);
+			return Response.status(200).entity("Started Mock Server in port " + port).build();
+		} else {
+			return Response.status(200).entity("Mock Server is already running").build();
+		}
+	}
+
+	/**
+	 * Starts the wiremock server in a different port
+	 * @param portNumber
+	 * @return
+	 */
+	@GET
+	@Path("/start/{portNumber}")
+	@Produces("application/json")
+	public Response start(@PathParam("portNumber") Integer portNumber) {
+		if (portNumber == null) portNumber = defaultPort;
+		return startMockServer(portNumber.intValue());
+	}
+
+
+	/**
+	 * Stop the wiremock server
+	 * @return
+	 */
+	@GET
+	@Path("/stop")
+	@Produces("application/json")
+	public synchronized Response stop() {
+		if (wireMockServer.isRunning()) {
+			wireMockServer.stop();
+			started = false;
+			return Response.status(200).entity("Stopped Mock Server in port ").build();
+		}
+		return Response.status(200).entity("Mock Server is not running").build();
+	}
+
+
+	/**
+	 * Return list of mock properties
+	 * @return
+	 */
+	@GET
+	@Path("/properties")
+	@Produces("application/json")
+	public Response getProperties() {
+		return Response.status(200).entity(mockProperties).build();
+	}
+
+	/**
+	 * Update a particular mock property at run-time
+	 * @param name
+	 * @param value
+	 * @return
+	 */
+	@POST
+	@Path("/properties/{name}/{value}")
+	public Response updateProperties(@PathParam("name") String name, @PathParam("value") String value) {
+		if (mockProperties.size() > 50) return Response.serverError().build();
+		mockProperties.put(name, value);
+		return Response.status(200).build();
+	}
+
+	/**
+	 * Reset all stubs
+	 * @return
+	 */
+	@GET
+	@Path("/reset")
+	@Produces("application/json")
+	public Response reset() {
+		WireMock.reset();
+		return Response.status(200).entity("Wiremock stubs are reset").build();
+	}
+
+	
+	/**
+	 * Setup a stub selectively
+	 * Prior to use, make sure that stub method is available in StubResponse class
+	 * @param methodName
+	 * @return
+	 */
+	
+	// commenting for now until we figure out a way to use new StubResponse classes to setupStubs
+//	@GET
+//	@Path("/stub/{methodName}")
+//	@Produces("application/json")
+//	public Response setupStub(@PathParam("methodName") String methodName) {
+//		
+//	    @SuppressWarnings("rawtypes")
+//		Class params[] = {};
+//	    Object paramsObj[] = {};
+//
+//	    try {
+//			Method thisMethod = StubResponse.class.getDeclaredMethod(methodName, params);
+//			try {
+//				thisMethod.invoke(StubResponse.class, paramsObj);
+//			} catch (IllegalAccessException | IllegalArgumentException
+//					| InvocationTargetException e) {
+//				return Response.status(200).entity("Error invoking " + methodName ).build();
+//			}
+//		} catch (NoSuchMethodException | SecurityException e) {
+//			return Response.status(200).entity("Stub " + methodName + " not found...").build();
+//		}		
+//		return Response.status(200).entity("Successfully invoked " + methodName).build();
+//	}
+	
+	
+	public static Map<String,String> getMockProperties(){
+		return mockProperties;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResourceApplication.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResourceApplication.java
new file mode 100644
index 0000000000..ebbfea5cd1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResourceApplication.java
@@ -0,0 +1,50 @@
+/* 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+/**
+ * 
+ * JAX RS Application wiring for Mock Resource
+ */
+@ApplicationPath("/console")
+public class MockResourceApplication extends Application {
+
+	private Set<Object> singletons = new HashSet<Object>();
+	private Set<Class<?>> classes = new HashSet<Class<?>>();
+
+	public MockResourceApplication() {
+		singletons.add(new MockResource());
+	}
+
+	@Override
+	public Set<Class<?>> getClasses() {
+		return classes;
+	}
+
+	@Override
+	public Set<Object> getSingletons() {
+		return singletons;
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java
new file mode 100644
index 0000000000..9c4e7936b1
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterMockTransformer.java
@@ -0,0 +1,140 @@
+/* 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+
+import org.openecomp.mso.logger.MsoLogger;
+/**
+ * 
+ * Simulates SDNC Adapter Callback response
+ *
+ */
+public class SDNCAdapterMockTransformer extends ResponseTransformer {
+
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	private String callbackResponse;
+	private String requestId;
+	
+	public SDNCAdapterMockTransformer() {
+		callbackResponse = FileUtil.readResourceFile("__files/sdncSimResponse.xml");
+	}
+
+	public SDNCAdapterMockTransformer(String requestId) {
+		this.requestId = requestId;
+	}
+	
+	public String name() {
+		return "sdnc-adapter-transformer";
+	}
+
+	/**
+	 * Grab the incoming request xml,extract the request id and replace the stub response with the incoming request id
+	 * so that callback response can be correlated
+	 * 
+	 * Mock Resource can be used to add dynamic properties. If sdnc_delay is not in the list by default waits for 300ms before
+	 * the callback response is sent
+	 */
+	@Override
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
+			FileSource fileSource) {
+		String requestBody = request.getBodyAsString();
+		
+		String callbackUrl = requestBody.substring(requestBody.indexOf("<sdncadapter:CallbackUrl>")+25, requestBody.indexOf("</sdncadapter:CallbackUrl>"));
+		String requestId = requestBody.substring(requestBody.indexOf("<sdncadapter:RequestId>")+23, requestBody.indexOf("</sdncadapter:RequestId>"));
+
+		callbackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());
+		System.out.println("callbackResponse:" + callbackResponse);
+		
+		if (this.requestId != null) {
+			callbackResponse = callbackResponse.replace(this.requestId, requestId);
+		} else {
+			callbackResponse = callbackResponse.replace("testRequestId", requestId);
+		}
+		
+
+		Object sdncDelay = MockResource.getMockProperties().get("sdnc_delay");
+		int delay = 300;
+		if (sdncDelay != null) {
+			delay = Integer.parseInt(sdncDelay.toString());
+		}
+		
+		//Kick off callback thread
+		System.out.println("callback Url:" + callbackUrl + ":delay:" + delay);
+		CallbackResponseThread calbackResponseThread = new CallbackResponseThread(callbackUrl,callbackResponse, delay);
+		calbackResponseThread.start();
+		
+		//return 200 OK with empty body
+		return ResponseDefinitionBuilder
+                .like(responseDefinition).but()
+                .withStatus(200).withBody("").withHeader("Content-Type", "text/xml")
+                .build();
+	}
+
+	@Override
+	public boolean applyGlobally() {
+	    return false;
+	}
+	
+	/**
+	 * 
+	 * Callback response thread which sends the callback response asynchronously
+	 *
+	 */
+	private class CallbackResponseThread extends Thread {
+		
+		private String callbackUrl;
+		private String payLoad;
+		private int delay;
+		
+		public CallbackResponseThread(String callbackUrl, String payLoad, int delay) {
+			this.callbackUrl = callbackUrl;
+			this.payLoad = payLoad;
+			this.delay = delay;
+		}
+		
+		public void run () {
+			try {
+				//Delay sending callback response
+				sleep(delay);
+			} catch (InterruptedException e1) {
+				LOGGER.debug("Exception :",e1);
+			}
+			LOGGER.debug("Sending callback response:" + callbackUrl);
+			ClientRequest request = new ClientRequest(callbackUrl);
+			request.body("text/xml", payLoad);
+			System.err.println(payLoad);
+			try {
+				ClientResponse result = request.post();
+				//System.err.println("Successfully posted callback:" + result.getStatus());
+			} catch (Exception e) {
+				LOGGER.debug("Exception :",e);
+			}
+		}
+		
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
new file mode 100644
index 0000000000..e59e3b67d2
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/SDNCAdapterNetworkTopologyMockTransformer.java
@@ -0,0 +1,132 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+
+import org.openecomp.mso.logger.MsoLogger;
+
+public class SDNCAdapterNetworkTopologyMockTransformer extends ResponseTransformer {
+
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	
+	private String callbackResponse;
+	private String requestId;
+	
+	public SDNCAdapterNetworkTopologyMockTransformer() {
+		callbackResponse = ""; // FileUtil.readResourceFile("__files/sdncDeleteNetworkTopologySimResponse.xml");
+	}
+
+	public SDNCAdapterNetworkTopologyMockTransformer(String requestId) {
+		this.requestId = requestId;
+	}
+	
+	public String name() {
+		return "network-topology-operation-transformer";
+	}
+
+	@Override
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition, FileSource fileSource) {
+		String requestBody = request.getBodyAsString();
+		
+		String callbackUrl = requestBody.substring(requestBody.indexOf("<sdncadapter:CallbackUrl>")+25, requestBody.indexOf("</sdncadapter:CallbackUrl>"));
+		String requestId = requestBody.substring(requestBody.indexOf("<sdncadapter:RequestId>")+23, requestBody.indexOf("</sdncadapter:RequestId>"));
+		System.out.println("request callbackUrl : " + callbackUrl);
+		System.out.println("request requestId : " + requestId);
+		
+		System.out.println("file path/name : " + responseDefinition.getBodyFileName());
+		callbackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());		
+		// extract Response responseRequestId
+		String responseRequestId = callbackResponse.substring(callbackResponse.indexOf("<RequestId>")+11, callbackResponse.indexOf("</RequestId>"));
+		System.out.println("response requestId: " + responseRequestId);		
+		System.out.println("callbackResponse (before): " + callbackResponse);
+		callbackResponse = callbackResponse.replace(responseRequestId, requestId);				
+		if (this.requestId != null) {
+			callbackResponse = callbackResponse.replace(this.requestId, requestId);
+		} else {
+			callbackResponse = callbackResponse.replace(responseRequestId, requestId);
+		}	
+		System.out.println("callbackResponse (after):" + callbackResponse);		
+
+		Object sdncDelay = MockResource.getMockProperties().get("sdnc_delay");
+		int delay = 300;
+		if (sdncDelay != null) {
+			delay = Integer.parseInt(sdncDelay.toString());
+		}
+		
+		//Kick off callback thread
+		System.out.println("(NetworkTopologyMockTransformer) callback Url:" + callbackUrl + ":delay:" + delay);
+		CallbackResponseThread calbackResponseThread = new CallbackResponseThread(callbackUrl,callbackResponse, delay);
+		calbackResponseThread.start();
+		
+		//return 200 OK with body
+		return ResponseDefinitionBuilder
+                .like(responseDefinition).but()
+                .withStatus(200).withBody(callbackResponse).withHeader("Content-Type", "text/xml")
+                .build();
+	}
+
+	@Override
+	public boolean applyGlobally() {
+	    return false;
+	}
+	
+	private class CallbackResponseThread extends Thread {
+		
+		private String callbackUrl;
+		private String payLoad;
+		private int delay;
+		
+		public CallbackResponseThread(String callbackUrl, String payLoad, int delay) {
+			this.callbackUrl = callbackUrl;
+			this.payLoad = payLoad;
+			this.delay = delay;
+		}
+		
+		public void run () {
+			try {
+				//Delay sending callback response
+				sleep(delay);
+			} catch (InterruptedException e1) {
+				// TODO Auto-generated catch block
+				LOGGER.debug("Exception :",e1);
+			}
+			LOGGER.debug("Sending callback response to url: " + callbackUrl);
+			ClientRequest request = new ClientRequest(callbackUrl);
+			request.body("text/xml", payLoad);
+			//System.err.println(payLoad);
+			try {
+				ClientResponse result = request.post();
+				LOGGER.debug("Successfully posted callback? Status: " + result.getStatus());
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+			    LOGGER.debug("catch error in - request.post() ");
+				LOGGER.debug("Exception :",e);
+			}
+		}
+		
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java
new file mode 100644
index 0000000000..f9a6543387
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseAAI.java
@@ -0,0 +1,1069 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.patch;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+
+/**
+ * Reusable Mock StubResponses for AAI Endpoints
+ *
+ */
+public class StubResponseAAI {
+
+	public static void setupAllMocks() {
+
+	}
+
+
+	/**
+	 * Tunnel-XConnect Mock Stub Response
+	 */
+	public static void MockPutTunnelXConnect(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId, String tunnelId){
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId + "/tunnel-xconnects/tunnel-xconnect/" + tunnelId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+
+	/**
+	 * Allotted Resource Mock StubResponses below
+	 */
+	public static void MockGetAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockPutAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+	public static void MockPutAllottedResource_500(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+	
+	public static void MockDeleteAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId, String resourceVersion) {
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId + "[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+						.withStatus(204)));
+	}
+	
+	public static void MockPatchAllottedResource(String globalCustId, String subscriptionType, String serviceInstanceId, String allottedResourceId) {
+		stubFor(patch(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId + "/allotted-resources/allotted-resource/" + allottedResourceId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+	public static void MockQueryAllottedResourceById(String allottedResourceId, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=allotted-resource[&]filter=id:EQUALS:" + allottedResourceId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+
+	/**
+	 * Service Instance Mock StubResponses below
+	 */
+	public static void MockGetServiceInstance(String globalCustId, String subscriptionType, String serviceInstanceId, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockGetServiceInstance_404(String customer, String serviceSubscription, String serviceInstanceId){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
+						.willReturn(aResponse()
+						.withStatus(404)));
+	}
+
+	public static void MockGetServiceInstance_500(String customer, String serviceSubscription, String serviceInstanceId){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
+						.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+	public static void MockGetServiceInstance_500(String customer, String serviceSubscription, String serviceInstanceId, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId))
+						.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockNodeQueryServiceInstanceByName(String serviceInstanceName, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance[&]filter=service-instance-name:EQUALS:" + serviceInstanceName))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockNodeQueryServiceInstanceByName_404(String serviceInstanceName){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-name:EQUALS:" + serviceInstanceName))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+
+	public static void MockNodeQueryServiceInstanceByName_500(String serviceInstanceName){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-name:EQUALS:" + serviceInstanceName))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+	public static void MockNodeQueryServiceInstanceById(String serviceInstanceId, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance[&]filter=service-instance-id:EQUALS:" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockNodeQueryServiceInstanceById_404(String serviceInstanceId){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+
+	public static void MockNodeQueryServiceInstanceById_500(String serviceInstanceId){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/nodes-query[?]search-node-type=service-instance&filter=service-instance-id:EQUALS:" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+	public static void MockDeleteServiceInstance(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+				  .willReturn(aResponse()
+				  .withStatus(204)));
+	}
+	
+	public static void MockGetServiceInstance(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion, int statusCode){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)));
+	}
+	
+	public static void MockGetServiceInstance(String customer, String serviceSubscription, String resourceVersion, int statusCode){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "[?]resource-version=" + resourceVersion))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "text/xml")));
+	}
+	
+	public static void MockDeleteServiceInstance(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion, int statusCode){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+						.withStatus(statusCode)));
+	}
+	
+	public static void MockDeleteServiceInstance(String customer, String serviceSubscription, String resourceVersion, int statusCode){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "[?]resource-version=" +1234))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)));
+	}
+
+	public static void MockDeleteServiceInstance_404(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+				 .willReturn(aResponse()
+				  .withStatus(404)));
+	}
+
+	public static void MockDeleteServiceInstance_500(String customer, String serviceSubscription, String serviceInstanceId, String resourceVersion){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + customer + "/service-subscriptions/service-subscription/" + serviceSubscription + "/service-instances/service-instance/" + serviceInstanceId + "[?]resource-version=" + resourceVersion))
+				 .willReturn(aResponse()
+				  .withStatus(500)));
+	}
+
+	public static void MockPutServiceInstance(String globalCustId, String subscriptionType, String serviceInstanceId, String responseFile) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockPutServiceInstance_500(String globalCustId, String subscriptionType, String serviceInstanceId) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+	/**
+	 * Service-Subscription Mock StubResponses below
+	 */
+	public static void MockGetServiceSubscription(String globalCustId, String subscriptionType, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockDeleteServiceSubscription(String globalCustId, String subscriptionType, int statusCode) {
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+				.willReturn(aResponse()
+						.withStatus(statusCode)));
+	}
+
+	public static void MockDeleteServiceInstanceId(String globalCustId, String subscriptionType, String serviceInstanceId) {
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType + "/service-instances/service-instance/" + serviceInstanceId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+	public static void MockPutServiceSubscription(String globalCustId, String subscriptionType) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	
+	public static void MockGetServiceSubscription(String globalCustId, String subscriptionType, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId + "/service-subscriptions/service-subscription/" + subscriptionType))
+				.willReturn(aResponse()
+				.withStatus(statusCode)));
+	}
+
+	/**
+	 * Customer Mock StubResponses below
+	 */
+	public static void MockGetCustomer(String globalCustId, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockDeleteCustomer(String globalCustId) {
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+	public static void MockPutCustomer(String globalCustId) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+	public static void MockPutCustomer_500(String globalCustId) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/" + globalCustId))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+
+	/**
+	 * Generic-Vnf Mock StubResponses below
+	 */
+	
+	public static void MockGetGenericVnfById(String vnfId, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetGenericVnfById(String vnfId, String responseFile, int statusCode){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetGenericVnfByIdWithPriority(String vnfId, int statusCode, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+				.atPriority(1)
+				.willReturn(aResponse()
+					.withStatus(statusCode)
+					.withHeader("Content-Type", "text/xml")
+					.withBodyFile(responseFile)));	
+	}
+	
+	public static void MockGetGenericVnfByIdWithPriority(String vnfId, String vfModuleId, int statusCode, String responseFile, int priority) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+				.atPriority(priority)
+				.willReturn(aResponse()
+					.withStatus(statusCode)
+					.withHeader("Content-Type", "text/xml")
+					.withBodyFile(responseFile)));	
+	}
+
+	public static void MockGetGenericVnfByIdWithDepth(String vnfId, int depth, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]depth=" + depth))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetGenericVnfById_404(String vnfId){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+
+	public static void MockGetGenericVnfById_500(String vnfId){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+	public static void MockGetGenericVnfByName(String vnfName, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetGenericVnfByNameWithDepth(String vnfName, int depth, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName + "[&]depth=" + depth))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockGetGenericVnfByName_404(String vnfName){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=" + vnfName))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+
+	public static void MockDeleteGenericVnf(String vnfId, String resourceVersion){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+						.withStatus(204)));
+	}
+
+	public static void MockDeleteGenericVnf(String vnfId, String resourceVersion, int statusCode){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+						.withStatus(statusCode)));
+	}
+
+	public static void MockDeleteGenericVnf_500(String vnfId, String resourceVersion){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+	public static void MockPutGenericVnf(String vnfId){
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	
+	public static void MockPutGenericVnf(String vnfId, String requestBodyContaining, int statusCode) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+				.withRequestBody(containing(requestBodyContaining))
+				.willReturn(aResponse()
+					.withStatus(statusCode)));
+	}
+
+	public static void MockPutGenericVnf(String vnfId, int statusCode) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf" + vnfId))
+				.willReturn(aResponse()
+					.withStatus(statusCode)));
+	}
+	
+	public static void MockPutGenericVnf_Bad(String vnfId, int statusCode){
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(statusCode)));
+	}
+
+	public static void MockPatchGenericVnf(String vnfId){
+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	/**
+	 * Vce Mock StubResponses below
+	 */
+	public static void MockGetVceById(String vnfId, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockGetVceByName(String vnfName, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=" + vnfName))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockDeleteVce(String vnfId, String resourceVersion, int statusCode){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId + "[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+						.withStatus(statusCode)));
+	}
+
+	public static void MockPutVce(String vnfId){
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/vces/vce/" + vnfId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	
+	public static void MockGetGenericVceByNameWithDepth(String vnfName, int depth, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=" + vnfName + "[&]depth=" + depth))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockGetVceGenericQuery(String serviceInstanceName, int depth, int statusCode, String responseFile){
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/generic-query[?]key=service-instance.service-instance-name:" + serviceInstanceName + "[&]start-node-type=service-instance[&]include=vce[&]depth=" + depth))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	/**
+	 * Tenant Mock StubResponses below
+	 */
+	public static void MockGetTenantGenericQuery(String customer, String serviceType, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/search/generic-query[?]key=customer.global-customer-id:" + customer + "&key=service-subscription.service-type:" + serviceType + "&start-node-type=service-subscription&include=tenant&include=service-subscription&depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void MockGetTenant(String tenantId, String responseFile) {
+		stubFor(get(urlEqualTo("/aai/v2/cloud-infrastructure/tenants/tenant/" + tenantId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+
+	/**
+	 * Network Mock StubResponses below
+	 */
+	public static void MockGetNetwork(String networkId, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkByIdWithDepth(String networkId, String responseFile, String depth) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId + "[?]depth=" + depth))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkCloudRegion(String responseFile, String cloudRegion) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/"+cloudRegion))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkByName(String networkName, String responseFile) {
+		   stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name="+networkName))
+					.willReturn(aResponse()
+							.withStatus(200)
+							.withHeader("Content-Type", "text/xml")
+							.withBodyFile(responseFile)));
+	}
+
+	public static void MockGetNetworkByName_404(String responseFile, String networkName) {
+ 	stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name="+networkName))
+				.willReturn(aResponse()
+						.withStatus(404)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkCloudRegion_404(String cloudRegion) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/"+cloudRegion))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+
+	public static void MockPutNetwork(String networkId, int statusCode, String responseFile) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/" + networkId))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockPutNetwork(String networkPolicyId, String responseFile, int statusCode) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/" + networkPolicyId))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkName(String networkPolicyName, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network[?]network-name=" + networkPolicyName))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+
+	public static void MockGetNetworkVpnBinding(String responseFile, String vpnBinding) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/vpn-bindings/vpn-binding/"+vpnBinding + "[?]depth=all"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}	
+	
+	public static void MockGetNetworkPolicy(String responseFile, String policy) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/"+policy + "[?]depth=all"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkVpnBinding(String networkBindingId, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/vpn-bindings/vpn-binding/" + networkBindingId))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkPolicy(String networkPolicy, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/" + networkPolicy))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkTableReference(String responseFile, String tableReference) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/route-table-references/route-table-reference/"+tableReference + "[?]depth=all"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockPutNetworkIdWithDepth(String responseFile, String networkId, String depth) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/l3-networks/l3-network/"+networkId+"[?]depth="+depth ))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkPolicyfqdn(String networkPolicy, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy[?]network-policy-fqdn=" + networkPolicy))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetNetworkRouteTable(String networkRouteId, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/route-table-references/route-table-reference/" + networkRouteId))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockPatchVfModuleId(String vnfId, String vfModuleId) {
+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	
+	/////////////
+	
+	public static void MockVNFAdapterRestVfModule() {
+		stubFor(put(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules/supercool"))
+			.willReturn(aResponse()
+				.withStatus(202)
+				.withHeader("Content-Type", "application/xml")));
+		stubFor(post(urlMatching("/vnfs/v1/vnfs/.*/vf-modules"))
+				.willReturn(aResponse()
+					.withStatus(202)
+					.withHeader("Content-Type", "application/xml")));
+		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/skask/vf-modules"))
+			.willReturn(aResponse()
+				.withStatus(202)
+				.withHeader("Content-Type", "application/xml")));
+		stubFor(put(urlEqualTo("/vnfs/v1/volume-groups/78987"))
+			.willReturn(aResponse()
+				.withStatus(202)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void MockDBUpdateVfModule(){
+		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+			.willReturn(aResponse()
+				.withStatus(200)
+			    .withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/DBUpdateResponse.xml")));
+	}
+	
+	// start of mocks used locally and by other VF Module unit tests
+	public static void MockSDNCAdapterVfModule() {
+		// simplified the implementation to return "success" for all requests
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+//			.withRequestBody(containing("SvcInstanceId><"))
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/StandardSDNCSynchResponse.xml")));
+
+	}
+	
+	// start of mocks used locally and by other VF Module unit tests
+	public static void MockAAIVfModule() {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))
+			.atPriority(1)
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/VfModule-supercool.xml")));		
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/lukewarm"))
+			.atPriority(2)
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/VfModule-lukewarm.xml")));
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+			.atPriority(5)
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/VfModule-new.xml")));
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask[?]depth=1"))
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/GenericVnf.xml")));
+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool"))
+//			.withRequestBody(containing("PCRF"))
+			.willReturn(aResponse()
+				.withStatus(200)));
+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+//				.withRequestBody(containing("PCRF"))
+				.willReturn(aResponse()
+					.withStatus(200)));
+		// HTTP PUT stub still used by CreateAAIvfModuleVolumeGroup
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+				.withRequestBody(containing("PCRF"))
+				.willReturn(aResponse()
+					.withStatus(200)));
+		// HTTP PUT stub still used by DoCreateVfModuleTest
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/.*"))
+				.withRequestBody(containing("MODULELABEL"))
+				.willReturn(aResponse()
+					.withStatus(200)));
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/ConfirmVolumeGroupTenantResponse.xml")));
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group[?]volume-group-id=78987"))
+				.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/ConfirmVolumeGroupTenantResponse.xml")));
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/MDTWNJ21/volume-groups/volume-group/78987"))
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBodyFile("VfModularity/VolumeGroup.xml")));
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/volume-groups/volume-group/78987"))
+				.willReturn(aResponse()
+					.withStatus(200)
+					.withHeader("Content-Type", "text/xml")
+					.withBodyFile("VfModularity/VolumeGroup.xml")));
+		stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/volume-groups/volume-group/78987[?]resource-version=0000020"))
+			     .willReturn(aResponse()
+			     .withStatus(200)
+			     .withHeader("Content-Type", "text/xml")
+			     .withBodyFile("DeleteCinderVolumeV1/DeleteVolumeId_AAIResponse_Success.xml")));
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/network-policies/network-policy/.*"))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile("VfModularity/AddNetworkPolicy_AAIResponse_Success.xml")));
+		stubFor(patch(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/NEWvBNGModuleId"))
+				.withRequestBody(containing("NEWvBNGModuleId"))
+				.willReturn(aResponse()
+					.withStatus(200)));
+	}
+
+	
+	
+	//////////////
+
+	/**
+	 * Cloud infrastructure below
+	 */
+	
+	public static void MockGetCloudRegion(String cloudRegionId, int statusCode, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	/**
+	 * Volume Group StubResponse below
+	 */
+	public static void MockGetVolumeGroupById(String cloudRegionId, String volumeGroupId, String responseFile) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockPutVolumeGroupById(String cloudRegionId, String volumeGroupId, String responseFile, int statusCode) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetVolumeGroupByName(String cloudRegionId, String volumeGroupName, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId + "/volume-groups[?]volume-group-name=" + volumeGroupName))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockDeleteVolumeGroupById(String cloudRegionId, String volumeGroupId, String resourceVersion, int statusCode) {
+		stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId + "[?]resource-version=" + resourceVersion))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)));
+	}
+
+	public static void MockGetVolumeGroupByName_404(String cloudRegionId, String volumeGroupName) {
+		stubFor(get(urlMatching("/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId + "/volume-groups[?]volume-group-name=" + volumeGroupName))
+				.willReturn(aResponse()
+				.withStatus(404)));
+	}
+	
+	public static void MockDeleteVolumeGroup(String cloudRegionId, String volumeGroupId, String resourceVersion) {
+		stubFor(delete(urlMatching("/aai/v[0-9]+/cloud-infrastructure/cloud-regions/cloud-region/att-aic/" + cloudRegionId + "/volume-groups/volume-group/" + volumeGroupId + "[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+				.withStatus(200)));
+	}
+	
+	/**
+	 * VF-Module StubResponse below
+	 * @param statusCode TODO
+	 */
+	public static void MockGetVfModuleId(String vnfId, String vfModuleId, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetVfModuleByNameWithDepth(String vnfId, String vfModuleName, int depth, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module[?]vf-module-name=" + vfModuleName + "[?]depth=" + depth))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetVfModuleIdNoResponse(String vnfId, String requestContaining, String vfModuleId) {
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")));
+	}
+
+	public static void MockPutVfModuleIdNoResponse(String vnfId, String requestContaining, String vfModuleId) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId +"/vf-modules/vf-module/" +vfModuleId))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+					.withStatus(200)));
+	}
+	
+	public static void MockPutVfModuleId(String vnfId, String vfModuleId) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	
+	public static void MockPutVfModuleId(String vnfId, String vfModuleId, int returnCode) {
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId))
+				.willReturn(aResponse()
+						.withStatus(returnCode)));
+	}
+	
+	public static void MockDeleteVfModuleId(String vnfId, String vfModuleId, String resourceVersion, int returnCode) {
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/" + vnfId + "/vf-modules/vf-module/" + vfModuleId + "/[?]resource-version=" + resourceVersion))
+				.willReturn(aResponse()
+						.withStatus(returnCode)));
+	}
+
+	public static void MockAAIVfModuleBadPatch(String endpoint, int statusCode) {
+		stubFor(patch(urlMatching(endpoint))
+			.willReturn(aResponse()
+				.withStatus(statusCode)));
+	}
+	
+	/* AAI Pserver Queries */
+	public static void MockGetPserverByVnfId(String vnfId, String responseFile, int statusCode) {
+		stubFor(put(urlMatching("/v10/query.*"))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "application/json")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetGenericVnfsByVnfId(String vnfId, String responseFile, int statusCode) {
+		stubFor(get(urlMatching("/v10/network/generic-vnfs/.*"))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						.withHeader("Content-Type", "application/json; charset=utf-8")
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void MockSetInMaintFlagByVnfId(String vnfId, int statusCode) {
+		stubFor(patch(urlMatching("/v10/network/generic-vnfs/.*"))
+				.willReturn(aResponse()
+						.withStatus(statusCode)
+						));
+	}
+	
+	//// Deprecated Stubs below - to be deleted once unit test that reference them are refactored to use common ones above ////
+	@Deprecated
+	public static void MockGetVceById(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123?depth=1"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericFlows/getVceResponse.xml")));
+	}
+	@Deprecated
+	public static void MockGetVceByName(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/vces/vce[?]vnf-name=testVnfName123"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericFlows/getVceByNameResponse.xml")));
+	}
+	@Deprecated
+	public static void MockPutVce(){
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123"))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	@Deprecated
+	public static void MockDeleteVce(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123[?]resource-version=testReVer123"))
+				.willReturn(aResponse()
+						.withStatus(204)));
+	}
+	@Deprecated
+	public static void MockDeleteVce_404(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/vces/vce/testVnfId123[?]resource-version=testReVer123"))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+
+	@Deprecated
+	public static void MockDeleteServiceSubscription(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET[?]resource-version=1234"))
+				  .willReturn(aResponse()
+				  .withStatus(204)));
+	}
+	@Deprecated
+	public static void MockGetServiceSubscription(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET"))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile("GenericFlows/getServiceSubscription.xml")));
+	}
+	@Deprecated
+	public static void MockGetServiceSubscription_200Empty(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET[?]resource-version=1234"))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBody(" ")));
+	}
+	@Deprecated
+	public static void MockGetServiceSubscription_404() {
+		stubFor(get(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET"))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+	@Deprecated
+	public static void MockGENPSIPutServiceInstance(){
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml")));
+	}
+
+	@Deprecated
+	public static void MockGENPSIPutServiceSubscription(){
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericPutServiceInstance/GenericPutServiceInstance_PutServiceInstance_AAIResponse_Success.xml")));
+	}
+	@Deprecated
+	public static void MockGENPSIPutServiceInstance_get500(){
+		stubFor(put(urlMatching("/aai/v[0-9]+/business/customers/customer/1604-MVM-26/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET"))
+				.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericPutServiceInstance/aaiFault.xml")));
+	}
+
+	@Deprecated
+	public static void MockGetGenericVnfById(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericFlows/getGenericVnfByNameResponse.xml")));
+	}
+	@Deprecated
+	public static void MockGetGenericVnfById_404(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+	@Deprecated
+	public static void MockGetGenericVnfByName(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericFlows/getGenericVnfResponse.xml")));
+	}
+	@Deprecated
+	public static void MockGetGenericVnfByName_hasRelationships(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericFlows/getGenericVnfResponse_hasRelationships.xml")));
+	}
+	@Deprecated
+	public static void MockGetGenericVnfById_hasRelationships(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("GenericFlows/getGenericVnfResponse_hasRelationships.xml")));
+	}
+	@Deprecated
+	public static void MockGetGenericVnfById_500(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+	@Deprecated
+	public static void MockGetGenericVnfByName_404(){
+		stubFor(get(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf[?]vnf-name=testVnfName123"))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+	@Deprecated
+	public static void MockPutGenericVnf(){
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+	@Deprecated
+	public static void MockPutGenericVnf_400(){
+		stubFor(put(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123"))
+				.willReturn(aResponse()
+						.withStatus(400)));
+	}
+	@Deprecated
+	public static void MockDeleteGenericVnf(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
+				.willReturn(aResponse()
+						.withStatus(204)));
+	}
+	@Deprecated
+	public static void MockDeleteGenericVnf_404(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
+				.willReturn(aResponse()
+						.withStatus(404)));
+	}
+	@Deprecated
+	public static void MockDeleteGenericVnf_500(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[?]resource-version=testReVer123"))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+	@Deprecated
+	public static void MockDeleteGenericVnf_412(){
+		stubFor(delete(urlMatching("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/testVnfId123[[?]]resource-version=testReVer123"))
+				.willReturn(aResponse()
+						.withStatus(412)));
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseDatabase.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseDatabase.java
new file mode 100644
index 0000000000..c9f64d9b26
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseDatabase.java
@@ -0,0 +1,102 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+/**
+ * Stub response class for Database stubs
+ * including database adapter, catalog db,
+ * and other databases.
+ */
+public class StubResponseDatabase {
+
+	public static void setupAllMocks() {
+
+	}
+
+	public static void MockUpdateRequestDB(String fileName){
+		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+				.willReturn(aResponse()
+				.withStatus(200)
+			    .withHeader("Content-Type", "text/xml")
+				.withBodyFile(fileName)));
+	}	
+	
+	public static void mockUpdateRequestDB(int statusCode, String reponseFile) {
+		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+			    .withHeader("Content-Type", "text/xml")
+				.withBodyFile(reponseFile)));
+	}
+
+	public static void MockGetAllottedResourcesByModelInvariantId(String modelInvariantId, String responseFile){
+		stubFor(get(urlEqualTo("/v1/serviceAllottedResources?serviceModelInvariantUuid=" + modelInvariantId))
+				.willReturn(aResponse()
+				.withStatus(200)
+			    .withHeader("Content-Type", "application/json")
+				.withBodyFile(responseFile)));
+	}
+
+	public static void MockGetAllottedResourcesByModelInvariantId_500(String modelInvariantId, String responseFile){
+		stubFor(get(urlEqualTo("/v1/serviceAllottedResources?serviceModelInvariantUuid=" + modelInvariantId))
+				.willReturn(aResponse()
+				.withStatus(500)));
+	}
+	
+	public static void MockGetVnfCatalogDataCustomizationUuid(String vnfModelCustomizationUuid,  String responseFile){
+		stubFor(get(urlEqualTo("/v2/serviceVnfs?vnfModelCustomizationUuid=" + vnfModelCustomizationUuid))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "application/json")
+				  .withBodyFile(responseFile)));
+	}
+
+	public static void MockGetVfModuleByModelNameCatalogData(String vfModuleModelName, String responseFile){
+		stubFor(get(urlEqualTo("/v2/vfModules?vfModuleModelName=" + vfModuleModelName))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "application/json")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetServiceResourcesCatalogData(String serviceModelInvariantUuid, String serviceModelVersion, String responseFile){
+		stubFor(get(urlEqualTo("/v2/serviceResources?serviceModelInvariantUuid=" + serviceModelInvariantUuid + 
+				"&serviceModelVersion=" + serviceModelVersion))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "application/json")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockGetServiceResourcesCatalogData(String serviceModelInvariantUuid, String responseFile){
+		stubFor(get(urlEqualTo("/v2/serviceResources?serviceModelInvariantUuid=" + serviceModelInvariantUuid))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "application/json")
+				  .withBodyFile(responseFile)));
+	}	
+	
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseNetworkAdapter.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseNetworkAdapter.java
new file mode 100644
index 0000000000..8baeb1b137
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseNetworkAdapter.java
@@ -0,0 +1,113 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+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.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+/**
+ * Please describe the StubResponseNetwork.java class
+ *
+ */
+public class StubResponseNetworkAdapter {
+
+	private static final String EOL = "\n";
+
+	public static void setupAllMocks() {
+
+	}
+
+
+	public static void MockNetworkAdapter() {
+		stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+			.willReturn(aResponse()
+			.withStatus(200)));
+	}
+
+	public static void MockNetworkAdapter(String response) {
+		stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+			.willReturn(aResponse()
+			.withStatus(200)
+			.withHeader("Content-Type", "text/xml")
+			.withBodyFile(response)));
+	}
+
+	public static void MockNetworkAdapter_500() {
+		stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+			.willReturn(aResponse()
+			.withStatus(500)));
+	}
+
+	public static void MockNetworkAdapterPost(String responseFile, String requestContaining) {
+		stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+			.withRequestBody(containing(requestContaining))				
+			.willReturn(aResponse()
+			.withStatus(200)
+			.withHeader("Content-Type", "text/xml")
+			.withBodyFile(responseFile)));
+	}	
+	
+	public static void MockNetworkAdapter(String networkId, int statusCode, String responseFile) {
+		stubFor(delete(urlEqualTo("/networks/NetworkAdapter/" + networkId))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "application/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockNetworkAdapterContainingRequest(String requestContaining, int statusCode, String responseFile) {
+		stubFor(post(urlEqualTo("/networks/NetworkAdapter"))
+				  .withRequestBody(containing(requestContaining))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockPutNetworkAdapter(String networkId, String requestContaining, int statusCode, String responseFile) {
+		stubFor(put(urlEqualTo("/networks/NetworkAdapter/" + networkId))
+				  .withRequestBody(containing(requestContaining))
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void MockNetworkAdapterRestRollbackDelete(String responseFile, String networkId) {
+		stubFor(delete(urlEqualTo("/networks/NetworkAdapter/"+networkId+"/rollback"))
+			.willReturn(aResponse()
+			.withStatus(200)
+			.withHeader("Content-Type", "text/xml")
+			.withBodyFile(responseFile)));
+	}	
+
+	public static void MockNetworkAdapterRestPut(String responseFile, String networkId) {
+		stubFor(put(urlEqualTo("/networks/NetworkAdapter/"+networkId))
+			.willReturn(aResponse()
+			.withStatus(200)
+			.withHeader("Content-Type", "text/xml")
+			.withBodyFile(responseFile)));
+	}		
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponsePolicy.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponsePolicy.java
new file mode 100644
index 0000000000..fdaede1b39
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponsePolicy.java
@@ -0,0 +1,94 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.patch;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+/**
+ * Reusable Mock StubResponses for Policy
+ *
+ */
+public class StubResponsePolicy {
+
+	public static void setupAllMocks() {
+
+	}
+
+	// start of Policy mocks
+	public static void MockPolicyAbort() {		
+		stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+			.withRequestBody(containing("BB1"))
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "application/json")
+				.withBodyFile("policyAbortResponse.json")));
+		
+		stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+				.withRequestBody(containing("UPDVnfI"))
+				.willReturn(aResponse()
+					.withStatus(200)
+					.withHeader("Content-Type", "application/json")
+					.withBodyFile("policyAbortResponse.json")));
+		
+		stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+				.withRequestBody(containing("RPLVnfI"))
+				.willReturn(aResponse()
+					.withStatus(200)
+					.withHeader("Content-Type", "application/json")
+					.withBodyFile("policyAbortResponse.json")));
+
+
+	}
+	
+	public static void MockPolicySkip() {		
+		stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+			.withRequestBody(containing("BB1"))
+			.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "application/json")
+				.withBodyFile("Policy/policySkipResponse.json")));
+		
+		stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+				.withRequestBody(containing("UPDVnfI"))
+				.willReturn(aResponse()
+					.withStatus(200)
+					.withHeader("Content-Type", "application/json")
+					.withBodyFile("Policy/policySkipResponse.json")));
+		
+		stubFor(post(urlEqualTo("/pdp/api/getDecision"))
+				.withRequestBody(containing("RPLVnfI"))
+				.willReturn(aResponse()
+					.withStatus(200)
+					.withHeader("Content-Type", "application/json")
+					.withBodyFile("Policy/policySkipResponse.json")));
+
+
+	}
+	
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSDNCAdapter.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSDNCAdapter.java
new file mode 100644
index 0000000000..f41d6d7dba
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSDNCAdapter.java
@@ -0,0 +1,146 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+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.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+/**
+ * Please describe the StubResponseSDNC.java class
+ */
+public class StubResponseSDNCAdapter {
+
+	public static void setupAllMocks() {
+
+	}
+
+	public static void mockSDNCAdapter_500() {
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}		
+	
+	public static void mockSDNCAdapter_500(String requestContaining) {
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+		  .withRequestBody(containing(requestContaining))
+		  .willReturn(aResponse()
+		  .withStatus(500)));
+	}		
+	
+	public static void mockSDNCAdapter(int statusCode) {
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+				.willReturn(aResponse()
+						.withStatus(statusCode)));
+	}
+	
+	public static void mockSDNCAdapter(String endpoint, int statusCode, String responseFile) {
+		stubFor(post(urlEqualTo(endpoint))	
+				  .willReturn(aResponse()
+				  .withStatus(statusCode)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+
+	public static void mockSDNCAdapter(String responseFile) {
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+	
+	public static void mockSDNCAdapter(String endpoint, String requestContaining, int statusCode, String responseFile) {
+		stubFor(post(urlEqualTo(endpoint))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+					.withStatus(statusCode)
+					.withHeader("Content-Type", "text/xml")
+					.withBodyFile(responseFile)));
+	}
+
+	public static void mockSDNCAdapterSimulator(String responseFile) {
+		MockResource mockResource = new MockResource();
+		mockResource.updateProperties("sdnc_delay", "300");
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "application/soap+xml")
+						.withTransformers("sdnc-adapter-transformer")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void mockSDNCAdapterSimulator(String responseFile, String requestContaining) {
+		MockResource mockResource = new MockResource();
+		mockResource.updateProperties("sdnc_delay", "300");
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "application/soap+xml")
+						.withTransformers("sdnc-adapter-transformer")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void mockSDNCAdapterRest() {
+		stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+				.willReturn(aResponse()
+						.withStatus(202)
+						.withHeader("Content-Type", "application/json")));
+	}
+
+	public static void mockSDNCAdapterRest_500() {
+		stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+				.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "application/json")));
+	}
+
+	public static void mockSDNCAdapterRest(String requestContaining) {
+		stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+						.withStatus(202)
+						.withHeader("Content-Type", "application/json")));
+	}
+
+	public static void mockSDNCAdapterRest_500(String requestContaining) {
+		stubFor(post(urlEqualTo("/SDNCAdapter/v1/sdnc/services"))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "application/json")));
+	}
+
+	public static void mockSDNCAdapterTopology(String responseFile, String requestContaining) {
+		MockResource mockResource = new MockResource();
+		mockResource.updateProperties("sdnc_delay", "300");		
+		stubFor(post(urlEqualTo("/SDNCAdapter"))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "text/xml")
+						.withTransformers("network-topology-operation-transformer")
+						.withBodyFile(responseFile)));
+	}
+
+	
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSNIRO.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSNIRO.java
new file mode 100644
index 0000000000..c16ac43d41
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseSNIRO.java
@@ -0,0 +1,69 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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=========================================================
+ */
+
+/*
+ * © 2014 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
+ */
+package org.openecomp.mso.bpmn.mock;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+/**
+ * Please describe the StubResponseSNIRO.java class
+ *
+ * @author cb645j
+ */
+public class StubResponseSNIRO {
+
+	public static void setupAllMocks() {
+
+	}
+
+	public static void mockSNIRO() {
+		stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+				.willReturn(aResponse()
+						.withStatus(202)
+						.withHeader("Content-Type", "application/json")));
+	}
+
+	public static void mockSNIRO(String responseFile) {
+		stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+				.willReturn(aResponse()
+						.withStatus(202)
+						.withHeader("Content-Type", "application/json")
+						.withBodyFile(responseFile)));
+	}
+
+	public static void mockSNIRO_400() {
+		stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+				.willReturn(aResponse()
+						.withStatus(400)
+						.withHeader("Content-Type", "application/json")));
+	}
+
+	public static void mockSNIRO_500() {
+		stubFor(post(urlEqualTo("/sniro/api/v2/placement"))
+				.willReturn(aResponse()
+						.withStatus(500)
+						.withHeader("Content-Type", "application/json")));
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseVNFAdapter.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseVNFAdapter.java
new file mode 100644
index 0000000000..b4aca5081e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/StubResponseVNFAdapter.java
@@ -0,0 +1,158 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+
+/**
+ * Please describe the StubResponseVNF.java class
+ */
+public class StubResponseVNFAdapter {
+
+	public static void mockVNFAdapter() {
+		stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+	public static void mockVNFAdapter(String responseFile) {
+		stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+				  .willReturn(aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "text/xml")
+				  .withBodyFile(responseFile)));
+	}
+
+	public static void mockVNFAdapter_500() {
+		stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+
+	public static void mockVNFAdapterTransformer(String transformer, String responseFile) {
+		MockResource mockResource = new MockResource();
+		mockResource.updateProperties("vnf_delay", "300");
+		stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "application/soap+xml")
+						.withTransformers(transformer)
+						.withBodyFile(responseFile)));
+	}
+
+	public static void mockVNFAdapterTransformer(String transformer, String responseFile, String requestContaining) {
+		MockResource mockResource = new MockResource();
+		mockResource.updateProperties("vnf_delay", "300");
+		stubFor(post(urlEqualTo("/vnfs/VnfAdapterAsync"))
+				.withRequestBody(containing(requestContaining))
+				.willReturn(aResponse()
+						.withStatus(200)
+						.withHeader("Content-Type", "application/soap+xml")
+						.withTransformers(transformer)
+						.withBodyFile(responseFile)));
+	}
+	
+	public static void mockVNFPost(String vfModuleId, int statusCode, String vnfId) {
+		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockVNFPut(String vfModuleId, int statusCode) {
+		stubFor(put(urlEqualTo("/vnfs/v1/vnfs/vnfId/vf-modules" + vfModuleId))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockVNFPut(String vnfId, String vfModuleId, int statusCode) {
+		stubFor(put(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockVNFDelete(String vnfId, String vfModuleId, int statusCode) {
+		stubFor(delete(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules" + vfModuleId))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockVNFRollbackDelete(String vfModuleId, int statusCode) {
+		stubFor(delete(urlEqualTo("/vnfs/v1/vnfs/vnfId/vf-modules" + vfModuleId + "/rollback"))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockPutVNFVolumeGroup(String volumeGroupId, int statusCode) {
+		stubFor(put(urlEqualTo("/vnfs/v1/volume-groups/" + volumeGroupId))
+				.willReturn(aResponse()
+					.withStatus(statusCode)
+					.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockPutVNFVolumeGroupRollback(String volumeGroupId, int statusCode) {
+		stubFor(delete(urlMatching("/vnfs/v1/volume-groups/" + volumeGroupId + "/rollback"))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	public static void mockPostVNFVolumeGroup(int statusCode) {
+		stubFor(post(urlEqualTo("/vnfs/v1/volume-groups"))
+				.willReturn(aResponse()
+					.withStatus(statusCode)
+					.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockVNFAdapterRest(String vnfId) {
+		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules"))
+				.willReturn(aResponse()
+						.withStatus(200)));
+	}
+
+	public static void mockVNFAdapterRest_500(String vnfId) {
+		stubFor(post(urlEqualTo("/vnfs/v1/vnfs/" + vnfId + "/vf-modules"))
+				.willReturn(aResponse()
+						.withStatus(500)));
+	}
+	
+	public static void mockVfModuleDelete(String volumeGroupId) {
+		stubFor(delete(urlMatching("/vnfs/v1/volume-groups/"+ volumeGroupId))
+				.willReturn(aResponse()
+				.withStatus(202)
+				.withHeader("Content-Type", "application/xml")));
+	}
+	
+	public static void mockVfModuleDelete(String volumeGroupId, int statusCode) {
+		stubFor(delete(urlMatching("/vnfs/v1/volume-groups/78987"))
+				.willReturn(aResponse()
+				.withStatus(statusCode)
+				.withHeader("Content-Type", "application/xml")));
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java
new file mode 100644
index 0000000000..23921da8d8
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterCreateMockTransformer.java
@@ -0,0 +1,148 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import javax.xml.ws.Endpoint;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+
+import org.openecomp.mso.logger.MsoLogger;
+/**
+ * Please describe the VnfAdapterCreateMockTransformer.java class
+ *
+ */
+public class VnfAdapterCreateMockTransformer extends ResponseTransformer {
+
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	
+	private String notifyCallbackResponse;
+	private String ackResponse;
+
+	public VnfAdapterCreateMockTransformer() {
+		notifyCallbackResponse = FileUtil.readResourceFile("__files/vnfAdapterMocks/vnfCreateSimResponse.xml"); // default response
+	}
+
+	@Override
+	public String name() {
+		return "vnf-adapter-create-transformer";
+	}
+
+	@Override
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
+			FileSource fileSource) {
+
+		String requestBody = request.getBodyAsString();
+
+		String notficationUrl = requestBody.substring(requestBody.indexOf("<notificationUrl>")+17, requestBody.indexOf("</notificationUrl>"));
+		String messageId = requestBody.substring(requestBody.indexOf("<messageId>")+11, requestBody.indexOf("</messageId>"));
+		String responseMessageId = "";
+		String updatedResponse = "";
+
+		try {
+			// try supplied response file (if any)
+			System.out.println(" Supplied fileName: " + responseDefinition.getBodyFileName());
+		    ackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());
+			notifyCallbackResponse = ackResponse;
+			responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
+		    updatedResponse = ackResponse.replace(responseMessageId, messageId);
+		} catch (Exception ex) {
+			LOGGER.debug("Exception :",ex);
+			System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfCreateSimResponse.xml'");
+		    responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
+			updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
+		}
+
+		System.out.println("response (mock) messageId       : " + responseMessageId);
+		System.out.println("request  (replacement) messageId: " + messageId);
+
+		System.out.println("vnf Response (before):" + notifyCallbackResponse);
+		System.out.println("vnf Response (after):" + updatedResponse);
+
+		Object vnfDelay = MockResource.getMockProperties().get("vnf_delay");
+		int delay = 300;
+		if (vnfDelay != null) {
+			delay = Integer.parseInt(vnfDelay.toString());
+		}
+
+		//Kick off callback thread
+		System.out.println("VnfAdapterCreateMockTransformer notficationUrl: " + notficationUrl + ":delay: " + delay);
+		CallbackResponseThread callbackResponseThread = new CallbackResponseThread(notficationUrl,updatedResponse, delay);
+		callbackResponseThread.start();
+
+		return ResponseDefinitionBuilder
+		           .like(responseDefinition).but()
+		           .withStatus(200).withBody(updatedResponse).withHeader("Content-Type", "text/xml")
+		           .build();
+
+	}
+
+	@Override
+	public boolean applyGlobally() {
+	    return false;
+	}
+
+	private class CallbackResponseThread extends Thread {
+
+		private String callbackUrl;
+		private String payLoad;
+		private int delay;
+
+		public CallbackResponseThread(String callbackUrl, String payLoad, int delay) {
+			this.callbackUrl = callbackUrl;
+			this.payLoad = payLoad;
+			this.delay = delay;
+		}
+
+		@SuppressWarnings("deprecation")
+		public void run () {
+			try {
+				//Delay sending callback response
+				sleep(delay);
+			} catch (InterruptedException e1) {
+				// TODO Auto-generated catch block
+				LOGGER.debug("Exception :",e1);
+			}
+			LOGGER.debug("Sending callback response to url: " + callbackUrl);
+			ClientRequest request = new ClientRequest(callbackUrl);
+			request.body("text/xml", payLoad);
+			//System.out.println("payLoad: " + payLoad);
+
+			try {
+				ClientResponse result = request.post();
+				LOGGER.debug("Successfully posted callback? Status: " + result.getStatus());
+				//System.err.println("Successfully posted callback:" + result.getStatus());
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+			    LOGGER.debug("catch error in - request.post() ");
+				LOGGER.debug("Exception :",e);
+			}
+		}
+
+	}
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java
new file mode 100644
index 0000000000..ee6972e46e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterDeleteMockTransformer.java
@@ -0,0 +1,143 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+/**
+ * Please describe the VnfAdapterCreateMockTransformer.java class
+ *
+ */
+public class VnfAdapterDeleteMockTransformer extends ResponseTransformer {
+
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
+	private String notifyCallbackResponse;
+	private String ackResponse;
+
+	public VnfAdapterDeleteMockTransformer() {
+		notifyCallbackResponse = FileUtil.readResourceFile("__files/vnfAdapterMocks/vnfDeleteSimResponse.xml");
+	}
+
+	@Override
+	public String name() {
+		return "vnf-adapter-delete-transformer";
+	}
+
+	@Override
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
+			FileSource fileSource) {
+
+		// System.err.println("notifyCallbackResponse:" + notifyCallbackResponse);
+
+		String requestBody = request.getBodyAsString();
+
+		String notficationUrl = requestBody.substring(requestBody.indexOf("<notificationUrl>")+17, requestBody.indexOf("</notificationUrl>"));
+		String messageId = requestBody.substring(requestBody.indexOf("<messageId>")+11, requestBody.indexOf("</messageId>"));
+		String responseMessageId = "";
+		String updatedResponse = "";
+
+		try {
+			// try supplied response file (if any)
+			System.out.println(" Supplied fileName: " + responseDefinition.getBodyFileName());
+		    ackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());
+			notifyCallbackResponse = ackResponse;
+			responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
+		    updatedResponse = ackResponse.replace(responseMessageId, messageId);
+		} catch (Exception ex) {
+			LOGGER.debug("Exception :",ex);
+			System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfDeleteSimResponse.xml'");
+		    responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
+			updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
+		}
+
+		System.out.println("response (mock) messageId       : " + responseMessageId);
+		System.out.println("request  (replacement) messageId: " + messageId);
+
+		System.out.println("vnf Response (before):" + notifyCallbackResponse);
+		System.out.println("vnf Response (after):" + updatedResponse);
+
+		Object vnfDelay = MockResource.getMockProperties().get("vnf_delay");
+		int delay = 300;
+		if (vnfDelay != null) {
+			delay = Integer.parseInt(vnfDelay.toString());
+		}
+
+		//Kick off callback thread
+		System.out.println("VnfAdapterDeleteMockTransformer notficationUrl: " + notficationUrl + ":delay: " + delay);
+		CallbackResponseThread callbackResponseThread = new CallbackResponseThread(notficationUrl,updatedResponse, delay);
+		callbackResponseThread.start();
+
+		return ResponseDefinitionBuilder
+		           .like(responseDefinition).but()
+		           .withStatus(200).withBody(updatedResponse).withHeader("Content-Type", "text/xml")
+		           .build();
+
+	}
+
+	@Override
+	public boolean applyGlobally() {
+	    return false;
+	}
+
+	private class CallbackResponseThread extends Thread {
+
+		private String callbackUrl;
+		private String payLoad;
+		private int delay;
+
+		public CallbackResponseThread(String callbackUrl, String payLoad, int delay) {
+			this.callbackUrl = callbackUrl;
+			this.payLoad = payLoad;
+			this.delay = delay;
+		}
+
+		@SuppressWarnings("deprecation")
+		public void run () {
+			try {
+				//Delay sending callback response
+				sleep(delay);
+			} catch (InterruptedException e1) {
+				// TODO Auto-generated catch block
+				LOGGER.debug("Exception :",e1);
+			}
+			System.out.println("Sending callback response to url: " + callbackUrl);
+			ClientRequest request = new ClientRequest(callbackUrl);
+			request.body("text/xml", payLoad);
+			//System.err.println(payLoad);
+			try {
+				ClientResponse result = request.post();
+				System.out.println("Successfully posted callback? Status: " + result.getStatus());
+				//System.err.println("Successfully posted callback:" + result.getStatus());
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				System.out.println("catch error in - request.post() ");
+				LOGGER.debug("Exception :",e);
+			}
+		}
+
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java
new file mode 100644
index 0000000000..1582071d3a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterQueryMockTransformer.java
@@ -0,0 +1,161 @@
+/* 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+
+import org.openecomp.mso.logger.MsoLogger;
+/**
+ * Please describe the VnfAdapterQueryMockTransformer.java class
+ *
+ */
+
+
+public class VnfAdapterQueryMockTransformer extends ResponseTransformer{
+	
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	
+	private String notifyCallbackResponse;
+	private String ackResponse;
+	private String messageId;
+
+	public VnfAdapterQueryMockTransformer() {
+		notifyCallbackResponse = FileUtil.readResourceFile("__files/vnfAdapterMocks/vnfQuerySimResponse.xml");
+	}
+	
+	public VnfAdapterQueryMockTransformer(String messageId) {
+		this.messageId = messageId;
+	}
+
+	@Override
+	public String name() {
+		return "vnf-adapter-query-transformer";
+	}
+	
+	@Override
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
+			FileSource fileSource) {
+
+		String requestBody = request.getBodyAsString();
+
+		String notficationUrl = requestBody.substring(requestBody.indexOf("<notificationUrl>")+17, requestBody.indexOf("</notificationUrl>"));
+		String messageId = requestBody.substring(requestBody.indexOf("<messageId>")+11, requestBody.indexOf("</messageId>"));
+	//	String updatedResponse = notifyCallbackResponse.replace("b1a82ce6-7f5c-45fd-9273-acaf88fc2137", messageId);
+	
+		String responseMessageId = "";
+		String updatedResponse = "";
+		
+	//	if (ackResponse == null) {
+			//System.err.println("file:" + responseDefinition.getBodyFileName());
+		//	ackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());
+		//}
+
+		
+		try {
+			// try supplied response file (if any)
+			System.out.println(" Supplied fileName: " + responseDefinition.getBodyFileName());
+		    ackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());
+			notifyCallbackResponse = ackResponse;
+			responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
+		    updatedResponse = ackResponse.replace(responseMessageId, messageId); 
+		} catch (Exception ex) {
+			LOGGER.debug("Exception :",ex);
+			System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfQuerySimResponse.xml'");
+		    responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
+			updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
+		}
+		
+		System.out.println("response (mock) messageId       : " + responseMessageId);		
+		System.out.println("request  (replacement) messageId: " + messageId);
+		
+		System.out.println("vnf Response (before):" + notifyCallbackResponse);
+		System.out.println("vnf Response (after):" + updatedResponse);
+		
+		
+		Object vnfDelay = MockResource.getMockProperties().get("vnf_delay");
+		int delay = 300;
+		if (vnfDelay != null) {
+			delay = Integer.parseInt(vnfDelay.toString());
+		}
+
+		//Kick off callback thread
+		
+		//System.out.println("notficationUrl" + notficationUrl);
+		//System.out.println("updatedResponse" + updatedResponse);
+		System.out.println("VnfAdapterQueryMockTransformer notficationUrl: " + notficationUrl + ":delay: " + delay);
+		CallbackResponseThread callbackResponseThread = new CallbackResponseThread(notficationUrl,updatedResponse, delay);
+		System.out.println("Inside Callback" );
+		callbackResponseThread.start();
+
+				return ResponseDefinitionBuilder
+		             .like(responseDefinition).but()
+		             .withStatus(200).withBody(updatedResponse).withHeader("Content-Type", "text/xml")
+		             .build();
+	}
+
+	@Override
+	public boolean applyGlobally() {
+	    return false;
+	}
+
+	private class CallbackResponseThread extends Thread {
+
+		private String callbackUrl;
+		private String payLoad;
+		private int delay;
+
+		public CallbackResponseThread(String callbackUrl, String payLoad, int delay) {
+			this.callbackUrl = callbackUrl;
+			this.payLoad = payLoad;
+			this.delay = delay;
+		}
+
+		public void run () {
+			try {
+				//Delay sending callback response
+				sleep(delay);
+			} catch (InterruptedException e1) {
+				LOGGER.debug("Exception :",e1);
+			}
+			ClientRequest request = new ClientRequest(callbackUrl);
+			request.body("text/xml", payLoad);
+			//System.err.println(payLoad);
+			try {
+				ClientResponse result = request.post();
+				//System.err.println("Successfully posted callback:" + result.getStatus());
+			} catch (Exception e) {
+				LOGGER.debug("Exception :",e);
+			}
+		}
+
+	}
+
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java
new file mode 100644
index 0000000000..186fd35b6f
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterRollbackMockTransformer.java
@@ -0,0 +1,144 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.openecomp.mso.bpmn.mock;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+
+import org.openecomp.mso.logger.MsoLogger;
+/**
+ * Please describe the VnfAdapterCreateMockTransformer.java class
+ *
+ */
+public class VnfAdapterRollbackMockTransformer extends ResponseTransformer {
+
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+
+	private String notifyCallbackResponse;
+	private String ackResponse;
+	private String messageId;
+
+	public VnfAdapterRollbackMockTransformer() {
+		notifyCallbackResponse = FileUtil.readResourceFile("__files/vnfAdapterMocks/vnfRollbackSimResponse.xml");
+	}
+	
+	public VnfAdapterRollbackMockTransformer(String messageId) {
+		this.messageId = messageId;
+	}
+
+	@Override
+	public String name() {
+		return "vnf-adapter-rollback-transformer";
+	}
+
+	@Override
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
+			FileSource fileSource) {
+
+		String requestBody = request.getBodyAsString();
+
+		String notficationUrl = requestBody.substring(requestBody.indexOf("<notificationUrl>")+17, requestBody.indexOf("</notificationUrl>"));
+		String messageId = requestBody.substring(requestBody.indexOf("<messageId>")+11, requestBody.indexOf("</messageId>"));
+		String responseMessageId = "";
+		String updatedResponse = "";
+		
+		try {
+			// try supplied response file (if any)
+			System.out.println(" Supplied fileName: " + responseDefinition.getBodyFileName());
+		    ackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());
+			notifyCallbackResponse = ackResponse;
+			responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
+		    updatedResponse = ackResponse.replace(responseMessageId, messageId); 
+		} catch (Exception ex) {
+			LOGGER.debug("Exception :",ex);
+			System.out.println(" ******* Use default response file in '__files/vnfAdapterMocks/vnfRollbackSimResponse.xml'");
+		    responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
+			updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
+		}
+		
+		System.out.println("response (mock) messageId       : " + responseMessageId);		
+		System.out.println("request  (replacement) messageId: " + messageId);
+		
+		System.out.println("vnf Response (before):" + notifyCallbackResponse);
+		System.out.println("vnf Response (after):" + updatedResponse);
+
+		Object vnfDelay = MockResource.getMockProperties().get("vnf_delay");
+		int delay = 300;
+		if (vnfDelay != null) {
+			delay = Integer.parseInt(vnfDelay.toString());
+		}
+
+		//Kick off callback thread
+		System.out.println("VnfAdapterRollbackMockTransformer notficationUrl: " + notficationUrl + ":delay: " + delay);		
+		CallbackResponseThread callbackResponseThread = new CallbackResponseThread(notficationUrl,updatedResponse, delay);
+		callbackResponseThread.start();
+
+		return ResponseDefinitionBuilder
+		           .like(responseDefinition).but()
+		           .withStatus(200).withBody(updatedResponse).withHeader("Content-Type", "text/xml")
+		           .build();
+		
+	}
+
+	@Override
+	public boolean applyGlobally() {
+	    return false;
+	}
+
+	private class CallbackResponseThread extends Thread {
+
+		private String callbackUrl;
+		private String payLoad;
+		private int delay;
+
+		public CallbackResponseThread(String callbackUrl, String payLoad, int delay) {
+			this.callbackUrl = callbackUrl;
+			this.payLoad = payLoad;
+			this.delay = delay;
+		}
+
+		public void run () {
+			try {
+				//Delay sending callback response
+				sleep(delay);
+			} catch (InterruptedException e1) {
+				LOGGER.debug("Exception :",e1);
+			}
+			System.out.println("Sending callback response to url: " + callbackUrl);
+			ClientRequest request = new ClientRequest(callbackUrl);
+			request.body("text/xml", payLoad);
+			//System.err.println(payLoad);
+			try {
+				ClientResponse result = request.post();
+				System.out.println("Successfully posted callback? Status: " + result.getStatus());
+				//System.err.println("Successfully posted callback:" + result.getStatus());
+			} catch (Exception e) {
+				System.out.println("catch error in - request.post() ");				
+				LOGGER.debug("Exception :",e);
+			}
+		}
+
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java
new file mode 100644
index 0000000000..7808b47d24
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/VnfAdapterUpdateMockTransformer.java
@@ -0,0 +1,149 @@
+/*
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * 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.openecomp.mso.bpmn.mock;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+import org.openecomp.mso.logger.MsoLogger;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+
+import org.openecomp.mso.logger.MsoLogger;
+/**
+ * Please describe the VnfAdapterUpdateMockTransformer.java class
+ *
+ */
+public class VnfAdapterUpdateMockTransformer extends ResponseTransformer {
+
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
+	
+	private String notifyCallbackResponse;
+	private String requestId;
+	private String ackResponse;
+
+	public VnfAdapterUpdateMockTransformer() {
+		notifyCallbackResponse = FileUtil.readResourceFile("vnfAdapter/vnfUpdateSimResponse.xml");
+	}
+
+	public VnfAdapterUpdateMockTransformer(String requestId) {
+		this.requestId = requestId;
+	}
+
+
+	public String name() {
+		return "vnf-adapter-update-transformer";
+	}
+
+	@Override
+	public ResponseDefinition transform(Request request, ResponseDefinition responseDefinition,
+			FileSource fileSource) {
+
+		String requestBody = request.getBodyAsString();
+
+		String notficationUrl = requestBody.substring(requestBody.indexOf("<notificationUrl>")+17, requestBody.indexOf("</notificationUrl>"));
+		String messageId = requestBody.substring(requestBody.indexOf("<messageId>")+11, requestBody.indexOf("</messageId>"));
+		String responseMessageId = "";
+		String updatedResponse = "";
+		
+		try {
+			// try supplied response file (if any)
+			System.out.println(" Supplied fileName: " + responseDefinition.getBodyFileName());
+		    ackResponse = FileUtil.readResourceFile("__files/" + responseDefinition.getBodyFileName());
+			notifyCallbackResponse = ackResponse;
+			responseMessageId = ackResponse.substring(ackResponse.indexOf("<messageId>")+11, ackResponse.indexOf("</messageId>"));
+		    updatedResponse = ackResponse.replace(responseMessageId, messageId); 
+		} catch (Exception ex) {
+			LOGGER.debug("Exception :",ex);
+			System.out.println(" ******* Use default response file in 'vnfAdapter/vnfUpdateSimResponse.xml'");
+		    responseMessageId = notifyCallbackResponse.substring(notifyCallbackResponse.indexOf("<messageId>")+11, notifyCallbackResponse.indexOf("</messageId>"));
+			updatedResponse = notifyCallbackResponse.replace(responseMessageId, messageId);
+		}
+		
+		System.out.println("response (mock) messageId       : " + responseMessageId);		
+		System.out.println("request  (replacement) messageId: " + messageId);
+		
+		System.out.println("vnf Response (before):" + notifyCallbackResponse);
+		System.out.println("vnf Response (after):" + updatedResponse);
+		
+		Object vnfDelay = MockResource.getMockProperties().get("vnf_delay");
+		int delay = 300;
+		if (vnfDelay != null) {
+			delay = Integer.parseInt(vnfDelay.toString());
+		}
+
+		//Kick off callback thread
+		System.out.println("VnfAdapterUpdateMockTransformer notficationUrl: " + notficationUrl + ":delay: " + delay);		
+		CallbackResponseThread callbackResponseThread = new CallbackResponseThread(notficationUrl,updatedResponse, delay);
+		callbackResponseThread.start();
+
+		return ResponseDefinitionBuilder
+		           .like(responseDefinition).but()
+		           .withStatus(200).withBody(updatedResponse).withHeader("Content-Type", "text/xml")
+		           .build();
+
+	}
+
+	@Override
+	public boolean applyGlobally() {
+	    return false;
+	}
+
+	private class CallbackResponseThread extends Thread {
+
+		private String callbackUrl;
+		private String payLoad;
+		private int delay;
+
+		public CallbackResponseThread(String callbackUrl, String payLoad, int delay) {
+			this.callbackUrl = callbackUrl;
+			this.payLoad = payLoad;
+			this.delay = delay;
+		}
+
+		public void run () {
+			try {
+				//Delay sending callback response
+				sleep(delay);
+			} catch (InterruptedException e1) {
+				LOGGER.debug("Exception :", e1);
+			}
+			System.out.println("Sending callback response to url: " + callbackUrl);			
+			ClientRequest request = new ClientRequest(callbackUrl);
+			request.body("text/xml", payLoad);
+			//System.err.println(payLoad);
+			try {
+				ClientResponse result = request.post();
+				System.out.println("Successfully posted callback? Status: " + result.getStatus());				
+				//System.err.println("Successfully posted callback:" + result.getStatus());
+			} catch (Exception e) {
+				System.out.println("catch error in - request.post() ");
+				LOGGER.debug("Exception :",e);
+			}
+		}
+
+	}
+}
+
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/PolicyDecisionTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/PolicyDecisionTest.java
deleted file mode 100644
index 8370f74851..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/PolicyDecisionTest.java
+++ /dev/null
@@ -1,70 +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.openecomp.mso.client.policy;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class PolicyDecisionTest {
-	
-	@BeforeClass
-	public static void setUp() {
-		System.setProperty("mso.config.path", "src/test/resources");
-	}
-	@Test
-	public void successReadProperties() throws IOException, Exception {
-		PolicyRestClient client = new PolicyRestClient();
-		Map<String, String> headerMap = client.headerMap;
-		
-		assertEquals("Found expected Client Auth", headerMap.get("ClientAuth"), "Basic bTAzNzQzOnBvbGljeVIwY2sk");
-		assertEquals("Found expected Authorization", headerMap.get("Authorization"), "Basic dGVzdHBkcDphbHBoYTEyMw==");
-		assertEquals("Found expected Environment", headerMap.get("Environment"), "TEST");
-		assertEquals("Has X-ECOMP-RequestID", headerMap.containsKey("X-ECOMP-RequestID"), true);
-	}
-	
-	@Test
-	@Ignore // IGNORED FOR 1710 MERGE TO ONAP
-	public void restEndpointCall() throws IOException, Exception {
-		PolicyRestClient client = new PolicyRestClient();
-		PolicyDecision decision = client.getDecision("X", "Y", "BB1", "1", "123");
-		assertEquals("Decision is correct", decision.getDecision(), "PERMIT");
-		assertEquals("Decision details is correct", decision.getDetails(), "Abort");
-	}
-/*
-	@Test
-	public void failure() throws IOException, Exception {
-		when(dmaapConsumer.getMRConsumer()).thenReturn(mrConsumer);
-		when(mrConsumer.fetch())
-				.thenReturn(Arrays.asList(new String[] { getJson("response.json"), getJson("output-failure.json") }));
-
-		SDNOValidatorImpl validator = new SDNOValidatorImpl();
-		thrown.expect(SDNOException.class);
-		thrown.expectMessage("my message");
-		boolean result = validator.pollForResponse(dmaapConsumer, "xyz123");
-
-	}*/
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
index ba45f545c8..1cebbcfc48 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -13,8 +13,8 @@ mso.healthcheck.log.debug=false
 
 mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
 
-mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
-mso.openecomp.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
+mso.adapters.db.endpoint=http://localhost:28090/dbadapters/MsoRequestsDbAdapter
+mso.adapters.openecomp.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
 mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
 
 mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter
@@ -55,16 +55,11 @@ mso.sdnc.timeout.ucpe.async.minutes=5
 mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage
 mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService
 
-
 mso.sniro.auth=test:testpwd
+mso.sniro.endpoint=http://localhost:28090/optimizationInstance/V1/create
 mso.sniro.timeout=PT30M
-mso.sniro.policies.dhv.2vvig=SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1
-mso.sniro.policies.dhv.4vvig=SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.VNFPolicy_vvigprimary2_v1,SNIRO.VNFPolicy_vvigsecondary2_v1,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1
-
 mso.service.agnostic.sniro.host=http://localhost:28090
 mso.service.agnostic.sniro.endpoint=/sniro/api/v2/placement
-mso.sniro.endpoint=http://localhost:28090/optimizationInstance/V1/create
-mso.sniro.callback=http://localhost:28090/adapters/rest/SDNCNotify/SNIROResponse
 
 mso.catalog.db.endpoint=http://localhost:28090/
 
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
index 75858b14ec..204d9e4e5e 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
@@ -54,7 +54,7 @@ public class HealthCheckHandler  {
 
     private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
     private static final String SITENAME = "mso.sitename";
-    private static final String ADAPTER_ENDPOINT = "mso.adapters.db.endpoint";
+    private static final String ADAPTER_ENDPOINT = "mso.adapters.openecomp.db.endpoint";
     private static final String ADAPTER_NAMESPACE = "mso.adapters.namespace";
     private static final String CONFIG = "mso.bpmn.urn.properties";
     private static final String CREDENTIAL = "mso.adapters.db.auth";
diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/JsonUtilsTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/JsonUtilsTest.java
index 6f65371ef2..7f922ce30e 100644
--- a/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/JsonUtilsTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/openecomp/mso/bpmn/core/JsonUtilsTest.java
@@ -162,26 +162,24 @@ public class JsonUtilsTest {
             try {
                     fis = new FileInputStream(file);
                     BufferedReader br = new BufferedReader(new InputStreamReader(fis));
-//                  jsonReq = br.readLine();
                     CharBuffer cbuf = CharBuffer.allocate((int)file.length()+1);
                     br.read(cbuf);
                     cbuf.flip();
                     jsonReq = cbuf.toString();
                     if (jsonReq != null) {
-                            System.out.println("initialize(): json request: " + jsonReq);                           
+                            System.out.println("initialize(): json request: " + jsonReq);
                     } else {
                             System.out.println("initialize(): failed to read json request from src/test/resources/request.json");
                     }
                     fis.close();
                     fis = new FileInputStream(file2);
                     br = new BufferedReader(new InputStreamReader(fis));
-//                  jsonReqArray = br.readLine();
                     cbuf = CharBuffer.allocate((int)file.length()+1);
                     br.read(cbuf);
                     cbuf.flip();
                     jsonReqArray = cbuf.toString();
                     if (jsonReq != null) {
-                            System.out.println("initialize(): json request w/ array: " + jsonReqArray);                             
+                            System.out.println("initialize(): json request w/ array: " + jsonReqArray);
                     } else {
                             System.out.println("initialize(): failed to read json request from src/test/resources/request2.json");
                     }
@@ -220,14 +218,11 @@ public class JsonUtilsTest {
             
             // strip all the non-data whitespace
             xmlOut = xmlOut.replaceAll(">\\s*<", "><");
-//          System.out.println("testConversion(): xml in: " + xmlIn);
-//          System.out.println("testConversion(): xml out: " + xmlOut);
 
             Diff diffXml;
             try {
                     diffXml = new Diff(xmlIn, xmlOut);
                     Assert.assertTrue(diffXml.similar());
-//                  Assert.assertTrue(diffXml.identical());
             } catch (SAXException e) {
                     e.printStackTrace();
             } catch (IOException e) {
@@ -259,7 +254,6 @@ public class JsonUtilsTest {
             Assert.assertEquals(value, null);
             // retrieving a parameter/array value (originally a XML attribute)
             value = JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "name");
-//          Assert.assertEquals(value, "[{\"content\":\"network1111\",\"name\":\"network\"},{\"content\":\"server1111\",\"name\":\"server\"}]");
             Assert.assertEquals(value, "network");
             value = JsonUtils.getJsonParamValue(json, "vnf-request.vnf-params.param", "content");
             Assert.assertEquals(value, "network1111");
@@ -288,7 +282,6 @@ public class JsonUtilsTest {
             System.out.println("testUpdate(): xml request to json: " + json);
             // the add should be successful
             String jsonUpd = JsonUtils.addJsonValue(json, "vnf-request.request-info.comment", "Some comment");
-//          System.out.println("testUpdate(): post add json request: " + jsonUpd);
             String value = JsonUtils.getJsonValue(jsonUpd, "vnf-request.request-info.comment");
             Assert.assertEquals(value, "Some comment");
             // the add should be ignored as the field already exists
@@ -297,12 +290,10 @@ public class JsonUtilsTest {
             Assert.assertEquals(value, "STMTN5MMSC21");
             // the update should be successful
             jsonUpd = JsonUtils.updJsonValue(jsonUpd, "vnf-request.vnf-inputs.vnf-name", "STMTN5MMSC22");
-//          System.out.println("testUpdate(): post update json request: " + jsonUpd);
             value = JsonUtils.getJsonValue(jsonUpd, "vnf-request.vnf-inputs.vnf-name");
             Assert.assertEquals(value, "STMTN5MMSC22");
             // the delete should be successful
             jsonUpd = JsonUtils.delJsonValue(jsonUpd, "vnf-request.request-info.comment");
-//          System.out.println("testUpdate(): post delete json request: " + jsonUpd);
             value = JsonUtils.getJsonValue(jsonUpd, "vnf-request.request-info.comment");
             Assert.assertEquals(value, null);
             // the delete should fail as field 'vnf-model' does not exist
@@ -352,14 +343,11 @@ public class JsonUtilsTest {
                     xmlOut = xmlOut.replaceAll(">\\s*<", "><");
                     System.out.println("testConversionArray(): XML after removing whitespace:" + xmlOut);
                     String xmlTest = xmlArrayReq.replaceAll(">\\s*<", "><");
-//                  System.out.println("testConversion(): xml test: " + xmlTest);
-//                  System.out.println("testConversion(): xml out: " + xmlOut);
 
                     Diff diffXml;
                     try {
                             diffXml = new Diff(xmlTest, xmlOut);
                           Assert.assertTrue(diffXml.similar());
-//                            Assert.assertTrue(diffXml.identical());
                     } catch (SAXException e) {
                             e.printStackTrace();
                     } catch (IOException e) {
diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml
index 1891c62f4a..53888dd23e 100644
--- a/bpmn/MSOInfrastructureBPMN/pom.xml
+++ b/bpmn/MSOInfrastructureBPMN/pom.xml
@@ -329,13 +329,6 @@
     	<version>4.3.2.RELEASE</version>
 	</dependency>
 	<dependency>
-		<groupId>org.openecomp.so</groupId>
-		<artifactId>MSOMockServer</artifactId>
-		<version>${project.version}</version>
-		<scope>test</scope>
-		<classifier>classes</classifier>
-	</dependency>
-	<dependency>
 	  <groupId>org.openecomp.so</groupId>
   	  <artifactId>MSORESTClient</artifactId>
   	  <version>${project.version}</version>
@@ -428,7 +421,7 @@
 		<dependency>
 			<groupId>org.onap.msb.java-sdk</groupId>
 			<artifactId>msb-java-sdk</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.eclipsesource.jaxrs</groupId>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
index 7f4f78762e..450c5b1147 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
@@ -31,6 +31,7 @@ import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.bpmn.core.json.JsonUtils
 import org.openecomp.mso.rest.APIResponse
 
+import java.util.List;
 import java.util.UUID;
 
 import org.camunda.bpm.engine.delegate.BpmnError
@@ -54,7 +55,7 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		execution.setVariable("prefix",Prefix)
 		String msg = ""
-		utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)
+		utils.log("INFO", " *** preProcessRequest() *** ", isDebugEnabled)
 
 		try {
 
@@ -63,13 +64,13 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 
 			String requestId = execution.getVariable("mso-request-id")
 			execution.setVariable("msoRequestId", requestId)
-			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
+			utils.log("INFO", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
 
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			if (isBlank(serviceInstanceId)) {
 				serviceInstanceId = UUID.randomUUID().toString()
 			}
-			utils.log("DEBUG", "Generated new Service Instance:" + serviceInstanceId, isDebugEnabled)
+			utils.log("INFO", "Generated new Service Instance:" + serviceInstanceId, isDebugEnabled)
 			serviceInstanceId = UriUtils.encode(serviceInstanceId,"UTF-8")
 			execution.setVariable("serviceInstanceId", serviceInstanceId)
 
@@ -90,96 +91,73 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 			if (isBlank(productFamilyId))
 			{
 				msg = "Input productFamilyId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			} else {
 				execution.setVariable("productFamilyId", productFamilyId)
 			}
-
+	         String userParams = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams")      
+             utils.log("INFO", "userParams:" + userParams, isDebugEnabled)
+	         List<String> paramList = jsonUtil.StringArrayToList(execution, userParams)
+	         String uuiRequest = jsonUtil.getJsonValue(paramList.get(0), "UUIRequest")
 			//modelInfo
-			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")
-			if (isBlank(serviceModelInfo)) {
-				msg = "Input serviceModelInfo is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+			if (isBlank(uuiRequest)) {
+				msg = "Input uuiRequest is null"
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			} else
 			{
-				execution.setVariable("serviceModelInfo", serviceModelInfo)
+				execution.setVariable("uuiRequest", uuiRequest)
 			}
 
-			utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)
+			utils.log("INFO", "uuiRequest:\n" + uuiRequest,  isDebugEnabled)
 
 			//requestParameters
-			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")
-			if (isBlank(subscriptionServiceType)) {
-				msg = "Input subscriptionServiceType is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+			String serviceType = jsonUtil.getJsonValue(uuiRequest, "service.parameters.serviceType")
+			if (isBlank(serviceType)) {
+				msg = "Input serviceType is null"
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			} else {
-				execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-			}
-
-			
-			/*
-			 * Extracting User Parameters from incoming Request and converting into a Map
-			 */
-			def jsonSlurper = new JsonSlurper()
-			def jsonOutput = new JsonOutput()
-
-			Map reqMap = jsonSlurper.parseText(siRequest)
-
-			//InputParams
-			def userParams = reqMap.requestDetails?.requestParameters?.userParams
-
-			Map<String, String> inputMap = [:]
-			if (userParams) {
-				userParams.each {
-					userParam -> inputMap.put(userParam.name, userParam.value)
-				}
+				execution.setVariable("serviceType", serviceType)
 			}
-			
-			utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
-			execution.setVariable("serviceInputParams", inputMap)
-			
-			//TODO
-			//execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams"))
-			//execution.setVariable("failExists", true)
+			execution.setVariable("URN_mso_adapters_openecomp_db_endpoint","http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter")
 
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception ex){
 			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+		utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)
 	}
 
 	public void sendSyncResponse (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncResponse *** ", isDebugEnabled)
+		utils.log("INFO", " *** sendSyncResponse *** ", isDebugEnabled)
 
 		try {
-			String requestId = execution.getVariable("msoRequestId")
+			String operationId = execution.getVariable("operationId")
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			// RESTResponse for API Handler (APIH) Reply Task
-			String createServiceRestRequest = """{"service":{"serviceId":"${serviceInstanceId}","operationId":"${requestId}"}}""".trim()
-			utils.log("DEBUG", " sendSyncResponse to APIH:" + "\n" + createServiceRestRequest, isDebugEnabled)
+			String createServiceRestRequest = """{"service":{"serviceId":"${serviceInstanceId}","operationId":"${operationId}"}}""".trim()
+			utils.log("INFO", " sendSyncResponse to APIH:" + "\n" + createServiceRestRequest, isDebugEnabled)
 			sendWorkflowResponse(execution, 202, createServiceRestRequest)
 			execution.setVariable("sentSyncResponse", true)
 
 		} catch (Exception ex) {
 			String msg = "Exceptuion in sendSyncResponse:" + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
+		utils.log("INFO"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
 	}
 
 
 	public void sendSyncError (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)
+		utils.log("INFO", " *** sendSyncError *** ", isDebugEnabled)
 
 		try {
 			String errorMessage = ""
@@ -200,14 +178,14 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 			sendWorkflowResponse(execution, 500, buildworkflowException)
 
 		} catch (Exception ex) {
-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
+			utils.log("INFO", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
 		}
 
 	}
 
 	public void prepareCompletionRequest (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)
+		utils.log("INFO", " *** prepareCompletion *** ", isDebugEnabled)
 
 		try {
 			String requestId = execution.getVariable("msoRequestId")
@@ -231,23 +209,23 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
 
 			execution.setVariable("completionRequest", xmlMsoCompletionRequest)
-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+			utils.log("INFO", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
 
 		} catch (Exception ex) {
 			String msg = " Exception in prepareCompletion:" + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
+		utils.log("INFO", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
 	}
 
 	public void prepareFalloutRequest(Execution execution){
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)
+		utils.log("INFO", " *** prepareFalloutRequest *** ", isDebugEnabled)
 
 		try {
 			WorkflowException wfex = execution.getVariable("WorkflowException")
-			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
+			utils.log("INFO", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
 			String requestId = execution.getVariable("msoRequestId")
 			String source = execution.getVariable("source")
 			String requestInfo =
@@ -260,7 +238,7 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
 			execution.setVariable("falloutRequest", falloutRequest)
 		} catch (Exception ex) {
-			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
+			utils.log("INFO", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
 			String errorException = "  Bpmn error encountered in CreateGenericALaCarteServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
 			String requestId = execution.getVariable("msoRequestId")
 			String falloutRequest =
@@ -280,7 +258,7 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 
 			execution.setVariable("falloutRequest", falloutRequest)
 		}
-		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
+		utils.log("INFO", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
 	}
 	
 	/**
@@ -288,25 +266,26 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 	 */
 	public void prepareInitServiceOperationStatus(Execution execution){
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-        utils.log("DEBUG", " ======== STARTED prepareInitServiceOperationStatus Process ======== ", isDebugEnabled)
+        utils.log("INFO", " ======== STARTED prepareInitServiceOperationStatus Process ======== ", isDebugEnabled)
         try{
             String serviceId = execution.getVariable("serviceInstanceId")
             String operationId = UUID.randomUUID().toString()
+            String serviceName = execution.getVariable("serviceInstanceName")
             String operationType = "CREATE"
             String userId = ""
             String result = "processing"
             String progress = "0"
             String reason = ""
             String operationContent = "Prepare service creation"
-            utils.log("DEBUG", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId, isDebugEnabled)
+            utils.log("INFO", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId, isDebugEnabled)
             serviceId = UriUtils.encode(serviceId,"UTF-8")
             execution.setVariable("serviceInstanceId", serviceId)
             execution.setVariable("operationId", operationId)
             execution.setVariable("operationType", operationType)
 
-            def dbAdapterEndpoint = execution.getVariable("URN_mso_openecomp_adapters_db_endpoint")
+            def dbAdapterEndpoint = execution.getVariable("URN_mso_adapters_openecomp_db_endpoint")
             execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
-            utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
+            utils.log("INFO", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
 
             String payload =
                 """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
@@ -316,8 +295,9 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                             <ns:updateServiceOperationStatus xmlns:ns="http://org.openecomp.mso/requestsdb">
                             <serviceId>${serviceId}</serviceId>
                             <operationId>${operationId}</operationId>
+                            <serviceName>${serviceName}</serviceName>
                             <operationType>${operationType}</operationType>
-                            <userId>${userId}</responseBody>
+                            <userId>${userId}</userId>
                             <result>${result}</result>
                             <operationContent>${operationContent}</operationContent>
                             <progress>${progress}</progress>
@@ -328,13 +308,14 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 
             payload = utils.formatXml(payload)
             execution.setVariable("CVFMI_updateServiceOperStatusRequest", payload)
-            utils.log("DEBUG", "Outgoing updateServiceOperStatusRequest: \n" + payload, isDebugEnabled)
+            utils.log("INFO", "Outgoing updateServiceOperStatusRequest: \n" + payload, isDebugEnabled)
             utils.logAudit("CreateVfModuleInfra Outgoing updateServiceOperStatusRequest Request: " + payload)
 
         }catch(Exception e){
             utils.log("ERROR", "Exception Occured Processing prepareInitServiceOperationStatus. Exception is:\n" + e, isDebugEnabled)
             execution.setVariable("CVFMI_ErrorResponse", "Error Occurred during prepareInitServiceOperationStatus Method:\n" + e.getMessage())
         }
-        utils.log("DEBUG", "======== COMPLETED prepareInitServiceOperationStatus Process ======== ", isDebugEnabled)    
+        utils.log("INFO", "======== COMPLETED prepareInitServiceOperationStatus Process ======== ", isDebugEnabled)    
 	}
-}
-\ No newline at end of file
+	
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericALaCarteServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericALaCarteServiceInstance.groovy
index 9416e6851a..80d714893d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericALaCarteServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericALaCarteServiceInstance.groovy
@@ -37,6 +37,7 @@ import org.camunda.bpm.engine.runtime.Execution
 import org.apache.commons.lang3.*
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.web.util.UriUtils
+import org.json.JSONException;
 
 /**
  * This groovy class supports the <class>CreateGenericALaCarteServiceInstance.bpmn</class> process.
@@ -85,7 +86,12 @@ public class CreateGenericALaCarteServiceInstance extends AbstractServiceTaskPro
 			execution.setVariable("source", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source"))
 			execution.setVariable("serviceInstanceName", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.instanceName"))
 			execution.setVariable("disableRollback", jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.suppressRollback"))
-			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")
+			String productFamilyId = null;
+			try { 
+				productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")
+			} catch (JSONException e) {
+				productFamilyId = null;
+			}
 			if (isBlank(productFamilyId))
 			{
 				msg = "Input productFamilyId is null"
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
index 99c37fb142..37ff4944ff 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVfModuleInfra.groovy
@@ -408,7 +408,7 @@ public class CreateVfModuleInfra extends AbstractServiceTaskProcessor {
 			// vfModuleName may be generated by DoCreateVfModule subprocess if it is not specified on the input
 			def vfModuleName = execution.getVariable("CVFMI_vfModuleName")
 
-			def dbAdapterEndpoint = execution.getVariable("URN_mso_openecomp_adapters_db_endpoint")
+			def dbAdapterEndpoint = execution.getVariable("URN_mso_adapters_openecomp_db_endpoint")
 			execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
 			utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy
index 7a047d4992..49e4cc9257 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy
@@ -64,7 +64,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 		execution.setVariable("prefix",Prefix)
 		String msg = ""
 		
-		utils.log("DEBUG", " *** preProcessRequest Request *** ", isDebugEnabled)
+		utils.log("INFO", " *** preProcessRequest Request *** ", isDebugEnabled)
 
 		try {
 			// check for incoming json message/input
@@ -74,114 +74,73 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 
 			String requestId = execution.getVariable("mso-request-id")
 			execution.setVariable("msoRequestId", requestId)
-			utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
+			utils.log("INFO", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)
 			
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			if (isBlank(serviceInstanceId)) {
 				msg = "Input serviceInstanceId' is null"
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			}
-		
-			//String xmlRequestDetails = vidUtils.getJsonRequestDetailstoXml(siRequest)
-			//execution.setVariable("requestDetails", xmlRequestDetails)
-			
-			//modelInfo
-			String serviceModelInfo = jsonUtil.getJsonValue(siRequest, "requestDetails.modelInfo")
-			if (isBlank(serviceModelInfo)) {
-				msg = "Input serviceModelInfo is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-			} else
-			{
-				execution.setVariable("serviceModelInfo", serviceModelInfo)
-				//utils.log("DEBUG", "modelInfo" + serviceModelInfo,  isDebugEnabled)
-			}
-			
-			//requestInfo
-			String productFamilyId = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.productFamilyId")
-			if (isBlank(productFamilyId))
-			{
-				msg = "Input productFamilyId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+						
+			String serviceType = execution.getVariable("serviceType")
+			if (isBlank(serviceType)) {
+				msg = "Input serviceType' is null"
+				utils.log("INFO", msg, isDebugEnabled)
 			} else {
-				execution.setVariable("productFamilyId", productFamilyId)
+				execution.setVariable("serviceType", serviceType)
 			}
-			String source = jsonUtil.getJsonValue(siRequest, "requestDetails.requestInfo.source")
-			execution.setVariable("source", source)
 			
 			//subscriberInfo
-			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "requestDetails.subscriberInfo.globalSubscriberId")
+			String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "globalSubscriberId")
 			if (isBlank(globalSubscriberId)) {
 				msg = "Input globalSubscriberId' is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 			} else {
 				execution.setVariable("globalSubscriberId", globalSubscriberId)
 			}
 			
-			//requestParameters
-			String subscriptionServiceType = jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.subscriptionServiceType")
-			if (isBlank(subscriptionServiceType)) {
-				msg = "Input subscriptionServiceType is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				//exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			} else {
-				execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-			}
+			//operationId
+			String operationId = jsonUtil.getJsonValue(siRequest, "operationId")
+		 	if (isBlank(operationId)) {
+		 		operationId = UUID.randomUUID().toString()
+		 	 }   
+			execution.setVariable("operationId", operationId) 
+			execution.setVariable("operationType", "DELETE") 
 			
-			/*
-			 * Extracting User Parameters from incoming Request and converting into a Map
-			 */
-			def jsonSlurper = new JsonSlurper()
-			def jsonOutput = new JsonOutput()
-
-			Map reqMap = jsonSlurper.parseText(siRequest)
-
-			//InputParams
-			def userParams = reqMap.requestDetails?.requestParameters?.userParams
-
-			Map<String, String> inputMap = [:]
-			if (userParams) {
-				userParams.each {
-					userParam -> inputMap.put(userParam.name, userParam.value)
-				}
-			}
+			execution.setVariable("URN_mso_adapters_openecomp_db_endpoint","http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter")
 			
-			utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
-			execution.setVariable("serviceInputParams", inputMap)
-
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception ex){
 			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+		utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)
 	}
 
 	public void sendSyncResponse (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncResponse  *** ", isDebugEnabled)
+		utils.log("INFO", " *** sendSyncResponse  *** ", isDebugEnabled)
 
 		try {
-			String requestId = execution.getVariable("msoRequestId")
-			String serviceInstanceId = execution.getVariable("serviceInstanceId")
-
-			// RESTResponse (for API Handler (APIH) Reply Task)
-			String syncResponse = """{"requestReferences":{"instanceId":"${serviceInstanceId}","requestId":"${requestId}"}}""".trim()
-			utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
+			String operationId = execution.getVariable("operationId")
+			
+			// RESTResponse (for API Handler (APIH) Reply Task) :  :  
+			String syncResponse = """{"operationId":"${operationId}"}""".trim()
+			utils.log("INFO", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)
 			sendWorkflowResponse(execution, 202, syncResponse)
 
 		} catch (Exception ex) {
 			String msg  = "Exception in sendSyncResponse: " + ex.getMessage()
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 		}
-		utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
+		utils.log("INFO"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)
 	}
 	
 	public void sendSyncError (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)
+		utils.log("INFO", " *** sendSyncError *** ", isDebugEnabled)
 
 		try {
 			String errorMessage = ""
@@ -202,14 +161,14 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 			sendWorkflowResponse(execution, 500, buildworkflowException)
 
 		} catch (Exception ex) {
-			utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
+			utils.log("INFO", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)
 		}
 
 	}
 	
 	public void prepareCompletionRequest (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)
+		utils.log("INFO", " *** prepareCompletion *** ", isDebugEnabled)
 
 		try {
 			String requestId = execution.getVariable("msoRequestId")
@@ -230,23 +189,23 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 			String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)
 
 			execution.setVariable("completionRequest", xmlMsoCompletionRequest)
-			utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
+			utils.log("INFO", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)
 
 		} catch (Exception ex) {
 			String msg = " Exception in prepareCompletion:" + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
+		utils.log("INFO", "*** Exit prepareCompletionRequest ***", isDebugEnabled)
 	}
 	
 	public void prepareFalloutRequest(Execution execution){
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)
+		utils.log("INFO", " *** prepareFalloutRequest *** ", isDebugEnabled)
 
 		try {
 			WorkflowException wfex = execution.getVariable("WorkflowException")
-			utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
+			utils.log("INFO", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)
 			String requestId = execution.getVariable("msoRequestId")
 			String source = execution.getVariable("source")
 			String requestInfo =
@@ -259,7 +218,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 			String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)
 			execution.setVariable("falloutRequest", falloutRequest)
 		} catch (Exception ex) {
-			utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
+			utils.log("INFO", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)
 			String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()
 			String requestId = execution.getVariable("msoRequestId")
 			String falloutRequest =
@@ -279,7 +238,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 
 			execution.setVariable("falloutRequest", falloutRequest)
 		}
-		utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
+		utils.log("INFO", "*** Exit prepareFalloutRequest ***", isDebugEnabled)
 	}
 	
 
@@ -291,7 +250,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 		execution.setVariable("prefix", Prefix)
 
 		try {
-			utils.log("DEBUG", " ***** Inside prepareDBRequest of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)
+			utils.log("INFO", " ***** Inside prepareDBRequest of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)
 
 			String requestId = execution.getVariable("DELSI_requestId")
 			String statusMessage = "E2E Service Instance successfully deleted."
@@ -332,7 +291,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		execution.setVariable("prefix", Prefix)
 
-		utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)
+		utils.log("INFO", " ***** Inside prepareDBRequestError of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)
 
 		try {
 			String requestId = execution.getVariable("DELSI_requestId")
@@ -372,4 +331,8 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 		}
 
 	 }
+
+	public void processJavaException(Execution execution) {
+		//TODO:
+	}
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
index a2be3035a6..dbefb6c346 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
@@ -81,31 +81,29 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 	public void preProcessRequest (Execution execution) {
 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 		String msg = ""
-		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)
+		utils.log("INFO"," ***** preProcessRequest *****",  isDebugEnabled)
 
 		try {
-			String requestId = execution.getVariable("msoRequestId")
 			execution.setVariable("prefix", Prefix)
-			
 			//Inputs
 			//requestDetails.subscriberInfo. for AAI GET & PUT & SDNC assignToplology
 			String globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId
-
+			utils.log("INFO"," ***** globalSubscriberId *****" + globalSubscriberId,  isDebugEnabled)
 			//requestDetails.requestParameters. for AAI PUT & SDNC assignTopology
-			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-
+			String serviceType = execution.getVariable("serviceType")
+			utils.log("INFO"," ***** serviceType *****" + serviceType,  isDebugEnabled)
 			//requestDetails.requestParameters. for SDNC assignTopology
 			String productFamilyId = execution.getVariable("productFamilyId") //AAI productFamilyId
 
 			if (isBlank(globalSubscriberId)) {
 				msg = "Input globalSubscriberId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			}
 			
-			if (isBlank(subscriptionServiceType)) {
-				msg = "Input subscriptionServiceType is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+			if (isBlank(serviceType)) {
+				msg = "Input serviceType is null"
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			}
 			
@@ -116,93 +114,27 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 			String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')
 			if (isBlank(sdncCallbackUrl)) {
 				msg = "URN_mso_workflow_sdncadapter_callback is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			}
 			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
-			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
+			utils.log("INFO","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
 
-			//requestDetails.modelInfo.for AAI PUT servieInstanceData & SDNC assignTopology
-			String modelInvariantUuid = ""
-			String modelVersion = ""
-			String modelUuid = ""
-			String modelName = ""
-			String serviceInstanceName = "" 
-			//Generated in parent.for AAI PUT
-			String serviceInstanceId = ""
-			String serviceType = ""
-			String serviceRole = ""
-			
-			//requestDetails.requestInfo. for AAI GET/PUT serviceInstanceData & SDNC assignToplology
-			serviceInstanceName = execution.getVariable("serviceInstanceName")
-			serviceInstanceId = execution.getVariable("serviceInstanceId")
-			
-			String serviceModelInfo = execution.getVariable("serviceModelInfo")
-			if (isBlank(serviceModelInfo)) {
-				msg = "Input serviceModelInfo is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			}
-			modelInvariantUuid = jsonUtil.getJsonValue(serviceModelInfo, "modelInvariantUuid")
-			modelVersion = jsonUtil.getJsonValue(serviceModelInfo, "modelVersion")
-			modelUuid = jsonUtil.getJsonValue(serviceModelInfo, "modelUuid")
-			modelName = jsonUtil.getJsonValue(serviceModelInfo, "modelName")
-			//modelCustomizationUuid NA for SI
-	
-			execution.setVariable("serviceType", serviceType)
-			execution.setVariable("serviceRole", serviceRole)
-			
-			if (serviceInstanceName == null) {
-				execution.setVariable("serviceInstanceName", "")
-				serviceInstanceName = ""
-			}
-			if (isBlank(serviceInstanceId)){
-				msg = "Input serviceInstanceId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			}
-			
-			if (modelInvariantUuid == null) {
-				modelInvariantUuid = ""
-			}
-			if (modelUuid == null) {
-				modelUuid = ""
-			}
-			if (modelVersion == null) {
-				modelVersion = ""
-			}
-			if (modelName == null) {
-				modelName = ""
-			}
+			//requestDetails.modelInfo.for AAI PUT servieInstanceData 			
+			//requestDetails.requestInfo. for AAI GET/PUT serviceInstanceData 
+			String serviceInstanceName = execution.getVariable("serviceInstanceName")
+			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String uuiRequest = execution.getVariable("uuiRequest")
+			String modelInvariantUuid = jsonUtil.getJsonValue(uuiRequest, "service.serviceDefId")
+			String modelUuid = jsonUtil.getJsonValue(uuiRequest, "service.templateId")
+			String serviceModelName = jsonUtil.getJsonValue(uuiRequest, "service.parameters.templateName")
+			execution.setVariable("serviceModelName", serviceModelName)
+			//aai serviceType and Role can be setted as fixed value now.
+			String aaiServiceType = "voLTE type"
+			String aaiServiceRole = "voLTE role"
 			
 			execution.setVariable("modelInvariantUuid", modelInvariantUuid)
-			execution.setVariable("modelVersion", modelVersion)
 			execution.setVariable("modelUuid", modelUuid)
-			execution.setVariable("modelName", modelName)
-			 
-			StringBuilder sbParams = new StringBuilder()
-			Map<String, String> paramsMap = execution.getVariable("serviceInputParams")
-			if (paramsMap != null)
-			{
-				sbParams.append("<service-input-parameters>")
-				for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
-					String paramsXml
-					String paramName = entry.getKey()
-					String paramValue = entry.getValue()
-					paramsXml =
-							"""	<param>
-							<name>${paramName}</name>
-							<value>${paramValue}</value>
-							</param>
-							"""
-					sbParams.append(paramsXml)
-				}
-				sbParams.append("</service-input-parameters>")
-			}
-			String siParamsXml = sbParams.toString()
-			if (siParamsXml == null)
-				siParamsXml = ""
-			execution.setVariable("siParamsXml", siParamsXml)
 
 			//AAI PUT
 			String oStatus = execution.getVariable("initialStatus") ?: ""
@@ -218,111 +150,39 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 			String namespace = aaiUriUtil.getNamespaceFromUri(aai_uri)
 			String serviceInstanceData =
 					"""<service-instance xmlns=\"${namespace}\">
-					<service-instance-name>${serviceInstanceName}</service-instance-name>
-					<service-type>${serviceType}</service-type>
-					<service-role>${serviceRole}</service-role>
+			        <service-instance-id>${serviceInstanceId}</service-instance-id>
+			        <service-instance-name>${serviceInstanceName}</service-instance-name>
+					<service-type>${aaiServiceType}</service-type>
+					<service-role>${aaiServiceRole}</service-role>
 					${statusLine}
 				    <model-invariant-id>${modelInvariantUuid}</model-invariant-id>
 				    <model-version-id>${modelUuid}</model-version-id>
-					</service-instance>""".trim()
-
+					</service-instance>""".trim()					
 			execution.setVariable("serviceInstanceData", serviceInstanceData)
 			utils.logAudit(serviceInstanceData)
-			utils.log("DEBUG", " 'payload' to create Service Instance in AAI - " + "\n" + serviceInstanceData, isDebugEnabled)
+			utils.log("INFO", " aai_uri " + aai_uri + " namespace:" + namespace, isDebugEnabled)
+			utils.log("INFO", " 'payload' to create Service Instance in AAI - " + "\n" + serviceInstanceData, isDebugEnabled)
 
 		} catch (BpmnError e) {
 			throw e;
 		} catch (Exception ex){
 			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
-	}
-
-	//TODO: Will be able to replace with call to CustomE2EGetService as per the GenericGetService
-	public void getAAICustomerById (Execution execution) {
-		// https://{aaiEP}/aai/v8/business/customers/customer/{globalCustomerId}
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		String msg = ""
-		try {
-
-			String globalCustomerId = execution.getVariable("globalSubscriberId") //UUI to AAI name map
-			utils.log("DEBUG"," ***** getAAICustomerById ***** globalCustomerId:" + globalCustomerId, isDebugEnabled)
-
-			String aai_endpoint = execution.getVariable("URN_aai_endpoint")
-			AaiUtil aaiUriUtil = new AaiUtil(this)
-			String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
-			if (isBlank(aai_endpoint) || isBlank(aai_uri))
-			{
-				msg = "AAI URL is invalid. Endpoint:" + aai_endpoint + aai_uri
-				utils.log("DEBUG", msg, isDebugEnabled)
-				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-			}
-			String getAAICustomerUrl = "${aai_endpoint}${aai_uri}/" + UriUtils.encode(globalCustomerId,"UTF-8")
-
-			utils.logAudit(getAAICustomerUrl)
-			utils.log("DEBUG", "getAAICustomerById Url:" + getAAICustomerUrl, isDebugEnabled)
-			APIResponse response = aaiUriUtil.executeAAIGetCall(execution, getAAICustomerUrl)
-			String returnCode = response.getStatusCode()
-			String aaiResponseAsString = response.getResponseBodyAsString()
-
-			msg = "getAAICustomerById ResponseCode:" + returnCode + " ResponseString:" + aaiResponseAsString
-			utils.log("DEBUG",msg, isDebugEnabled)
-			utils.logAudit(msg)
-
-			if (returnCode=='200') {
-				// Customer found by ID. FLow to proceed.
-				utils.log("DEBUG",msg, isDebugEnabled)
-
-				//TODO Deferred
-				//we might verify that service-subscription with matching name exists
-				//and throw error if not. If not checked, we will get exception in subsequent step on Create call
-				//in 1610 we assume both customer & service subscription were pre-created
-
-			} else {
-				if (returnCode=='404') {
-					msg = "GlobalCustomerId:" + globalCustomerId + " not found (404) in AAI"
-					utils.log("DEBUG", msg, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
-
-				} else {
-					if (aaiResponseAsString.contains("RESTFault")) {
-						utils.log("ERROR", aaiResponseAsString)
-						WorkflowException workflowException = exceptionUtil.MapAAIExceptionToWorkflowException(aaiResponseAsString, execution)
-						execution.setVariable("WorkflowException", workflowException)
-						throw new BpmnError("MSOWorkflowException")
-
-					} else {
-						// aai all errors
-						msg = "Error in getAAICustomerById ResponseCode:" + returnCode
-						utils.log("DEBUG", msg, isDebugEnabled)
-						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
-					}
-				}
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch (Exception ex) {
-			msg = "Exception in getAAICustomerById. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," *****Exit getAAICustomerById *****", isDebugEnabled)
-
+		utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)
 	}
 
 	public void postProcessAAIGET(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessAAIGET ***** ", isDebugEnabled)
+		utils.log("INFO"," ***** postProcessAAIGET ***** ", isDebugEnabled)
 		String msg = ""
 
 		try {
 			String serviceInstanceName = execution.getVariable("serviceInstanceName")
 			boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
 			if(succInAAI != true){
-				utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceName, isDebugEnabled)
+				utils.log("INFO","Error getting Service-instance from AAI", + serviceInstanceName, isDebugEnabled)
 				WorkflowException workflowException = execution.getVariable("WorkflowException")
 				utils.logAudit("workflowException: " + workflowException)
 				if(workflowException != null){
@@ -331,7 +191,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 				else
 				{
 					msg = "Failure in postProcessAAIGET GENGS_SuccessIndicator:" + succInAAI
-					utils.log("DEBUG", msg, isDebugEnabled)
+					utils.log("INFO", msg, isDebugEnabled)
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
 				}
 			}
@@ -339,9 +199,9 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 			{
 				boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
 				if(foundInAAI == true){
-					utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)
+					utils.log("INFO","Found Service-instance in AAI", isDebugEnabled)
 					msg = "ServiceInstance already exists in AAI:" + serviceInstanceName
-					utils.log("DEBUG", msg, isDebugEnabled)
+					utils.log("INFO", msg, isDebugEnabled)
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
 				}
 			}
@@ -349,21 +209,21 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception ex) {
 			msg = "Exception in DoCreateServiceInstance.postProcessAAIGET. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
+		utils.log("INFO"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
 	}
 
 	public void postProcessAAIPUT(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessAAIPUT ***** ", isDebugEnabled)
+		utils.log("INFO"," ***** postProcessAAIPUT ***** ", isDebugEnabled)
 		String msg = ""
 		try {
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			boolean succInAAI = execution.getVariable("GENPS_SuccessIndicator")
 			if(succInAAI != true){
-				utils.log("DEBUG","Error putting Service-instance in AAI", + serviceInstanceId, isDebugEnabled)
+				utils.log("INFO","Error putting Service-instance in AAI", + serviceInstanceId, isDebugEnabled)
 				WorkflowException workflowException = execution.getVariable("WorkflowException")
 				utils.logAudit("workflowException: " + workflowException)
 				if(workflowException != null){
@@ -387,150 +247,22 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception ex) {
 			msg = "Exception in DoCreateServiceInstance.postProcessAAIDEL. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," *** Exit postProcessAAIPUT *** ", isDebugEnabled)
-	}
-
-	public void preProcessSDNCAssignRequest(Execution execution) {
-		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		String msg = ""
-		utils.log("DEBUG"," ***** preProcessSDNCAssignRequest *****", isDebugEnabled)
-
-		try {
-			def serviceInstanceId = execution.getVariable("serviceInstanceId")
-			def serviceInstanceName = execution.getVariable("serviceInstanceName")
-			def callbackURL = execution.getVariable("sdncCallbackUrl")
-			def requestId = execution.getVariable("msoRequestId")
-			def serviceId = execution.getVariable("productFamilyId")
-			def subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-			def globalSubscriberId = execution.getVariable("globalSubscriberId") //globalCustomerId
-			def serviceType = execution.getVariable("serviceType")
-
-			def modelInvariantUuid = execution.getVariable("modelInvariantUuid")
-			def modelVersion = execution.getVariable("modelVersion")
-			def modelUuid = execution.getVariable("modelUuid")
-			def modelName = execution.getVariable("modelName")
-			
-			def sdncRequestId = UUID.randomUUID().toString()
-			
-			def siParamsXml = execution.getVariable("siParamsXml")
-			
-			String sdncAssignRequest =
-					"""<sdncadapterworkflow:SDNCAdapterWorkflowRequest xmlns:ns5="http://org.openecomp/mso/request/types/v1"
-													xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1"
-													xmlns:sdncadapter="http://org.openecomp/workflow/sdnc/adapter/schema/v1">
-				   <sdncadapter:RequestHeader>
-							<sdncadapter:RequestId>${sdncRequestId}</sdncadapter:RequestId>
-							<sdncadapter:SvcInstanceId>${serviceInstanceId}</sdncadapter:SvcInstanceId>
-							<sdncadapter:SvcAction>assign</sdncadapter:SvcAction>
-							<sdncadapter:SvcOperation>service-topology-operation</sdncadapter:SvcOperation>
-							<sdncadapter:CallbackUrl>${callbackURL}</sdncadapter:CallbackUrl>
-							<sdncadapter:MsoAction>${serviceType}</sdncadapter:MsoAction>
-					</sdncadapter:RequestHeader>
-				<sdncadapterworkflow:SDNCRequestData>
-					<request-information>
-						<request-id>${requestId}</request-id>
-						<source>MSO</source>
-						<notification-url/>
-						<order-number/>
-						<order-version/>
-						<request-action>CreateServiceInstance</request-action>
-					</request-information>
-					<service-information>
-						<service-id>${serviceId}</service-id>
-						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information>
-					         <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
-					         <model-uuid>${modelUuid}</model-uuid>
-					         <model-version>${modelVersion}</model-version>
-					         <model-name>${modelName}</model-name>
-					    </ecomp-model-information>
-						<service-instance-id>${serviceInstanceId}</service-instance-id>
-						<subscriber-name/>
-						<global-customer-id>${globalSubscriberId}</global-customer-id>
-					</service-information>
-					<service-request-input>
-						<service-instance-name>${serviceInstanceName}</service-instance-name>
-						${siParamsXml}
-					</service-request-input>
-				</sdncadapterworkflow:SDNCRequestData>
-				</sdncadapterworkflow:SDNCAdapterWorkflowRequest>"""
-
-			utils.log("DEBUG","sdncAssignRequest:\n" + sdncAssignRequest, isDebugEnabled)
-			sdncAssignRequest = utils.formatXml(sdncAssignRequest)
-			execution.setVariable("sdncAssignRequest", sdncAssignRequest)
-			utils.logAudit("sdncAssignRequest:  " + sdncAssignRequest)
-
-			def sdncRequestId2 = UUID.randomUUID().toString()
-			String sdncDelete = sdncAssignRequest.replace(">assign<", ">delete<").replace(">CreateServiceInstance<", ">DeleteServiceInstance<").replace(">${sdncRequestId}<", ">${sdncRequestId2}<")
-			def sdncRequestId3 = UUID.randomUUID().toString()
-			String sdncDeactivate = sdncDelete.replace(">delete<", ">deactivate<").replace(">${sdncRequestId2}<", ">${sdncRequestId3}<")
-			def rollbackData = execution.getVariable("rollbackData")
-			rollbackData.put("SERVICEINSTANCE", "sdncDeactivate", sdncDeactivate)
-			rollbackData.put("SERVICEINSTANCE", "sdncDelete", sdncDelete)
-			execution.setVariable("rollbackData", rollbackData)
-			
-			utils.log("DEBUG","rollbackData:\n" + rollbackData.toString(), isDebugEnabled)
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch(Exception ex) {
-			msg = "Exception in preProcessSDNCAssignRequest. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," *****Exit preProcessSDNCAssignRequest *****", isDebugEnabled)
-	}
-	
-	public void postProcessSDNCAssign (Execution execution) {
-		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessSDNCAssign ***** ", isDebugEnabled)
-		try {
-			WorkflowException workflowException = execution.getVariable("WorkflowException")
-			utils.logAudit("workflowException: " + workflowException)
-
-			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-
-			String response = execution.getVariable("sdncAdapterResponse")
-			utils.logAudit("SDNCResponse: " + response)
-
-			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
-			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-
-			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
-				utils.log("DEBUG","Good response from SDNC Adapter for service-instance  topology assign: \n" + response, isDebugEnabled)
-
-				def rollbackData = execution.getVariable("rollbackData")
-				rollbackData.put("SERVICEINSTANCE", "rollbackSDNC", "true")
-				execution.setVariable("rollbackData", rollbackData)
-
-			}else{
-				utils.log("DEBUG","Bad Response from SDNC Adapter for service-instance assign", isDebugEnabled)
-				throw new BpmnError("MSOWorkflowException")
-			}
-
-		} catch (BpmnError e) {
-			throw e;
-		} catch(Exception ex) {
-			msg = "Exception in postProcessSDNCAssign. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
-			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," *** Exit postProcessSDNCAssign *** ", isDebugEnabled)
+		utils.log("INFO"," *** Exit postProcessAAIPUT *** ", isDebugEnabled)
 	}
 	
 	public void postProcessAAIGET2(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessAAIGET2 ***** ", isDebugEnabled)
+		utils.log("INFO"," ***** postProcessAAIGET2 ***** ", isDebugEnabled)
 		String msg = ""
 
 		try {
 			String serviceInstanceName = execution.getVariable("serviceInstanceName")
 			boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
 			if(succInAAI != true){
-				utils.log("DEBUG","Error getting Service-instance from AAI in postProcessAAIGET2", + serviceInstanceName, isDebugEnabled)
+				utils.log("INFO","Error getting Service-instance from AAI in postProcessAAIGET2", + serviceInstanceName, isDebugEnabled)
 				WorkflowException workflowException = execution.getVariable("WorkflowException")
 				utils.logAudit("workflowException: " + workflowException)
 				if(workflowException != null){
@@ -539,7 +271,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 				else
 				{
 					msg = "Failure in postProcessAAIGET2 GENGS_SuccessIndicator:" + succInAAI
-					utils.log("DEBUG", msg, isDebugEnabled)
+					utils.log("INFO", msg, isDebugEnabled)
 					exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
 				}
 			}
@@ -550,7 +282,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 					String aaiService = execution.getVariable("GENGS_service")
 					if (!isBlank(aaiService) && (utils.nodeExists(aaiService, "service-instance-name"))) {
 						execution.setVariable("serviceInstanceName",  utils.getNodeText1(aaiService, "service-instance-name"))
-						utils.log("DEBUG","Found Service-instance in AAI.serviceInstanceName:" + execution.getVariable("serviceInstanceName"), isDebugEnabled)
+						utils.log("INFO","Found Service-instance in AAI.serviceInstanceName:" + execution.getVariable("serviceInstanceName"), isDebugEnabled)
 					}
 				}
 			}
@@ -558,58 +290,58 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception ex) {
 			msg = "Exception in DoCreateServiceInstance.postProcessAAIGET2 " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," *** Exit postProcessAAIGET2 *** ", isDebugEnabled)
+		utils.log("INFO"," *** Exit postProcessAAIGET2 *** ", isDebugEnabled)
 	}
 
 	public void preProcessRollback (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** preProcessRollback ***** ", isDebugEnabled)
+		utils.log("INFO"," ***** preProcessRollback ***** ", isDebugEnabled)
 		try {
 			
 			Object workflowException = execution.getVariable("WorkflowException");
 
 			if (workflowException instanceof WorkflowException) {
-				utils.log("DEBUG", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugEnabled)
+				utils.log("INFO", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugEnabled)
 				execution.setVariable("prevWorkflowException", workflowException);
 				//execution.setVariable("WorkflowException", null);
 			}
 		} catch (BpmnError e) {
-			utils.log("DEBUG", "BPMN Error during preProcessRollback", isDebugEnabled)
+			utils.log("INFO", "BPMN Error during preProcessRollback", isDebugEnabled)
 		} catch(Exception ex) {
 			String msg = "Exception in preProcessRollback. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 		}
-		utils.log("DEBUG"," *** Exit preProcessRollback *** ", isDebugEnabled)
+		utils.log("INFO"," *** Exit preProcessRollback *** ", isDebugEnabled)
 	}
 
 	public void postProcessRollback (Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessRollback ***** ", isDebugEnabled)
+		utils.log("INFO"," ***** postProcessRollback ***** ", isDebugEnabled)
 		String msg = ""
 		try {
 			Object workflowException = execution.getVariable("prevWorkflowException");
 			if (workflowException instanceof WorkflowException) {
-				utils.log("DEBUG", "Setting prevException to WorkflowException: ", isDebugEnabled)
+				utils.log("INFO", "Setting prevException to WorkflowException: ", isDebugEnabled)
 				execution.setVariable("WorkflowException", workflowException);
 			}
 			execution.setVariable("rollbackData", null)
 		} catch (BpmnError b) {
-			utils.log("DEBUG", "BPMN Error during postProcessRollback", isDebugEnabled)
+			utils.log("INFO", "BPMN Error during postProcessRollback", isDebugEnabled)
 			throw b;
 		} catch(Exception ex) {
 			msg = "Exception in postProcessRollback. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 		}
-		utils.log("DEBUG"," *** Exit postProcessRollback *** ", isDebugEnabled)
+		utils.log("INFO"," *** Exit postProcessRollback *** ", isDebugEnabled)
 	}
 
 	public void preInitResourcesOperStatus(Execution execution){
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 
-        utils.log("DEBUG", " ======== STARTED preInitResourcesOperStatus Process ======== ", isDebugEnabled)
+        utils.log("INFO", " ======== STARTED preInitResourcesOperStatus Process ======== ", isDebugEnabled)
         try{
             String serviceId = execution.getVariable("serviceInstanceId")
             String operationId = execution.getVariable("operationId")
@@ -619,26 +351,21 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
             String progress = "0"
             String reason = ""
             String operationContent = "Prepare service creation"
-            utils.log("DEBUG", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + oprationType, isDebugEnabled)
+            utils.log("INFO", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + operationType, isDebugEnabled)
             serviceId = UriUtils.encode(serviceId,"UTF-8")
             execution.setVariable("serviceInstanceId", serviceId)
             execution.setVariable("operationId", operationId)
             execution.setVariable("operationType", operationType)
-            def jsonSlurper = new JsonSlurper()
-            def jsonOutput = new JsonOutput()
-            String incomingRequest = execution.getVariable("bpmnRequest")
-            Map serviceReq =  jsonSlurper.parseText(incomingRequest)
-            def segmentList = serviceReq.service.parameters.segments
-                    
-            if (segmentList != null) {
-                segmentList.each {
-                    resourceTemplateUUIDs  = resourcesUUIDs + it.resourceUUID + ":"
-                }
-            }            
-
-            def dbAdapterEndpoint = execution.getVariable("URN_mso_openecomp_adapters_db_endpoint")
+            String incomingRequest = execution.getVariable("uuiRequest")
+            String resourcesStr = jsonUtil.getJsonValue(incomingRequest, "service.parameters.resources")  
+            List<String> resourceList = jsonUtil.StringArrayToList(execution, resourcesStr)   
+            for(String resource : resourceList){
+                    resourceTemplateUUIDs  = resourceTemplateUUIDs + jsonUtil.getJsonValue(resource, "resourceId") + ":"
+            }           
+
+            def dbAdapterEndpoint = "http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter"
             execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
-            utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
+            utils.log("INFO", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
 
             String payload =
                 """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
@@ -656,45 +383,58 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 
             payload = utils.formatXml(payload)
             execution.setVariable("CVFMI_initResOperStatusRequest", payload)
-            utils.log("DEBUG", "Outgoing initResourceOperationStatus: \n" + payload, isDebugEnabled)
+            utils.log("INFO", "Outgoing initResourceOperationStatus: \n" + payload, isDebugEnabled)
             utils.logAudit("CreateVfModuleInfra Outgoing initResourceOperationStatus Request: " + payload)
 
         }catch(Exception e){
             utils.log("ERROR", "Exception Occured Processing preInitResourcesOperStatus. Exception is:\n" + e, isDebugEnabled)
             execution.setVariable("CVFMI_ErrorResponse", "Error Occurred during preInitResourcesOperStatus Method:\n" + e.getMessage())
         }
-        utils.log("DEBUG", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled)  
+        utils.log("INFO", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled)  
 	}
 	
 	/**
 	 * prepare resource create request
 	 */
-	public void preResourceRequest(execution, resourceType){
+	public void preResourceRequest(execution){
+	    String resourceType = execution.getVariable("resourceType")
 	    def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 	    String serviceInstanceName = execution.getVariable("serviceInstanceName")
-	    String nsServiceName = nsName + "_" + serviceInstanceName
-	    String nsServiceDescription = execution.getVariable("serviceInstanceDescription")
+	    String nsServiceName = resourceType + "_" + serviceInstanceName
 	    execution.setVariable("nsServiceName", nsServiceName)
-	    utils.log("DEBUG", "Prepare VFC Request nsServiceName:" + nsServiceName, isDebugEnabled)
-	    execution.setVariable("nsServiceDescription", nsServiceDescription)
-	    utils.log("DEBUG", "Prepare VFC Request nsServiceDescription:" + nsServiceDescription, isDebugEnabled)
+	    utils.log("INFO", "Prepare VFC Request nsServiceName:" + nsServiceName, isDebugEnabled)
         String globalSubscriberId = execution.getVariable("globalSubscriberId")
         String serviceType = execution.getVariable("serviceType")
-        String serviceId = execution.getVariable("serviceId")
+        String serviceId = execution.getVariable("serviceInstanceId")
+        execution.setVariable("serviceId", serviceId)
         String operationId = execution.getVariable("operationId")
-        String incomingRequest = execution.getVariable("bpmnRequest")
-        Map serviceReq =  jsonSlurper.parseText(incomingRequest)
-        def segmentList = serviceReq.service.parameters.segments                
-        if (segmentList != null) {
-            segmentList.each {
-                if(StringUtils.containsIgnoreCase(it.resourceName, resourceType)){
-                    String resourceUUID  = it.resourceUUID
-                    String resourceParameters = it.nsParameters
-                    execution.setVariable("resourceType", resourceType)
-                    execution.setVariable("resourceUUID", resourceUUID)
-                    execution.setVariable("resourceParameters", resourceParameters)
-                }                
-            }
-        } 
+        String incomingRequest = execution.getVariable("uuiRequest")
+        String resourcesStr = jsonUtil.getJsonValue(incomingRequest, "service.parameters.resources")  
+        String nsServiceDescription = jsonUtil.getJsonValue(incomingRequest, "service.description")  
+        execution.setVariable("nsServiceDescription", nsServiceDescription)
+        utils.log("INFO", "Prepare VFC Request nsServiceDescription:" + nsServiceDescription, isDebugEnabled)
+        List<String> resourceList = jsonUtil.StringArrayToList(execution, resourcesStr)   
+        for(String resource : resourceList){
+            String resourceName = jsonUtil.getJsonValue(resource, "resourceName")  
+            if(StringUtils.containsIgnoreCase(resourceName, resourceType)){
+                String resourceUUID  = jsonUtil.getJsonValue(resource, "resourceId")
+                String resourceInvariantUUID  = jsonUtil.getJsonValue(resource, "resourceDefId")
+                String resourceParameters = jsonUtil.getJsonValue(resource, "nsParameters")                
+                execution.setVariable("resourceUUID", resourceUUID)
+                execution.setVariable("resourceInvariantUUID", resourceInvariantUUID)
+                execution.setVariable("resourceParameters", resourceParameters)
+                utils.log("INFO", "Prepare VFC Request resourceType:" + resourceType, isDebugEnabled)
+                utils.log("INFO", "Prepare VFC Request resourceUUID:" + resourceUUID, isDebugEnabled)
+                utils.log("INFO", "Prepare VFC Request resourceParameters:" + resourceParameters, isDebugEnabled)
+            } 
+        }
+	    utils.log("INFO", "Prepare VFC Request finished", isDebugEnabled)
+	}
+	
+	   /**
+     * post config request.
+     */
+	public void postConfigRequest(execution){
+	    //now do noting
 	}
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
index 0eb16a2d9e..affb932ff4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
@@ -257,6 +257,8 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 			}
 
 			String statusLine = isBlank(oStatus) ? "" : "<orchestration-status>${oStatus}</orchestration-status>"
+			String serviceTypeLine = isBlank(serviceType) ? "" : "<service-type>${serviceType}</service-type>"
+			String serviceRoleLine = isBlank(serviceRole) ? "" : "<service-role>${serviceRole}</service-role>"
 				
 			AaiUtil aaiUriUtil = new AaiUtil(this)
 			String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
@@ -264,8 +266,8 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 			String serviceInstanceData =
 					"""<service-instance xmlns=\"${namespace}\">
 					<service-instance-name>${serviceInstanceName}</service-instance-name>
-					<service-type>${serviceType}</service-type>
-					<service-role>${serviceRole}</service-role>
+					${serviceTypeLine}
+					${serviceRoleLine}
 					${statusLine}
 				    <model-invariant-id>${modelInvariantUuid}</model-invariant-id>
 				    <model-version-id>${modelUuid}</model-version-id>
@@ -486,12 +488,12 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor {
 					<service-information>
 						<service-id>${serviceId}</service-id>
 						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information>
+						<onap-model-information>
 					         <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
 					         <model-uuid>${modelUuid}</model-uuid>
 					         <model-version>${modelVersion}</model-version>
 					         <model-name>${modelName}</model-name>
-					    </ecomp-model-information>
+					    </onap-model-information>
 						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id>${globalSubscriberId}</global-customer-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
index 6c0dedfe78..06cf8c3cd1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
@@ -46,16 +46,14 @@ import org.openecomp.mso.rest.APIResponse;
  */
 public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProcessor {
 
-    String createUrl = "/vfc/vfcadapters/v1/ns"
-            
-    String instantiateUrl = "/vfcvfcadatpers/v1/ns/{nsInstanceId}/instantiate"
+    String vfcUrl = "/vfc/rest/v1/vfcadapter"
     
-    String queryJobUrl = "/vfc/vfcadatpers/v1/jobs/{jobId}"
+    String host = "http://mso.mso.testlab.openecomp.org:8080"
     
     ExceptionUtil exceptionUtil = new ExceptionUtil()
 
     JsonUtils jsonUtil = new JsonUtils()
-
+    
     /**
      * Pre Process the BPMN Flow Request
      * Inclouds:
@@ -65,23 +63,23 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces
     public void preProcessRequest (Execution execution) {
 	   def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
        String msg = ""
-       utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)
+       utils.log("INFO", " *** preProcessRequest() *** ", isDebugEnabled)
        try {
            //deal with nsName and Description
            String nsServiceName = execution.getVariable("nsServiceName")
            String nsServiceDescription = execution.getVariable("nsServiceDescription")
-           utils.log("DEBUG", "nsServiceName:" + nsServiceName + " nsServiceDescription:" + nsServiceDescription, isDebugEnabled)
+           utils.log("INFO", "nsServiceName:" + nsServiceName + " nsServiceDescription:" + nsServiceDescription, isDebugEnabled)
            //deal with operation key
            String globalSubscriberId = execution.getVariable("globalSubscriberId")
-           utils.log("DEBUG", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)
+           utils.log("INFO", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)
            String serviceType = execution.getVariable("serviceType")
-           utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
+           utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)
            String serviceId = execution.getVariable("serviceId")
-           utils.log("DEBUG", "serviceId:" + serviceId, isDebugEnabled)
+           utils.log("INFO", "serviceId:" + serviceId, isDebugEnabled)
            String operationId = execution.getVariable("operationId")
-           utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
+           utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)
            String nodeTemplateUUID = execution.getVariable("resourceUUID")
-           utils.log("DEBUG", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)
+           utils.log("INFO", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)
            /*
             * segmentInformation needed as a object of segment
             * {
@@ -93,11 +91,15 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces
             *     }
             * }
             */
-           String nsParameters = execution.getVariable("resourceParamters")
-           utils.log("DEBUG", "Input Request:" + siRequest, isDebugEnabled)
-           String nsOperationKey = "{\"globalSubscriberId\":\"" + globalSubscriberId + "\",\"serviceType:\""
-                 + serviceType + "\",\"serviceId\":\"" + serviceId + "\",\"operationId\":\"" + operationId
-                 +"\",\"nodeTemplateUUID\":\"" + nodeTemplateUUID + "\"}";
+           String nsParameters = execution.getVariable("resourceParameters")
+           utils.log("INFO", "nsParameters:" + nsParameters, isDebugEnabled)
+           String nsOperationKey = """{
+                   "globalSubscriberId":"${globalSubscriberId}",
+                   "serviceType":"${serviceType}",
+                   "serviceId":"${serviceId}",
+                   "operationId":"${operationId}",
+                   "nodeTemplateUUID":"${nodeTemplateUUID}"
+                    }"""
            execution.setVariable("nsOperationKey", nsOperationKey);
            execution.setVariable("nsParameters", nsParameters)
            
@@ -106,108 +108,182 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces
            throw e;
        } catch (Exception ex){
            msg = "Exception in preProcessRequest " + ex.getMessage()
-           utils.log("DEBUG", msg, isDebugEnabled)
+           utils.log("INFO", msg, isDebugEnabled)
            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
        }
-       utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+       utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)
 	}
 
     /**
      * create NS task
      */
     public void createNetworkService(Execution execution) {
-        
-        String nsOperationKey = excution.getVariable("nsOperationKey");
-        String nsParameters = excution.getVariable("nsParameters");
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO"," *****  createNetworkService *****",  isDebugEnabled)
+        String nsOperationKey = execution.getVariable("nsOperationKey");
+        String nsParameters = execution.getVariable("nsParameters");
         String nsServiceName = execution.getVariable("nsServiceName")
         String nsServiceDescription = execution.getVariable("nsServiceDescription")
-        String reqBody = "{\"nsServiceName\":\"" + nsServiceName + "\",\"nsServiceDescription\":\"" + nsServiceDescription
-              +"\",\"nsOperationKey\":" + nsOperationKey + ",\"nsParameters\":" + nsParameters
-        APIResponse apiResponse = postRequest(createUrl, reqBody)
+        String reqBody ="""{
+                "nsServiceName":"${nsServiceName}",
+                "nsServiceDescription":"${nsServiceDescription}",
+                "nsOperationKey":${nsOperationKey},
+                "nsParameters":${nsParameters}
+               }"""
+        APIResponse apiResponse = postRequest(execution, host + vfcUrl + "/ns", reqBody)
         String returnCode = apiResponse.getStatusCode()
         String aaiResponseAsString = apiResponse.getResponseBodyAsString()
         String nsInstanceId = "";
-        if(returnCode== "200"){
+        if(returnCode== "200" || returnCode == "201"){
             nsInstanceId =  jsonUtil.getJsonValue(aaiResponseAsString, "nsInstanceId")
         }
         execution.setVariable("nsInstanceId", nsInstanceId)
-        
+        utils.log("INFO"," *****Exit  createNetworkService *****",  isDebugEnabled)
     }
 
     /**
      * instantiate NS task
      */
     public void instantiateNetworkService(Execution execution) {
-        String nsOperationKey = excution.getVariable("nsOperationKey");
-        String nsParameters = excution.getVariable("nsParameters");
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO"," *****  instantiateNetworkService *****",  isDebugEnabled)
+        String nsOperationKey = execution.getVariable("nsOperationKey");
+        String nsParameters = execution.getVariable("nsParameters");
         String nsServiceName = execution.getVariable("nsServiceName")
         String nsServiceDescription = execution.getVariable("nsServiceDescription")
-        String reqBody = "{\"nsServiceName\":\"" + nsServiceName + "\",\"nsServiceDescription\":\"" + nsServiceDescription
-              +"\",\"nsOperationKey\":" + nsOperationKey + ",\"nsParameters\":" + nsParameters
-        String url = instantiateUrl.replaceAll("{nsInstanceId}", execution.getVariable("nsInstanceId")) 
-        APIResponse apiResponse = postRequest(url, reqBody)
+        String reqBody ="""{
+        "nsServiceName":"${nsServiceName}",
+        "nsServiceDescription":"${nsServiceDescription}",
+        "nsOperationKey":${nsOperationKey},
+        "nsParameters":${nsParameters}
+       }"""
+        String nsInstanceId = execution.getVariable("nsInstanceId")
+        String url = host + vfcUrl + "/ns/" +nsInstanceId + "/instantiate"
+        APIResponse apiResponse = postRequest(execution, url, reqBody)
         String returnCode = apiResponse.getStatusCode()
         String aaiResponseAsString = apiResponse.getResponseBodyAsString()
         String jobId = "";
-        if(returnCode== "200"){
+        if(returnCode== "200"|| returnCode == "201"){
             jobId =  jsonUtil.getJsonValue(aaiResponseAsString, "jobId")
         }
-        execution.setVariable("jobId", nsInstanceId)
+        execution.setVariable("jobId", jobId)
+        utils.log("INFO"," *****Exit  instantiateNetworkService *****",  isDebugEnabled)
     }
 
     /**
      * query NS task
      */
     public void queryNSProgress(Execution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO"," *****  queryNSProgress *****",  isDebugEnabled)
         String jobId = execution.getVariable("jobId")
-        String nsOperationKey = excution.getVariable("nsOperationKey");
-        String url = queryJobUrl.replaceAll("{jobId}", execution.getVariable("jobId")) 
-        APIResponse apiResponse = postRequest(url, nsOperationKey)
+        String nsOperationKey = execution.getVariable("nsOperationKey");
+        String url = host + vfcUrl + "/jobs/" + jobId
+        APIResponse apiResponse = postRequest(execution, url, nsOperationKey)
         String returnCode = apiResponse.getStatusCode()
         String aaiResponseAsString = apiResponse.getResponseBodyAsString()
         String operationStatus = "error"
-        if(returnCode== "200"){
+        if(returnCode== "200"|| returnCode == "201"){
             operationStatus = jsonUtil.getJsonValue(aaiResponseAsString, "responseDescriptor.status")
         }
-        exection.setVariable("operationStatus", operationStatus)
+        execution.setVariable("operationStatus", operationStatus)
+        utils.log("INFO"," *****Exit  queryNSProgress *****",  isDebugEnabled)
     }
 
     /**
      * delay 5 sec 
      */
     public void timeDelay(Execution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
         try {
             Thread.sleep(5000);
         } catch(InterruptedException e) {           
-            taskProcessor.utils.log("ERROR", "Time Delay exception" + e , isDebugEnabled)
+            utils.log("ERROR", "Time Delay exception" + e , isDebugEnabled)
         }
     }
 
     /**
      * finish NS task
      */
-    public void finishNSCreate(Execution execution) {
-        //no need to do anything util now
+    public void addNSRelationship(Execution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO"," ***** addNSRelationship *****",  isDebugEnabled)
+        String nsInstanceId = execution.getVariable("nsInstanceId")
+        if(nsInstanceId == null || nsInstanceId == ""){
+            utils.log("INFO"," create NS failed, so do not need to add relationship",  isDebugEnabled)
+            return
+        }
+        String globalSubscriberId = execution.getVariable("globalSubscriberId")
+        String serviceType = execution.getVariable("serviceType")
+        String serviceId = execution.getVariable("serviceId")
+        String addRelationPayload = """<relationship xmlns="http://org.openecomp.aai.inventory/v11">
+                                            <related-to>service-instance</related-to>
+                                            <related-link>/aai/v11/business/customers/customer/${globalSubscriberId}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${nsInstanceId}</related-link>
+                                            <relationship-data>
+                                                <relationship-key>customer.global-customer-id</relationship-key>
+                                                <relationship-value>${globalSubscriberId}</relationship-value>
+                                            </relationship-data>
+                                            <relationship-data>
+                                                <relationship-key>service-subscription.service-type</relationship-key>
+                                                <relationship-value>${serviceType}</relationship-value>
+                                            </relationship-data>
+                                           <relationship-data>
+                                                <relationship-key>service-instance.service-instance-id</relationship-key>
+                                                <relationship-value>${nsInstanceId}</relationship-value>
+                                            </relationship-data>           
+                                        </relationship>"""
+        String endpoint = execution.getVariable("URN_aai_endpoint")  
+        utils.log("INFO","Add Relationship req:\n" + addRelationPayload,  isDebugEnabled)
+        String url = endpoint + "/aai/v11/business/customers/customer/" + globalSubscriberId + "/service-subscriptions/service-subscription/" + serviceType + "/service-instances/service-instance/" + serviceId + "/relationship-list/relationship"
+        APIResponse aaiRsp = executeAAIPutCall(execution, url, addRelationPayload)
+        utils.log("INFO","aai response status code:" + aaiRsp.getStatusCode(),  isDebugEnabled)
+        utils.log("INFO","aai response content:" + aaiRsp.getResponseBodyAsString(),  isDebugEnabled)
+        utils.log("INFO"," *****Exit addNSRelationship *****",  isDebugEnabled)
     }
-
+    
+    public APIResponse executeAAIPutCall(Execution execution, String url, String payload){
+        def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO", " ======== Started Execute AAI Put Process ======== ",  isDebugEnabled) 
+        APIResponse apiResponse = null
+        try{
+            String uuid = utils.getRequestID()
+            utils.log("INFO","Generated uuid is: " + uuid,  isDebugEnabled) 
+            utils.log("INFO","URL to be used is: " + url,  isDebugEnabled) 
+            String userName = execution.getVariable("URN_aai_auth")
+            String password = execution.getVariable("URN_mso_msoKey")
+            String basicAuthCred = utils.getBasicAuth(userName,password)
+            RESTConfig config = new RESTConfig(url);
+            RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Content-Type", "application/xml").addHeader("Accept","application/xml");
+            if (basicAuthCred != null && !"".equals(basicAuthCred)) {
+                client.addAuthorizationHeader(basicAuthCred)
+            }
+            apiResponse = client.httpPut(payload)
+            utils.log("INFO","======== Completed Execute AAI Put Process ======== ",  isDebugEnabled) 
+        }catch(Exception e){
+            utils.log("ERROR","Exception occured while executing AAI Put Call. Exception is: \n" + e,  isDebugEnabled) 
+            throw new BpmnError("MSOWorkflowException")
+        }
+        return apiResponse
+    }
+    
     /**
      * post request
      * url: the url of the request
      * requestBody: the body of the request
      */
-    private APIResponse postRequest(String url, String requestBody){
+    private APIResponse postRequest(Execution execution, String url, String requestBody){
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-        taskProcessor.logDebug( " ======== Started Execute VFC adapter Post Process ======== ", isDebugEnabled)
-        taskProcessor.logDebug( "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)
+        utils.log("INFO"," ***** Started Execute VFC adapter Post Process *****",  isDebugEnabled)
+        utils.log("INFO","url:"+url +"\nrequestBody:"+ requestBody,  isDebugEnabled)
         APIResponse apiResponse = null
         try{
             RESTConfig config = new RESTConfig(url);
-            RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/json");
+            RESTClient client = new RESTClient(config).addHeader("Content-Type", "application/json").addHeader("Accept","application/json").addHeader("Authorization","Basic QlBFTENsaWVudDpwYXNzd29yZDEk");
             apiResponse = client.httpPost(requestBody)
-            taskProcessor.logDebug( "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)
-            taskProcessor.logDebug( "======== Completed Execute VF-C adapter Post Process ======== ", isDebugEnabled)
+            utils.log("INFO","response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(),  isDebugEnabled)    
+            utils.log("INFO","======== Completed Execute VF-C adapter Post Process ======== ",  isDebugEnabled)
         }catch(Exception e){
-            taskProcessor.utils.log("ERROR", "Exception occured while executing AAI Post Call. Exception is: \n" + e, isDebugEnabled)
+            utils.log("ERROR","Exception occured while executing AAI Post Call. Exception is: \n" + e,  isDebugEnabled)
             throw new BpmnError("MSOWorkflowException")
         }        
         return apiResponse
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeRollback.groovy
index 46b6dd8366..0cbcfabddd 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeRollback.groovy
@@ -1,5 +1,21 @@
 /*
- * © 2016 AT&T Intellectual Property. All rights reserved. Used under license from AT&T Intellectual Property.
+ * ============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.openecomp.mso.bpmn.infrastructure.scripts;
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
index d74174dcee..862c46ad19 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVnfAndModules.groovy
@@ -63,9 +63,9 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
 	* @param - execution
 	*/
    public void preProcessRequest(Execution execution) {
-	   def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+	   def isDebugLogEnabled = execution.getVariable("isDebugLogEnabled")
 	   execution.setVariable("prefix",Prefix)
-	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules PreProcessRequest Process*** ", isDebugEnabled)
+	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules PreProcessRequest Process*** ", isDebugLogEnabled)
 	   
 	   setBasicDBAuthHeader(execution, isDebugLogEnabled)
 	   try{
@@ -78,21 +78,21 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
 		   String requestId = execution.getVariable("msoRequestId")
 		   execution.setVariable("requestId", requestId)
 		   execution.setVariable("mso-request-id", requestId)
-		   utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugEnabled)
+		   utils.log("DEBUG", "Incoming Request Id is: " + requestId, isDebugLogEnabled)
 
 		   String serviceInstanceId = execution.getVariable("serviceInstanceId")
-		   utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugEnabled)
+		   utils.log("DEBUG", "Incoming Service Instance Id is: " + serviceInstanceId, isDebugLogEnabled)
 
 		   String vnfName = execution.getVariable("vnfName")
 		   execution.setVariable("CREVI_vnfName", vnfName)
-		   utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugEnabled)
+		   utils.log("DEBUG", "Incoming Vnf Name is: " + vnfName, isDebugLogEnabled)
 
 		   String productFamilyId = execution.getVariable("productFamilyId")
-		   utils.log("DEBUG", "Incoming Product Family Id is: " + productFamilyId, isDebugEnabled)
+		   utils.log("DEBUG", "Incoming Product Family Id is: " + productFamilyId, isDebugLogEnabled)
 
 		   String source = "VID"
 		   execution.setVariable("source", source)
-		   utils.log("DEBUG", "Incoming Source is: " + source, isDebugEnabled)
+		   utils.log("DEBUG", "Incoming Source is: " + source, isDebugLogEnabled)
 
 		   String lcpCloudRegionId = execution.getVariable("lcpCloudRegionId")
 		   utils.log("DEBUG", "Incoming LCP Cloud Region Id is: " + lcpCloudRegionId)
@@ -101,17 +101,17 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
 		   utils.log("DEBUG", "Incoming Tenant Id is: " + tenantId)
 
 		   String disableRollback = execution.getVariable("disableRollback")
-		   utils.log("DEBUG", "Incoming Disable Rollback is: " + disableRollback, isDebugEnabled)
+		   utils.log("DEBUG", "Incoming Disable Rollback is: " + disableRollback, isDebugLogEnabled)
 
 		   String asdcServiceModelVersion = execution.getVariable("asdcServiceModelVersion")
-		   utils.log("DEBUG", "Incoming asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugEnabled)
+		   utils.log("DEBUG", "Incoming asdcServiceModelVersion: " + asdcServiceModelVersion, isDebugLogEnabled)
 
 		   String vnfId = execution.getVariable("testVnfId") // for junits
 		   if(isBlank(vnfId)){
 			   vnfId = execution.getVariable("vnfId")
 			   if (isBlank(vnfId)) {
 				   vnfId = UUID.randomUUID().toString()
-				   utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugEnabled)
+				   utils.log("DEBUG", "Generated Vnf Id is: " + vnfId, isDebugLogEnabled)
 			   }
 		   }
 		   execution.setVariable("vnfId", vnfId)
@@ -135,50 +135,50 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
 
 
 	   }catch(BpmnError b){
-		   utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugEnabled)
+		   utils.log("DEBUG", "Rethrowing MSOWorkflowException", isDebugLogEnabled)
 		   throw b
 	   }catch(Exception e){
-		   utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugEnabled)
+		   utils.log("DEBUG", " Error Occured in DoCreateVnfAndModules PreProcessRequest method!" + e.getMessage(), isDebugLogEnabled)
 		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf PreProcessRequest")
 
 	   }
-	   utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugEnabled)
+	   utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules PreProcessRequest Process ***", isDebugLogEnabled)
    }
 
 
    public void queryCatalogDB (Execution execution) {
-	   def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+	   def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
 	   execution.setVariable("prefix",Prefix)
 
-	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules QueryCatalogDB Process *** ", isDebugEnabled)
+	   utils.log("DEBUG", " *** STARTED DoCreateVnfAndModules QueryCatalogDB Process *** ", isDebugLogEnabled)
 	   try {
 		   VnfResource vnf = null
 		   ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
 		   // if serviceDecomposition is specified, get info from serviceDecomposition
 		   if (serviceDecomposition != null) {
-			   utils.log("DEBUG", "Getting Catalog DB data from ServiceDecomposition object: " + serviceDecomposition.toJsonString(), isDebugEnabled)
+			   utils.log("DEBUG", "Getting Catalog DB data from ServiceDecomposition object: " + serviceDecomposition.toJsonString(), isDebugLogEnabled)
 			   List<VnfResource> vnfs = serviceDecomposition.getServiceVnfs()
-			   utils.log("DEBUG", "Read vnfs", isDebugEnabled)
+			   utils.log("DEBUG", "Read vnfs", isDebugLogEnabled)
 			   if (vnfs == null) {
-				   utils.log("DEBUG", "Error - vnfs are empty in serviceDecomposition object", isDebugEnabled)
+				   utils.log("DEBUG", "Error - vnfs are empty in serviceDecomposition object", isDebugLogEnabled)
 				   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf queryCatalogDB, vnfs are empty")
 			   }
 			   vnf = vnfs[0]
 			   String serviceModelName = serviceDecomposition.getModelInfo().getModelName()
 			   vnf.constructVnfType(serviceModelName)
 			   String vnfType = vnf.getVnfType()
-			   utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugEnabled)
+			   utils.log("DEBUG", "Incoming Vnf Type is: " + vnfType, isDebugLogEnabled)
 			   execution.setVariable("vnfType", vnfType)
 		   }
 		   else {
 			   //Get Vnf Info
 			   String vnfModelInfo = execution.getVariable("vnfModelInfo")
-			   utils.log("DEBUG", "vnfModelInfo: " + vnfModelInfo, isDebugEnabled)
+			   utils.log("DEBUG", "vnfModelInfo: " + vnfModelInfo, isDebugLogEnabled)
 			   String vnfModelCustomizationUuid = jsonUtil.getJsonValueForKey(vnfModelInfo, "modelCustomizationUuid")
 			   if (vnfModelCustomizationUuid == null) {
 					   vnfModelCustomizationUuid = ""
 			   }
-			   utils.log("DEBUG", "querying Catalog DB by vnfModelCustomizationUuid: " + vnfModelCustomizationUuid, isDebugEnabled)
+			   utils.log("DEBUG", "querying Catalog DB by vnfModelCustomizationUuid: " + vnfModelCustomizationUuid, isDebugLogEnabled)
 			  
 			   JSONArray vnfs = cutils.getAllVnfsByVnfModelCustomizationUuid(execution,
 							   vnfModelCustomizationUuid)
@@ -187,24 +187,24 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
 			   JSONObject vnfObject = vnfs[0]
 			   vnf = decomposeJsonUtil.JsonToVnfResource(vnfObject.toString())			   
 		   }
-		   utils.log("DEBUG", "Read vnfResource", isDebugEnabled)
+		   utils.log("DEBUG", "Read vnfResource", isDebugLogEnabled)
 		   if (vnf == null) {
-			   utils.log("DEBUG", "Error - vnf is empty in serviceDecomposition object", isDebugEnabled)
+			   utils.log("DEBUG", "Error - vnf is empty in serviceDecomposition object", isDebugLogEnabled)
 			   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf queryCatalogDB, vnf is null")
 		   }
 		   execution.setVariable("vnfResourceDecomposition", vnf)
 
 		   List<ModuleResource> vfModules = vnf.getAllVfModuleObjects()
-		   utils.log("DEBUG", "Read vfModules", isDebugEnabled)
+		   utils.log("DEBUG", "Read vfModules", isDebugLogEnabled)
 		   if (vfModules == null) {
-			   utils.log("DEBUG", "Error - vfModules are empty in serviceDecomposition object", isDebugEnabled)
+			   utils.log("DEBUG", "Error - vfModules are empty in serviceDecomposition object", isDebugLogEnabled)
 			   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnf queryCatalogDB, vf modules are empty")
 		   }
 			   			  
 		   ModuleResource baseVfModule = null
 
 		   for (int i = 0; i < vfModules.size; i++) {
-			   utils.log("DEBUG", "handling VF Module ", isDebugEnabled)
+			   utils.log("DEBUG", "handling VF Module ", isDebugLogEnabled)
 			   ModuleResource vfModule = vfModules[i]
 			   boolean isBase = vfModule.getIsBase()
 			   if (isBase) {
@@ -236,7 +236,7 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
 			execution.setVariable("addOnModulesDeployed", 0)	  
 
 	   }catch(Exception ex) {
-		   utils.log("DEBUG", "Error Occured in DoCreateVnfAndModules QueryCatalogDB Process " + ex.getMessage(), isDebugEnabled)
+		   utils.log("DEBUG", "Error Occured in DoCreateVnfAndModules QueryCatalogDB Process " + ex.getMessage(), isDebugLogEnabled)
 		   exceptionUtil.buildAndThrowWorkflowException(execution, 2500, "Internal Error - Occured in DoCreateVnfAndModules QueryCatalogDB Process")
 	   }
 
@@ -249,7 +249,7 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
 		   execution.setVariable("vnfId", "skask")
 	   }
 
-	   utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules QueryCatalogDB Process ***", isDebugEnabled)
+	   utils.log("DEBUG", "*** COMPLETED DoCreateVnfAndModules QueryCatalogDB Process ***", isDebugLogEnabled)
    }
 
    public void preProcessAddOnModule(Execution execution){
@@ -364,45 +364,45 @@ class DoCreateVnfAndModules extends AbstractServiceTaskProcessor {
    }   
    
    public void preProcessRollback (Execution execution) {
-	   def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-	   utils.log("DEBUG"," ***** preProcessRollback ***** ", isDebugEnabled)
+	   def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
+	   utils.log("DEBUG"," ***** preProcessRollback ***** ", isDebugLogEnabled)
 	   try {
 		   
 		   Object workflowException = execution.getVariable("WorkflowException");
 
 		   if (workflowException instanceof WorkflowException) {
-			   utils.log("DEBUG", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugEnabled)
+			   utils.log("DEBUG", "Prev workflowException: " + workflowException.getErrorMessage(), isDebugLogEnabled)
 			   execution.setVariable("prevWorkflowException", workflowException);
 			   //execution.setVariable("WorkflowException", null);
 		   }
 	   } catch (BpmnError e) {
-		   utils.log("DEBUG", "BPMN Error during preProcessRollback", isDebugEnabled)
+		   utils.log("DEBUG", "BPMN Error during preProcessRollback", isDebugLogEnabled)
 	   } catch(Exception ex) {
 		   String msg = "Exception in preProcessRollback. " + ex.getMessage()
-		   utils.log("DEBUG", msg, isDebugEnabled)
+		   utils.log("DEBUG", msg, isDebugLogEnabled)
 	   }
-	   utils.log("DEBUG"," *** Exit preProcessRollback *** ", isDebugEnabled)
+	   utils.log("DEBUG"," *** Exit preProcessRollback *** ", isDebugLogEnabled)
    }
 
    public void postProcessRollback (Execution execution) {
-	   def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-	   utils.log("DEBUG"," ***** postProcessRollback ***** ", isDebugEnabled)
+	   def isDebugLogEnabled=execution.getVariable("isDebugLogEnabled")
+	   utils.log("DEBUG"," ***** postProcessRollback ***** ", isDebugLogEnabled)
 	   String msg = ""
 	   try {
 		   Object workflowException = execution.getVariable("prevWorkflowException");
 		   if (workflowException instanceof WorkflowException) {
-			   utils.log("DEBUG", "Setting prevException to WorkflowException: ", isDebugEnabled)
+			   utils.log("DEBUG", "Setting prevException to WorkflowException: ", isDebugLogEnabled)
 			   execution.setVariable("WorkflowException", workflowException);
 		   }
 		   execution.setVariable("rollbackData", null)
 	   } catch (BpmnError b) {
-		   utils.log("DEBUG", "BPMN Error during postProcessRollback", isDebugEnabled)
+		   utils.log("DEBUG", "BPMN Error during postProcessRollback", isDebugLogEnabled)
 		   throw b;
 	   } catch(Exception ex) {
 		   msg = "Exception in postProcessRollback. " + ex.getMessage()
-		   utils.log("DEBUG", msg, isDebugEnabled)
+		   utils.log("DEBUG", msg, isDebugLogEnabled)
 	   }
-	   utils.log("DEBUG"," *** Exit postProcessRollback *** ", isDebugEnabled)
+	   utils.log("DEBUG"," *** Exit postProcessRollback *** ", isDebugLogEnabled)
    }
 
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy
index b7aaef097a..ffd8372913 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy
@@ -18,7 +18,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.bpmn.infrastructure.scripts;
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import org.json.JSONArray;
 
 import static org.apache.commons.lang3.StringUtils.*;
 import groovy.xml.XmlUtil
@@ -49,6 +51,8 @@ import org.w3c.dom.Node
 import org.w3c.dom.NodeList
 import org.xml.sax.InputSource
 
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP.Def;
+
 /**
  * This groovy class supports the <class>DoDeleteE2EServiceInstance.bpmn</class> process.
  * 
@@ -58,8 +62,6 @@ import org.xml.sax.InputSource
  * @param - subscriptionServiceType - O
  * @param - serviceInstanceId
  * @param - serviceInstanceName - O
- * @param - serviceModelInfo - O
- * @param - productFamilyId
  * @param - serviceInputParams (should contain aic_zone for serviceTypes TRANSPORT,ATM)
  * @param - sdncVersion 
  * @param - failNotFound - TODO
@@ -70,7 +72,7 @@ import org.xml.sax.InputSource
  * 
  * Rollback - Deferred
  */
-public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
+public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 
 	String Prefix="DDELSI_"
 	ExceptionUtil exceptionUtil = new ExceptionUtil()
@@ -78,7 +80,7 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 
 	public void preProcessRequest (Execution execution) {
 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)
+		utils.log("INFO"," ***** preProcessRequest *****",  isDebugEnabled)
 		String msg = ""
 
 		try {
@@ -94,28 +96,28 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 			}
 
 			//requestDetails.requestParameters. for AAI PUT & SDNC assignTopology
-			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-			if (subscriptionServiceType == null)
+			String serviceType = execution.getVariable("serviceType")
+			if (serviceType == null)
 			{
-				execution.setVariable("subscriptionServiceType", "")
+				execution.setVariable("serviceType", "")
 			}
 
 			//Generated in parent for AAI PUT
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			if (isBlank(serviceInstanceId)){
 				msg = "Input serviceInstanceId is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			}
 
 			String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')
 			if (isBlank(sdncCallbackUrl)) {
 				msg = "URN_mso_workflow_sdncadapter_callback is null"
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 			}
 			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
-			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
+			utils.log("INFO","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
 
 			StringBuilder sbParams = new StringBuilder()
 			Map<String, String> paramsMap = execution.getVariable("serviceInputParams")
@@ -145,10 +147,10 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception ex){
 			msg = "Exception in preProcessRequest " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+		utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)
 	}
 	
 
@@ -160,7 +162,7 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 	
 	public void preProcessSDNCDelete (Execution execution) {
 		def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** preProcessSDNCDelete *****", isDebugEnabled)
+		utils.log("INFO"," ***** preProcessSDNCDelete *****", isDebugEnabled)
 		String msg = ""
 
 		try {
@@ -237,12 +239,12 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 					<service-information>
 						<service-id>${serviceId}</service-id>
 						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information>
+						<onap-model-information>
 					         <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
 					         <model-uuid>${modelUuid}</model-uuid>
 					         <model-version>${modelVersion}</model-version>
 					         <model-name>${modelName}</model-name>
-					    </ecomp-model-information>
+					    </onap-model-information>
 						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id>${globalSubscriberId}</global-customer-id>
@@ -259,166 +261,158 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 			String sdncDeactivate = sdncDelete.replace(">delete<", ">deactivate<").replace(">${sdncRequestId}<", ">${sdncRequestId2}<")
 			execution.setVariable("sdncDelete", sdncDelete)
 			execution.setVariable("sdncDeactivate", sdncDeactivate)
-			utils.log("DEBUG","sdncDeactivate:\n" + sdncDeactivate, isDebugEnabled)
-			utils.log("DEBUG","sdncDelete:\n" + sdncDelete, isDebugEnabled)
+			utils.log("INFO","sdncDeactivate:\n" + sdncDeactivate, isDebugEnabled)
+			utils.log("INFO","sdncDelete:\n" + sdncDelete, isDebugEnabled)
 
 		} catch (BpmnError e) {
 			throw e;
 		} catch(Exception ex) {
 			msg = "Exception in preProcessSDNCDelete. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())
 		}
-		utils.log("DEBUG"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)
+		utils.log("INFO"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)
 	}
 
 	public void postProcessSDNCDelete(Execution execution, String response, String method) {
 
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessSDNC " + method + " *****", isDebugEnabled)
+		utils.log("INFO"," ***** postProcessSDNC " + method + " *****", isDebugEnabled)
 		String msg = ""
 
-		try {
+		/*try {
 			WorkflowException workflowException = execution.getVariable("WorkflowException")
 			boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-			utils.log("DEBUG", "SDNCResponse: " + response, isDebugEnabled)
-			utils.log("DEBUG", "workflowException: " + workflowException, isDebugEnabled)
+			utils.log("INFO", "SDNCResponse: " + response, isDebugEnabled)
+			utils.log("INFO", "workflowException: " + workflowException, isDebugEnabled)
 
 			SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
 			sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
-
-			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == true){
-				utils.log("DEBUG","Good response from SDNC Adapter for service-instance " + method + "response:\n" + response, isDebugEnabled)
+			if(execution.getVariable(Prefix + 'sdncResponseSuccess') == "true"){
+				utils.log("INFO","Good response from SDNC Adapter for service-instance " + method + "response:\n" + response, isDebugEnabled)
 
 			}else{
 				msg = "Bad Response from SDNC Adapter for service-instance " + method
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 				exceptionUtil.buildAndThrowWorkflowException(execution, 3500, msg)
 			}
 		} catch (BpmnError e) {
 			throw e;
 		} catch(Exception ex) {
 			msg = "Exception in postProcessSDNC " + method + " Exception:" + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
-		}
-		utils.log("DEBUG"," *** Exit postProcessSDNC " + method + " ***", isDebugEnabled)
+		}*/
+		utils.log("INFO"," *** Exit postProcessSDNC " + method + " ***", isDebugEnabled)
 	}
 
 	public void postProcessAAIGET(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessAAIGET ***** ", isDebugEnabled)
+		utils.log("INFO"," ***** postProcessAAIGET ***** ", isDebugEnabled)
 		String msg = ""
 
 		try {
-
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			boolean foundInAAI = execution.getVariable("GENGS_FoundIndicator")
 			String serviceType = ""
 
 			if(foundInAAI == true){
-				utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)
-
-				//Extract GlobalSubscriberId
-				String siRelatedLink = execution.getVariable("GENGS_siResourceLink")
-				if (isBlank(siRelatedLink))
-				{
-					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
-					utils.log("DEBUG", msg, isDebugEnabled)
-					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-				}
-				else
-				{
-					utils.log("DEBUG","Found Service-instance in AAI. link: " + siRelatedLink, isDebugEnabled)
-					String  globalSubscriberId = execution.getVariable("globalSubscriberId")
-					if(isBlank(globalSubscriberId)){
-						int custStart = siRelatedLink.indexOf("customer/")
-						int custEnd = siRelatedLink.indexOf("/service-subscriptions")
-						globalSubscriberId = siRelatedLink.substring(custStart + 9, custEnd)
-						execution.setVariable("globalSubscriberId", globalSubscriberId)
-					}
-
-					//Extract Service Type if not provided on request
-					String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-					if(isBlank(subscriptionServiceType)){
-						int serviceStart = siRelatedLink.indexOf("service-subscription/")
-						int serviceEnd = siRelatedLink.indexOf("/service-instances/")
-						String serviceTypeEncoded = siRelatedLink.substring(serviceStart + 21, serviceEnd)
-						subscriptionServiceType = UriUtils.decode(serviceTypeEncoded, "UTF-8")
-						execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-					}
-
-					if (isBlank(globalSubscriberId) || isBlank(subscriptionServiceType))
-					{
-						msg = "Could not retrive global-customer-id & subscription-service-type from AAI to delete id:" + serviceInstanceId
-						utils.log("DEBUG", msg, isDebugEnabled)
-						exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-					}
-				}
+				utils.log("INFO","Found Service-instance in AAI", isDebugEnabled)
 
 				String siData = execution.getVariable("GENGS_service")
-				utils.log("DEBUG", "SI Data", isDebugEnabled)
+				utils.log("INFO", "SI Data", isDebugEnabled)
 				if (isBlank(siData))
 				{
 					msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
-					utils.log("DEBUG", msg, isDebugEnabled)
+					utils.log("INFO", msg, isDebugEnabled)
 					exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
 				}
 				else
 				{
-					utils.log("DEBUG", "SI Data" + siData, isDebugEnabled)
-					serviceType = utils.getNodeText1(siData,"service-type")
-					execution.setVariable("serviceType", serviceType)
-					execution.setVariable("serviceRole", utils.getNodeText1(siData,"service-role"))
-					String orchestrationStatus =  utils.getNodeText1(siData,"orchestration-status")
-
+					utils.log("INFO", "SI Data" + siData, isDebugEnabled)
 					//Confirm there are no related service instances (vnf/network or volume)
 					if (utils.nodeExists(siData, "relationship-list")) {
-						utils.log("DEBUG", "SI Data relationship-list exists:", isDebugEnabled)
+						utils.log("INFO", "SI Data relationship-list exists:", isDebugEnabled)
 						InputSource source = new InputSource(new StringReader(siData));
 						DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
 						DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
 						Document serviceXml = docBuilder.parse(source)
-
+						serviceXml.getDocumentElement().normalize()
+						//test(siData)
 						NodeList nodeList = serviceXml.getElementsByTagName("relationship")
+	                    JSONArray jArray = new JSONArray()
 						for (int x = 0; x < nodeList.getLength(); x++) {
 							Node node = nodeList.item(x)
 							if (node.getNodeType() == Node.ELEMENT_NODE) {
 								Element eElement = (Element) node
-								def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()
-								if(e.equals("generic-vnf") || e.equals("l3-network") || e.equals("allotted-resource") ){
-									utils.log("DEBUG", "ServiceInstance still has relationship(s) to generic-vnfs, l3-networks or allotted-resources", isDebugEnabled)
-									execution.setVariable("siInUse", true)
-									//there are relationship dependencies to this Service Instance
-									msg = " Stopped deleting Service Instance, it has dependencies. Service instance id: " + serviceInstanceId
-									utils.log("DEBUG", msg, isDebugEnabled)
-									exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
-								}else{
-									utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)
+								def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()    								//for ns
+								if(e.equals("service-instance")){
+								    def relatedObject = eElement.getElementsByTagName("related-link").item(0).getTextContent()
+									utils.log("INFO", "ServiceInstance Related NS :" + relatedObject, isDebugEnabled)
+                                    NodeList dataList = node.getChildNodes()
+                                    if(null != dataList) {
+                                        JSONObject jObj = new JSONObject()
+                                        for (int i = 0; i < dataList.getLength(); i++) {
+                                            Node dNode = dataList.item(i)
+                                            if(dNode.getNodeName() == "relationship-data") {
+                                                Element rDataEle = (Element)dNode
+                                                def eKey =  rDataEle.getElementsByTagName("relationship-key").item(0).getTextContent()
+                                                def eValue = rDataEle.getElementsByTagName("relationship-value").item(0).getTextContent()
+                                                if(eKey.equals("service-instance.service-instance-id")){
+                                                    jObj.put("resourceInstanceId", eValue)
+                                                }
+                                            }
+                                            else if(dNode.getNodeName() == "related-to-property"){
+                                                 Element rDataEle = (Element)dNode
+                                                 def eKey =  rDataEle.getElementsByTagName("property-key").item(0).getTextContent()
+                                                 def eValue = rDataEle.getElementsByTagName("property-value").item(0).getTextContent()
+                                                 if(eKey.equals("service-instance.service-instance-name")){
+                                                        jObj.put("resourceType", eValue)
+                                                    }
+                                            }
+                                        }
+                                        utils.log("INFO", "Relationship related to Resource:" + jObj.toString(), isDebugEnabled)
+                                        jArray.put(jObj)
+                                    }
+						        //for overlay/underlay
+								}else if (e.equals("configuration")){
+                                    def relatedObject = eElement.getElementsByTagName("related-link").item(0).getTextContent()
+                                    utils.log("INFO", "ServiceInstance Related Configuration :" + relatedObject, isDebugEnabled)
+									NodeList dataList = node.getChildNodes()
+									if(null != dataList) {
+										JSONObject jObj = new JSONObject()
+										for (int i = 0; i < dataList.getLength(); i++) {
+											Node dNode = dataList.item(i)
+											if(dNode.getNodeName() == "relationship-data") {
+												Element rDataEle = (Element)dNode
+												def eKey =  rDataEle.getElementsByTagName("relationship-key").item(0).getTextContent()
+												def eValue = rDataEle.getElementsByTagName("relationship-value").item(0).getTextContent()
+												if(eKey.equals("configuration.configuration-id")){
+												    jObj.put("resourceInstanceId", eValue)
+												}
+											}
+											else if(dNode.getNodeName() == "related-to-property"){
+	                                             Element rDataEle = (Element)dNode
+	                                             def eKey =  rDataEle.getElementsByTagName("property-key").item(0).getTextContent()
+	                                             def eValue = rDataEle.getElementsByTagName("property-value").item(0).getTextContent()
+	                                             if(eKey.equals("configuration.configuration-type")){
+	                                                    jObj.put("resourceType", eValue)
+	                                                }
+											}
+										}
+										utils.log("INFO", "Relationship related to Resource:" + jObj.toString(), isDebugEnabled)
+                                        jArray.put(jObj)
+									}									
 								}
 							}
 						}
-					}
-
-					if ("TRANSPORT".equalsIgnoreCase(serviceType))
-					{
-						if ("PendingDelete".equals(orchestrationStatus))
-						{
-							execution.setVariable("skipDeactivate", true)
-						}
-						else
-						{
-							msg = "ServiceInstance of type TRANSPORT must in PendingDelete status to allow Delete. Orchestration-status:" + orchestrationStatus
-							utils.log("DEBUG", msg, isDebugEnabled)
-							exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-						}
-
+                        execution.setVariable("serviceRelationShip", jArray)
 					}
 				}
 			}else{
 				boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
 				if(succInAAI != true){
-					utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
+					utils.log("INFO","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
 					WorkflowException workflowException = execution.getVariable("WorkflowException")
 					utils.logAudit("workflowException: " + workflowException)
 					if(workflowException != null){
@@ -427,33 +421,33 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 					else
 					{
 						msg = "Failure in postProcessAAIGET GENGS_SuccessIndicator:" + succInAAI
-						utils.log("DEBUG", msg, isDebugEnabled)
+						utils.log("INFO", msg, isDebugEnabled)
 						exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
 					}
 				}
 
-				utils.log("DEBUG","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)
+				utils.log("INFO","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)
 			}
-		} catch (BpmnError e) {
+		}catch (BpmnError e) {
 			throw e;
 		} catch (Exception ex) {
 			msg = "Exception in DoDeleteE2EServiceInstance.postProcessAAIGET. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
+		utils.log("INFO"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
 	}
 
 	public void postProcessAAIDEL(Execution execution) {
 		def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-		utils.log("DEBUG"," ***** postProcessAAIDEL ***** ", isDebugEnabled)
+		utils.log("INFO"," ***** postProcessAAIDEL ***** ", isDebugEnabled)
 		String msg = ""
 		try {
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")
 			if(succInAAI != true){
 				msg = "Error deleting Service-instance in AAI" + serviceInstanceId
-				utils.log("DEBUG", msg, isDebugEnabled)
+				utils.log("INFO", msg, isDebugEnabled)
 				WorkflowException workflowException = execution.getVariable("WorkflowException")
 				utils.logAudit("workflowException: " + workflowException)
 				if(workflowException != null){
@@ -468,16 +462,16 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 			throw e;
 		} catch (Exception ex) {
 			msg = "Exception in DoDeleteE2EServiceInstance.postProcessAAIDEL. " + ex.getMessage()
-			utils.log("DEBUG", msg, isDebugEnabled)
+			utils.log("INFO", msg, isDebugEnabled)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
 		}
-		utils.log("DEBUG"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)
+		utils.log("INFO"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)
 	}
 	
-   public void preInitResourcesOperStatus(Execution execution){
+	public void preInitResourcesOperStatus(Execution execution){
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 
-        utils.log("DEBUG", " ======== STARTED preInitResourcesOperStatus Process ======== ", isDebugEnabled)
+        utils.log("INFO", " ======== STARTED preInitResourcesOperStatus Process ======== ", isDebugEnabled)
         try{
             String serviceId = execution.getVariable("serviceInstanceId")
             String operationId = execution.getVariable("operationId")
@@ -487,7 +481,7 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
             String progress = "0"
             String reason = ""
             String operationContent = "Prepare service creation"
-            utils.log("DEBUG", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + oprationType, isDebugEnabled)
+            utils.log("INFO", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + operationType, isDebugEnabled)
             serviceId = UriUtils.encode(serviceId,"UTF-8")
             execution.setVariable("serviceInstanceId", serviceId)
             execution.setVariable("operationId", operationId)
@@ -522,10 +516,7 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
                     resourceTemplateUUIDs  = resourceTemplateUUIDs + it.resourceInstanceId + ":"
                 }
             }           
-
-            def dbAdapterEndpoint = execution.getVariable("URN_mso_openecomp_adapters_db_endpoint")
-            execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
-            utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
+            execution.setVariable("URN_mso_openecomp_adapters_db_endpoint","http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter")
 
             String payload =
                 """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
@@ -543,16 +534,16 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 
             payload = utils.formatXml(payload)
             execution.setVariable("CVFMI_initResOperStatusRequest", payload)
-            utils.log("DEBUG", "Outgoing initResourceOperationStatus: \n" + payload, isDebugEnabled)
+            utils.log("INFO", "Outgoing initResourceOperationStatus: \n" + payload, isDebugEnabled)
             utils.logAudit("CreateVfModuleInfra Outgoing initResourceOperationStatus Request: " + payload)
 
         }catch(Exception e){
             utils.log("ERROR", "Exception Occured Processing preInitResourcesOperStatus. Exception is:\n" + e, isDebugEnabled)
             execution.setVariable("CVFMI_ErrorResponse", "Error Occurred during preInitResourcesOperStatus Method:\n" + e.getMessage())
         }
-        utils.log("DEBUG", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled)  
+        utils.log("INFO", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled)  
     }
-   
+    
    /**
     * prepare delete parameters
     */
@@ -576,6 +567,9 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
             "resourceType":"underlay"
         }
     ]*/
+       def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+
+       utils.log("INFO", " ======== STARTED preResourceDelete Process ======== ", isDebugEnabled)
        String serviceRelationShip = execution.getVariable("serviceRelationShip")       
        def jsonSlurper = new JsonSlurper()
        def jsonOutput = new JsonOutput()         
@@ -583,13 +577,17 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
                
        if (relationShipList != null) {
            relationShipList.each {
-               if(resouceName.equals(it.resouceType))
-               String resouceTemplateUUID = it.resourceInstanceId
-               String resouceInstanceUUID = it.resouceInstanceId
-               execution.setVariable("resouceTemplateUUID", resouceTemplateUUID)
-               execution.setVariable("resouceInstanceId", resouceInstanceUUID)
-               execution.setResourceType("resourceType", resouceName)
+               if(StringUtils.containsIgnoreCase(it.resourceType, resourceName)) {
+				   String resourceInstanceUUID = it.resourceInstanceId
+				   String resourceTemplateUUID = it.resourceInstanceId
+				   execution.setVariable("resourceTemplateId", resourceTemplateUUID)
+				   execution.setVariable("resourceInstanceId", resourceInstanceUUID)
+				   execution.setVariable("resourceType", resourceName)
+			       utils.log("INFO", "Delete Resource Info resourceTemplate Id :" + resourceTemplateUUID + "  resourceInstanceId: " + resourceInstanceUUID + " resourceType: " + resourceName, isDebugEnabled)
+			   }
            }
        }    
+       utils.log("INFO", " ======== END preResourceDelete Process ======== ", isDebugEnabled)
    }
 }
+ 
+\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
index 6dbb4dce7a..1c9b80ac8d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
@@ -229,12 +229,12 @@ public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor {
 					<service-information>
 						<service-id>${serviceId}</service-id>
 						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information>
+						<onap-model-information>
 					         <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
 					         <model-uuid>${modelUuid}</model-uuid>
 					         <model-version>${modelVersion}</model-version>
 					         <model-name>${modelName}</model-name>
-					    </ecomp-model-information>
+					    </onap-model-information>
 						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id>${globalSubscriberId}</global-customer-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
index bec12906ad..b94db498bb 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
@@ -41,16 +41,15 @@ import org.openecomp.mso.rest.RESTConfig
 import org.openecomp.mso.rest.APIResponse;
 
 /**
- * This groovy class supports the <class>DODeleteVFCNetworkServiceInstance.bpmn</class> process.
+ * This groovy class supports the <class>DoDeleteVFCNetworkServiceInstance.bpmn</class> process.
  * flow for E2E ServiceInstance Delete
  */
-public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProcessor {
+public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProcessor {
 
-    String deleteUrl = "/vfc/vfcadapters/v1/ns/{nsInstanceId}"
-            
-    String terminateUrl = "/vfcvfcadatpers/v1/ns/{nsInstanceId}/terminate"
+
+    String vfcUrl = "/vfc/rest/v1/vfcadapter"
     
-    String queryJobUrl = "/vfc/vfcadatpers/v1/jobs/{jobId}"
+    String host = "http://mso.mso.testlab.openecomp.org:8080"
     
     ExceptionUtil exceptionUtil = new ExceptionUtil()
 
@@ -64,82 +63,98 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
     public void preProcessRequest (Execution execution) {
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
         String msg = ""
-        utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)
+        utils.log("INFO", " *** preProcessRequest() *** ", isDebugEnabled)
         try {
             //deal with operation key
             String globalSubscriberId = execution.getVariable("globalSubscriberId")
-            utils.log("DEBUG", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)
+            utils.log("INFO", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)
             String serviceType = execution.getVariable("serviceType")
-            utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
+            utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)
             String serviceId = execution.getVariable("serviceId")
-            utils.log("DEBUG", "serviceId:" + serviceId, isDebugEnabled)
+            utils.log("INFO", "serviceId:" + serviceId, isDebugEnabled)
             String operationId = execution.getVariable("operationId")
-            utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
-            String nodeTemplateUUID = execution.getVariable("resourceTemplateUUID")
-            utils.log("DEBUG", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)
+            utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)
+            String nodeTemplateUUID = execution.getVariable("resourceTemplateId")
+            utils.log("INFO", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)
             String nsInstanceId = execution.getVariable("resourceInstanceId")
-            utils.log("DEBUG", "nsInstanceId:" + nsInstanceId, isDebugEnabled)
-            String nsOperationKey = "{\"globalSubscriberId\":\"" + globalSubscriberId + "\",\"serviceType:\""
-                  + serviceType + "\",\"serviceId\":\"" + serviceId + "\",\"operationId\":\"" + operationId
-                  +"\",\"nodeTemplateUUID\":\"" + nodeTemplateUUID + "\"}";
+            utils.log("INFO", "nsInstanceId:" + nsInstanceId, isDebugEnabled)
+            execution.setVariable("nsInstanceId",nsInstanceId)
+            String nsOperationKey = """{
+            "globalSubscriberId":"${globalSubscriberId}",
+            "serviceType":"${serviceType}",
+            "serviceId":"${serviceId}",
+            "operationId":"${operationId}",
+            "nodeTemplateUUID":"${nodeTemplateUUID}"
+             }"""
             execution.setVariable("nsOperationKey", nsOperationKey);
+            utils.log("INFO", "nsOperationKey:" + nsOperationKey, isDebugEnabled)
         } catch (BpmnError e) {
             throw e;
         } catch (Exception ex){
             msg = "Exception in preProcessRequest " + ex.getMessage()
-            utils.log("DEBUG", msg, isDebugEnabled)
+            utils.log("INFO", msg, isDebugEnabled)
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
         }
-        utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+        utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)
 	}
 
     /**
      * delete NS task
      */
     public void deleteNetworkService(Execution execution) {
-        String nsOperationKey = excution.getVariable("nsOperationKey");
-        String url = deleteUrl.replaceAll("{nsInstanceId}", execution.getVariable("nsInstanceId")) 
-        APIResponse apiResponse = deleteRequest(url, reqBody)
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO", " *** deleteNetworkService  start *** ", isDebugEnabled)
+        String nsOperationKey = execution.getVariable("nsOperationKey");
+        String url = host + vfcUrl + "/ns/" + execution.getVariable("nsInstanceId") 
+        APIResponse apiResponse = deleteRequest(execution, url, nsOperationKey)
         String returnCode = apiResponse.getStatusCode()
-        String aaiResponseAsString = apiResponse.getResponseBodyAsString()
+        String apiResponseAsString = apiResponse.getResponseBodyAsString()
         String operationStatus = "error";
         if(returnCode== "200"){
             operationStatus = "finished"
         }
         execution.setVariable("operationStatus", operationStatus)
+        
+        utils.log("INFO", " *** deleteNetworkService  end *** ", isDebugEnabled)
     }
 
     /**
      * instantiate NS task
      */
     public void terminateNetworkService(Execution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO", " *** terminateNetworkService  start *** ", isDebugEnabled)
         String nsOperationKey = execution.getVariable("nsOperationKey") 
-        String url = terminateUrl.replaceAll("{nsInstanceId}", execution.getVariable("nsInstanceId")) 
-        APIResponse apiResponse = postRequest(url, reqBody)
+        String url =  host + vfcUrl + "/ns/" + execution.getVariable("nsInstanceId") + "/terminate"
+        APIResponse apiResponse = postRequest(execution, url, nsOperationKey)
         String returnCode = apiResponse.getStatusCode()
         String aaiResponseAsString = apiResponse.getResponseBodyAsString()
         String jobId = "";
         if(returnCode== "200"){
             jobId =  jsonUtil.getJsonValue(aaiResponseAsString, "jobId")
         }
-        execution.setVariable("jobId", nsInstanceId)   
+        execution.setVariable("jobId", jobId)   
+        utils.log("INFO", " *** terminateNetworkService  end *** ", isDebugEnabled)
     }
 
     /**
      * query NS task
      */
     public void queryNSProgress(Execution execution) {
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO", " *** queryNSProgress  start *** ", isDebugEnabled)
         String jobId = execution.getVariable("jobId")
-        String nsOperationKey = excution.getVariable("nsOperationKey");
-        String url = queryJobUrl.replaceAll("{jobId}", execution.getVariable("jobId")) 
-        APIResponse createRsp = postRequest(url, nsOperationKey)
+        String nsOperationKey = execution.getVariable("nsOperationKey");
+        String url =  host + vfcUrl + "/jobs/" +  execution.getVariable("jobId") 
+        APIResponse apiResponse = postRequest(execution, url, nsOperationKey)
         String returnCode = apiResponse.getStatusCode()
-        String aaiResponseAsString = apiResponse.getResponseBodyAsString()
+        String apiResponseAsString = apiResponse.getResponseBodyAsString()
         String operationProgress = "100"
         if(returnCode== "200"){
-            operationProgress = jsonUtil.getJsonValue(aaiResponseAsString, "responseDescriptor.progress")
+            operationProgress = jsonUtil.getJsonValue(apiResponseAsString, "responseDescriptor.progress")
         }
-        exection.setVariable("operationProgress", operationProgress)
+        execution.setVariable("operationProgress", operationProgress)
+        utils.log("INFO", " *** queryNSProgress  end *** ", isDebugEnabled)
     }
 
     /**
@@ -148,8 +163,8 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
     public void timeDelay(Execution execution) {
         try {
             Thread.sleep(5000);
-        } catch(InterruptedException e) {           
-            taskProcessor.utils.log("ERROR", "Time Delay exception" + e , isDebugEnabled)
+        } catch(InterruptedException e) {     
+            utils.log("INFO", "Time Delay exception" + e, isDebugEnabled)
         }
     }
 
@@ -165,19 +180,19 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
      * url: the url of the request
      * requestBody: the body of the request
      */
-    private APIResponse postRequest(String url, String requestBody){
+    private APIResponse postRequest(Execution execution, String url, String requestBody){
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-        taskProcessor.logDebug( " ======== Started Execute VFC adapter Post Process ======== ", isDebugEnabled)
-        taskProcessor.logDebug( "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)
+        utils.log("INFO", " ======== Started Execute VFC adapter Post Process ======== ", isDebugEnabled)
+        utils.log("INFO", "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)
         APIResponse apiResponse = null
         try{
             RESTConfig config = new RESTConfig(url);
-            RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/json");
+            RESTClient client = new RESTClient(config).addHeader("Content-Type", "application/json").addHeader("Accept","application/json").addHeader("Authorization","Basic QlBFTENsaWVudDpwYXNzd29yZDEk");;
             apiResponse = client.httpPost(requestBody)
-            taskProcessor.logDebug( "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)
-            taskProcessor.logDebug( "======== Completed Execute VF-C adapter Post Process ======== ", isDebugEnabled)
+            utils.log("INFO", "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)
+            utils.log("INFO", "======== Completed Execute VF-C adapter Post Process ======== ", isDebugEnabled)
         }catch(Exception e){
-            taskProcessor.utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled)
+            utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled)
             throw new BpmnError("MSOWorkflowException")
         }        
         return apiResponse
@@ -187,19 +202,19 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
      * url: the url of the request
      * requestBody: the body of the request
      */
-    private APIResponse deleteRequest(String url, String requestBody){
+    private APIResponse deleteRequest(Execution execution, String url, String requestBody){
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-        taskProcessor.logDebug( " ======== Started Execute VFC adapter Delete Process ======== ", isDebugEnabled)
-        taskProcessor.logDebug( "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)
+        utils.log("INFO", " ======== Started Execute VFC adapter Delete Process ======== ", isDebugEnabled)       
+        utils.log("INFO", "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)
         APIResponse apiResponse = null
         try{
             RESTConfig config = new RESTConfig(url);
-            RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/json");
+            RESTClient client = new RESTClient(config).addHeader("Content-Type", "application/json").addHeader("Accept","application/json").addHeader("Authorization","Basic QlBFTENsaWVudDpwYXNzd29yZDEk");
             apiResponse = client.httpDelete(requestBody)
-            taskProcessor.logDebug( "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)
-            taskProcessor.logDebug( "======== Completed Execute VF-C adapter Delete Process ======== ", isDebugEnabled)
+            utils.log("INFO", "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled) 
+            utils.log("INFO", "======== Completed Execute VF-C adapter Delete Process ======== ", isDebugEnabled) 
         }catch(Exception e){
-            taskProcessor.utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled)
+            utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled) 
             throw new BpmnError("MSOWorkflowException")
         }        
         return apiResponse
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModuleFromVnf.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModuleFromVnf.groovy
index 41663434db..9d9f0bb25a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModuleFromVnf.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVfModuleFromVnf.groovy
@@ -19,6 +19,7 @@ import org.springframework.web.util.UriUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.xml.sax.InputSource
+import static org.apache.commons.lang3.StringUtils.*
 
 public class DoDeleteVfModuleFromVnf extends VfModuleBase {
 
@@ -118,19 +119,10 @@ public class DoDeleteVfModuleFromVnf extends VfModuleBase {
 			utils.logAudit("DoDeleteVfModuleFromVnf: AAI endPoint  : " + endPoint)
 
 			try {
-				RESTConfig config = new RESTConfig(endPoint);
-				def responseData = ''
-				def aaiRequestId = UUID.randomUUID().toString()
-				RESTClient client = new RESTClient(config).
-					addHeader('X-TransactionId', aaiRequestId).
-					addHeader('X-FromAppId', 'MSO').
-					addHeader('Content-Type', 'application/xml').
-					addHeader('Accept','application/xml');
-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)
-				APIResponse response = client.httpGet()
 				utils.logAudit("DoDeleteVfModuleFromVnf: - invoking httpGet to AAI")
+				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)
 
-				responseData = response.getResponseBodyAsString()
+				def responseData = response.getResponseBodyAsString()
 				execution.setVariable('DDVMFV_getVnfResponseCode', response.getStatusCode())
 				execution.setVariable('DDVMFV_getVnfResponse', responseData)
 
@@ -416,37 +408,28 @@ public class DoDeleteVfModuleFromVnf extends VfModuleBase {
 				execution.setVariable("DDVFMV_vnfVfModuleDeleteCompleted", true)
 
 				// Parse vnfOutputs for contrail network polcy FQDNs
-				if (vnfResponse.contains("vfModuleOutputs")) {
-					def vfModuleOutputsXml = utils.getNodeXml(vnfResponse, "vfModuleOutputs")
-					InputSource source = new InputSource(new StringReader(vfModuleOutputsXml));
-			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-			docFactory.setNamespaceAware(true)
-			DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
-			Document outputsXml = docBuilder.parse(source)
-
-					NodeList entries = outputsXml.getElementsByTagNameNS("*", "entry")
+				def vfModuleOutputsXml = utils.getNodeXml(vnfResponse, "vfModuleOutputs")
+				if(!isBlank(vfModuleOutputsXml)) {
+					vfModuleOutputsXml = utils.removeXmlNamespaces(vfModuleOutputsXml)
 					List contrailNetworkPolicyFqdnList = []
-					for (int i = 0; i< entries.getLength(); i++) {
-						Node node = entries.item(i)
-						if (node.getNodeType() == Node.ELEMENT_NODE) {
-							Element element = (Element) node
-							String key = element.getElementsByTagNameNS("*", "key").item(0).getTextContent()
-							if (key.endsWith("contrail_network_policy_fqdn")) {
-								String contrailNetworkPolicyFqdn = element.getElementsByTagNameNS("*", "value").item(0).getTextContent()
-								logDebug("Obtained contrailNetworkPolicyFqdn: " + contrailNetworkPolicyFqdn, isDebugLogEnabled)
-								contrailNetworkPolicyFqdnList.add(contrailNetworkPolicyFqdn)
-							}
-							else if (key.equals("oam_management_v4_address")) {
-								String oamManagementV4Address = element.getElementsByTagNameNS("*", "value").item(0).getTextContent()
-								logDebug("Obtained oamManagementV4Address: " + oamManagementV4Address, isDebugLogEnabled)
-								execution.setVariable(Prefix + "oamManagementV4Address", oamManagementV4Address)
-							}
-							else if (key.equals("oam_management_v6_address")) {
-								String oamManagementV6Address = element.getElementsByTagNameNS("*", "value").item(0).getTextContent()
-								logDebug("Obtained oamManagementV6Address: " + oamManagementV6Address, isDebugLogEnabled)
-								execution.setVariable(Prefix + "oamManagementV6Address", oamManagementV6Address)
-							}
-
+					for(Node node: utils.getMultNodeObjects(vfModuleOutputsXml, "entry")) {
+						String key = utils.getChildNodeText(node, "key")
+						if(key == null) {
+							
+						} else if (key.endsWith("contrail_network_policy_fqdn")) {
+							String contrailNetworkPolicyFqdn = utils.getChildNodeText(node, "value")
+							logDebug("Obtained contrailNetworkPolicyFqdn: " + contrailNetworkPolicyFqdn, isDebugLogEnabled)
+							contrailNetworkPolicyFqdnList.add(contrailNetworkPolicyFqdn)
+						}
+						else if (key.equals("oam_management_v4_address")) {
+							String oamManagementV4Address = utils.getChildNodeText(node, "value")
+							logDebug("Obtained oamManagementV4Address: " + oamManagementV4Address, isDebugLogEnabled)
+							execution.setVariable(Prefix + "oamManagementV4Address", oamManagementV4Address)
+						}
+						else if (key.equals("oam_management_v6_address")) {
+							String oamManagementV6Address = utils.getChildNodeText(node, "value")
+							logDebug("Obtained oamManagementV6Address: " + oamManagementV6Address, isDebugLogEnabled)
+							execution.setVariable(Prefix + "oamManagementV6Address", oamManagementV6Address)
 						}
 					}
 					if (!contrailNetworkPolicyFqdnList.isEmpty()) {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
index 8c158db1da..3f7ffbf28c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVnfAndModules.groovy
@@ -230,19 +230,10 @@ class DoDeleteVnfAndModules extends AbstractServiceTaskProcessor {
 			utils.logAudit("AAI endPoint: " + endPoint)
 
 			try {
-				RESTConfig config = new RESTConfig(endPoint);
-				def responseData = ''
-				def aaiRequestId = UUID.randomUUID().toString()
-				RESTClient client = new RESTClient(config).
-					addHeader('X-TransactionId', aaiRequestId).
-					addHeader('X-FromAppId', 'MSO').
-					addHeader('Content-Type', 'application/xml').
-					addHeader('Accept','application/xml');
-				logDebug('sending GET to AAI endpoint \'' + endPoint + '\'', isDebugLogEnabled)
-				APIResponse response = client.httpGet()
 				utils.logAudit("createVfModule - invoking httpGet() to AAI")
+				APIResponse response = aaiUriUtil.executeAAIGetCall(execution, endPoint)
 
-				responseData = response.getResponseBodyAsString()
+				def responseData = response.getResponseBodyAsString()
 				if (responseData != null) {
 					logDebug("Received generic VNF data: " + responseData, isDebugLogEnabled)
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
index 87cf6fbd0f..703ea8be6d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
@@ -40,6 +40,7 @@ import org.json.JSONArray;
 import org.apache.commons.lang3.*
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.web.util.UriUtils;
+import static org.apache.commons.lang3.StringUtils.*
 
 /**
  * This groovy class supports the <class>CreateVcpeResCustService.bpmn</class> process.
@@ -93,6 +94,16 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 			// initialize flow variables
 			InitializeProcessVariables(execution)
 
+			//Config Inputs
+			String aaiDistDelay = execution.getVariable('URN_mso_workflow_aai_distribution_delay')
+			if (isBlank(aaiDistDelay)) {
+				msg = "URN_mso_workflow_aai_distribution_delay is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			}
+			execution.setVariable("aaiDistDelay", aaiDistDelay)
+			utils.log("DEBUG","AAI distribution delay: " + aaiDistDelay, isDebugEnabled)
+
 			// check for incoming json message/input
 			String createVcpeServiceRequest = execution.getVariable("bpmnRequest")
 			utils.logAudit(createVcpeServiceRequest)
@@ -156,29 +167,33 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 			execution.setVariable("subscriberInfo", subscriberInfo)
 			utils.log("DEBUG", "Incoming subscriberInfo is: " + subscriberInfo, isDebugEnabled)
 
-		  /*
-		  * Extracting User Parameters from incoming Request and converting into a Map
-		  */
-		  def jsonSlurper = new JsonSlurper()
-		  def jsonOutput = new JsonOutput()
-  
-		  Map reqMap = jsonSlurper.parseText(createVcpeServiceRequest)
-  
-		  //InputParams
-		  def userParams = reqMap.requestDetails?.requestParameters?.userParams
+		  /*
+		  * Extracting User Parameters from incoming Request and converting into a Map
+		  */
+		  def jsonSlurper = new JsonSlurper()
+		  def jsonOutput = new JsonOutput()
+
+		  Map reqMap = jsonSlurper.parseText(createVcpeServiceRequest)
+
+  
+		  //InputParams
+		  def userParams = reqMap.requestDetails?.requestParameters?.userParams
   
-		  Map<String, String> inputMap = [:]
-		  if (userParams) {
-			  userParams.each {
-				  name, value -> inputMap.put(name, value)
-					if (name.equals("BRG_WAN_MAC_Address"))
-							execution.setVariable("brgWanMacAddress", value)
-			  }
-		  }
-
-		  utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
-		  execution.setVariable("serviceInputParams", inputMap)
-
+		  Map<String, String> inputMap = [:]
+
+
+		  if (userParams) {
+				userParams.each {
+								userParam ->
+								if("BRG_WAN_MAC_Address".equals(userParam?.name)) {
+												execution.setVariable("brgWanMacAddress", userParam.value)
+												inputMap.put("BRG_WAN_MAC_Address", userParam.value)
+					}
+				}
+		  }
+
+		  utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled)
+		  execution.setVariable("serviceInputParams", inputMap)
+
 			utils.log("DEBUG", "Incoming brgWanMacAddress is: " + execution.getVariable('brgWanMacAddress'), isDebugEnabled)
 
 			//For Completion Handler & Fallout Handler
@@ -270,7 +285,7 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 			execution.setVariable("serviceInstanceName", serviceInstanceName)
 
 			ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
-			execution.setVariable("serviceDecompositionString", serviceDecomposition.toJsonString())
+			execution.setVariable("serviceDecompositionString", serviceDecomposition.toJsonStringNoRootName())
 
 			utils.log("DEBUG", " ***** Completed prepareCreateServiceInstance of CreateVcpeResCustService ***** ", isDebugEnabled)
 		} catch (Exception ex) {
@@ -384,13 +399,13 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 				while (iter.hasNext()){
 					AllottedResource allottedResource = (AllottedResource)iter.next();
 
-					utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonString(), isDebugEnabled)
+					utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonStringNoRootName(), isDebugEnabled)
 					utils.log("DEBUG", " allottedResource.getAllottedResourceType() :" + allottedResource.getAllottedResourceType(), isDebugEnabled)
 					if("TunnelXConn".equalsIgnoreCase(allottedResource.getAllottedResourceType())){
 						//set create flag to true
 						execution.setVariable("createTXCAR", true)
 						ModelInfo allottedResourceModelInfo = allottedResource.getModelInfo()
-						execution.setVariable("allottedResourceModelInfoTXC", allottedResourceModelInfo.toJsonString())
+						execution.setVariable("allottedResourceModelInfoTXC", allottedResourceModelInfo.toJsonStringNoRootName())
 						execution.setVariable("allottedResourceRoleTXC", allottedResource.getAllottedResourceRole())
 						execution.setVariable("allottedResourceTypeTXC", allottedResource.getAllottedResourceType())
 						//After decomposition and homing BBs, there should be an allotted resource object in the decomposition that represents the TXC,
@@ -437,13 +452,13 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 				while (iter.hasNext()){
 					AllottedResource allottedResource = (AllottedResource)iter.next();
 
-					utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonString(), isDebugEnabled)
+					utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonStringNoRootName(), isDebugEnabled)
 					utils.log("DEBUG", " allottedResource.getAllottedResourceType() :" + allottedResource.getAllottedResourceType(), isDebugEnabled)
 					if("BRG".equalsIgnoreCase(allottedResource.getAllottedResourceType())){
 						//set create flag to true
 						execution.setVariable("createBRGAR", true)
 						ModelInfo allottedResourceModelInfo = allottedResource.getModelInfo()
-						execution.setVariable("allottedResourceModelInfoBRG", allottedResourceModelInfo.toJsonString())
+						execution.setVariable("allottedResourceModelInfoBRG", allottedResourceModelInfo.toJsonStringNoRootName())
 						execution.setVariable("allottedResourceRoleBRG", allottedResource.getAllottedResourceRole())
 						execution.setVariable("allottedResourceTypeBRG", allottedResource.getAllottedResourceType())
 						//After decomposition and homing BBs, there should be an allotted resource object in the decomposition that represents the BRG,
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy
index 04eb4c7d7e..16fb22a6d3 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy
@@ -30,6 +30,7 @@ import org.openecomp.mso.bpmn.core.json.JsonUtils
 import org.openecomp.mso.bpmn.core.WorkflowException
 import org.openecomp.mso.rest.APIResponse
 import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
 
 import java.util.UUID;
 
@@ -40,6 +41,7 @@ import org.json.JSONArray;
 import org.apache.commons.lang3.*
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.web.util.UriUtils;
+import static org.apache.commons.lang3.StringUtils.*
 
 /**
  * This groovy class supports the <class>DeleteVcpeResCustService.bpmn</class> process.
@@ -135,14 +137,17 @@ public class DeleteVcpeResCustService extends AbstractServiceTaskProcessor {
 			utils.log("DEBUG", "Incoming subscriptionServiceType is: " + subscriptionServiceType, isDebugEnabled)
 			
 			// extract cloud configuration
-			String lcpCloudRegionId = jsonUtil.getJsonValue(DeleteVcpeResCustServiceRequest, "requestDetails.cloudConfiguration.lcpCloudRegionId")
+			String cloudConfiguration = jsonUtil.getJsonValue(DeleteVcpeResCustServiceRequest, "requestDetails.cloudConfiguration")
+			execution.setVariable("cloudConfiguration", cloudConfiguration)
+			utils.log("DEBUG","cloudConfiguration: "+ cloudConfiguration, isDebugEnabled)
+			String lcpCloudRegionId = jsonUtil.getJsonValue(cloudConfiguration, "lcpCloudRegionId")
 			execution.setVariable("lcpCloudRegionId", lcpCloudRegionId)
 			utils.log("DEBUG","lcpCloudRegionId: "+ lcpCloudRegionId, isDebugEnabled)
-			String tenantId = jsonUtil.getJsonValue(DeleteVcpeResCustServiceRequest, "requestDetails.cloudConfiguration.tenantId")
+			String tenantId = jsonUtil.getJsonValue(cloudConfiguration, "tenantId")
 			execution.setVariable("tenantId", tenantId)
 			utils.log("DEBUG","tenantId: "+ tenantId, isDebugEnabled)
 
-			String sdncVersion = "1702"
+			String sdncVersion = "1707"
 			execution.setVariable("sdncVersion", sdncVersion)
 			utils.log("DEBUG","sdncVersion: "+ sdncVersion, isDebugEnabled)
 			
@@ -191,7 +196,7 @@ public class DeleteVcpeResCustService extends AbstractServiceTaskProcessor {
 
 	public void prepareServiceDelete(Execution execution) {
 		def isDebugEnabled=execution.getVariable(DebugFlag)
-		utils.log("DEBUG", " ***** Inside prepareServiceInstanceDelete() of DeleteVcpeResCustService ***** ", isDebugEnabled)
+		utils.log("DEBUG", " ***** Inside prepareServiceDelete() of DeleteVcpeResCustService ***** ", isDebugEnabled)
 		
 		try {
 			
@@ -211,81 +216,95 @@ public class DeleteVcpeResCustService extends AbstractServiceTaskProcessor {
 			String serviceInstanceAaiRecord = execution.getVariable("GENGS_service");
 			
 			utils.log("DEBUG", "serviceInstanceAaiRecord: "+serviceInstanceAaiRecord, isDebugEnabled)
+			serviceInstanceAaiRecord = utils.removeXmlNamespaces(serviceInstanceAaiRecord)
 			
-			// determine if AR needs to be deleted
-			boolean DVRCS_TunnelXConn = false
-			boolean DVRCS_BRG = false
-			String TXC_allottedResourceId
-			String BRG_allottedResourceId
-			XmlParser xmlParser = new XmlParser()
-			def groovy.util.Node siNode = xmlParser.parseText(serviceInstanceAaiRecord)
-			def groovy.util.Node arList = utils.getChildNode(siNode, 'allotted-resources')
-			if (arList != null) {
-				def groovy.util.NodeList ars = utils.getIdenticalChildren(arList, 'allotted-resource')
-				for (groovy.util.Node ar in ars) {
-					def type = utils.getChildNodeText(ar, 'type')
-					if ("TunnelXConn".equals(type)) {
+			def (TXC_found, TXC_id) = new Tuple(false, null)
+			def (BRG_found, BRG_id) = new Tuple(false, null)
+			List relatedVnfIdList = []
+			
+			for(Node rel: utils.getMultNodeObjects(serviceInstanceAaiRecord, "relationship")) {
+				def relto = utils.getChildNodeText(rel, "related-to")
+				def relink = utils.getChildNodeText(rel, "related-link")
+				utils.log("DEBUG", "check: "+relto+" link: "+relink, isDebugEnabled)
+				
+				if(isBlank(relto) || isBlank(relink)) {
+					
+				} else if(relto == "generic-vnf") {
+					def id = relink.substring(relink.indexOf("/generic-vnf/")+13)
+					if(id.endsWith("/")) {
+						id = id.substring(0, id.length()-1)
+					}
+					
+					relatedVnfIdList.add(id)
+					
+				} else if(relto == "allotted-resource") {
+					def (type, id) = getAaiAr(execution, relink)
+					
+					if(isBlank(type) || isBlank(id)) {
+						
+					} else if(type == "TunnelXConn") {
 						utils.log("DEBUG","TunnelXConn AR found", isDebugEnabled)
-						def id = utils.getChildNodeText(ar, 'id')
-						if (id != null){
-							DVRCS_TunnelXConn = true
-							TXC_allottedResourceId = id
-						}
-					} else if ("BRG".equals(type)) {
-						utils.log("DEBUG","FW AR found", isDebugEnabled)
-						def id = utils.getChildNodeText(ar, 'id')
-						if (id != null){
-							DVRCS_BRG = true
-							BRG_allottedResourceId = id
-						}
+						TXC_found = true
+						TXC_id = id
+						
+					} else if(type == "BRG") {
+						utils.log("DEBUG","BRG AR found", isDebugEnabled)
+						BRG_found = true
+						BRG_id = id
 					}
 				}
 			}
-			execution.setVariable(Prefix+"TunnelXConn", DVRCS_TunnelXConn)
-			utils.log("DEBUG", Prefix+"TunnelXConn : " + DVRCS_TunnelXConn, isDebugEnabled)
-			execution.setVariable("TXC_allottedResourceId", TXC_allottedResourceId)
-			utils.log("DEBUG", "TXC_allottedResourceId : " + TXC_allottedResourceId, isDebugEnabled)
 			
-			execution.setVariable(Prefix+"BRG", DVRCS_BRG)
-			utils.log("DEBUG", Prefix+"BRG : " + DVRCS_BRG, isDebugEnabled)
-			execution.setVariable("BRG_allottedResourceId", BRG_allottedResourceId)
-			utils.log("DEBUG", "BRG_allottedResourceId : " + BRG_allottedResourceId, isDebugEnabled)
-		
-			String relationship = ""
-			try {
-				relationship = networkUtils.getFirstNodeXml(serviceInstanceAaiRecord, "relationship-list")
-			} catch (Exception ex) {
-				//no relationships found
-			}
-			utils.log("DEBUG", " relationship string - " + relationship, isDebugEnabled)
+			execution.setVariable(Prefix+"TunnelXConn", TXC_found)
+			execution.setVariable("TXC_allottedResourceId", TXC_id)
+			utils.log("DEBUG", "TXC_allottedResourceId: " + TXC_id, isDebugEnabled)
+						
+			execution.setVariable(Prefix+"BRG", BRG_found)
+			execution.setVariable("BRG_allottedResourceId", BRG_id)
+			utils.log("DEBUG", "BRG_allottedResourceId: " + BRG_id, isDebugEnabled)
 			
-			int vnfsCount = 0
-			
-			if (relationship != null && relationship.length() > 0){
-				relationship = relationship.trim().replace("tag0:","").replace(":tag0","")
-				
-				// Check if Network TableREf is present, then build a List of network policy
-				List relatedVnfIdList = networkUtils.getRelatedVnfIdList(relationship)
-				vnfsCount = relatedVnfIdList.size()
-				execution.setVariable(Prefix+"vnfsCount", vnfsCount)
-				utils.log("DEBUG", " "+Prefix+"vnfsCount : " + vnfsCount, isDebugEnabled)
+			int vnfsCount = relatedVnfIdList.size()
+			execution.setVariable(Prefix+"vnfsCount", vnfsCount)
+			utils.log("DEBUG", " "+Prefix+"vnfsCount : " + vnfsCount, isDebugEnabled)
+			if(vnfsCount > 0) {
 				execution.setVariable(Prefix+"relatedVnfIdList", relatedVnfIdList)
-			} else {
-				execution.setVariable(Prefix+"vnfsCount", 0)
-				utils.log("DEBUG", " "+Prefix+"vnfsCount : " + vnfsCount, isDebugEnabled)
 			}
 			
-			utils.log("DEBUG", " ***** Completed prepareServiceInstanceDelete() of DeleteVcpeResCustService ***** ", isDebugEnabled)
+			utils.log("DEBUG", " ***** Completed prepareServiceDelete() of DeleteVcpeResCustService ***** ", isDebugEnabled)
 		} catch (BpmnError e){
 			throw e;
 		} catch (Exception ex) {
 			sendSyncError(execution)
-		   String exceptionMessage = "Bpmn error encountered in DeleteVcpeResCustService flow. prepareServiceInstanceDelete() - " + ex.getMessage()
-		   utils.log("DEBUG", exceptionMessage, isDebugEnabled)
-		   exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
+		    String exceptionMessage = "Bpmn error encountered in DeleteVcpeResCustService flow. prepareServiceDelete() - " + ex.getMessage()
+		    utils.log("DEBUG", exceptionMessage, isDebugEnabled)
+		    exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
 		}
 	}
 	
+	private getAaiAr(Execution execution, String relink) {
+		def isDebugEnabled = execution.getVariable(DebugFlag)
+		AaiUtil aaiUtil = new AaiUtil(this)
+		String aaiEndpoint = execution.getVariable("URN_aai_endpoint") + relink
+		
+		utils.log("DEBUG", "get AR info " + aaiEndpoint, isDebugEnabled)
+		APIResponse response = aaiUtil.executeAAIGetCall(execution, aaiEndpoint)
+		
+		int responseCode = response.getStatusCode()
+		utils.log("DEBUG", "get AR info responseCode:" + responseCode, isDebugEnabled)
+		
+		String aaiResponse = response.getResponseBodyAsString()
+		utils.log("DEBUG", "get AR info " + aaiResponse, isDebugEnabled)
+		
+		if(responseCode < 200 || responseCode >= 300 || isBlank(aaiResponse)) {
+			return new Tuple2(null, null)
+		}
+		
+		def type = utils.getNodeText1(aaiResponse, "type")
+		def id = utils.getNodeText1(aaiResponse, "id")
+		
+		return new Tuple2(type, id)
+	}
+	
 	
 	// *******************************
 	//     
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy
index 9ddfa1e31c..997757aa2c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy
@@ -45,6 +45,8 @@ import static org.apache.commons.lang3.StringUtils.*
  * @param - disableRollback
  * @param - failExists  - O
  * @param - serviceInstanceId
+ * @param - globalCustomerId - O
+ * @param - subscriptionServiceType - O
  * @param - parentServiceInstanceId
  * @param - allottedReourceId - O
  * @param - allottedResourceModelInfo
@@ -89,6 +91,15 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
 			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
 			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
 
+			String sdncReplDelay = execution.getVariable('URN_mso_workflow_sdnc_replication_delay')
+			if (isBlank(sdncReplDelay)) {
+				msg = "URN_mso_workflow_sdnc_replication_delay is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			}
+			execution.setVariable("sdncReplDelay", sdncReplDelay)
+			utils.log("DEBUG","SDNC replication delay: " + sdncReplDelay, isDebugEnabled)
+
 			//Request Inputs
 			if (isBlank(execution.getVariable("serviceInstanceId"))){
 				msg = "Input serviceInstanceId is null"
@@ -312,6 +323,8 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
 
 			String allottedResourceId = execution.getVariable("allottedResourceId")
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String globalCustomerId = execution.getVariable("globalCustomerId")
+			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
 			String parentServiceInstanceId = execution.getVariable("parentServiceInstanceId")
 			String callbackUrl = execution.getVariable("sdncCallbackUrl")
 			String requestId = execution.getVariable("msoRequestId")
@@ -365,23 +378,23 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
 					</request-information>
 					<service-information>
 						<service-id></service-id>
-						<subscription-service-type></subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
-						<service-instance-id>${parentServiceInstanceId}</service-instance-id>
+						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
+						<onap-model-information></onap-model-information>
+						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
-						<global-customer-id></global-customer-id>
+						<global-customer-id>${globalCustomerId}</global-customer-id>
 					</service-information>
 					<allotted-resource-information>
 						<allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
 						<allotted-resource-type>brg</allotted-resource-type>
 						<parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-						<ecomp-model-information>
+						<onap-model-information>
 							<model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
 							<model-uuid>${modelUUId}</model-uuid>
 							<model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
 							<model-version>${modelVersion}</model-version>
 							<model-name>${modelName}</model-name>
-						</ecomp-model-information>
+						</onap-model-information>
 					</allotted-resource-information>
 					<brg-request-input>
 							<brg-wan-mac-address>${brgWanMacAddress}</brg-wan-mac-address>
@@ -562,11 +575,6 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
 
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			String sdncRequestId = UUID.randomUUID().toString()
-			
-			String tsleep = execution.getVariable("junitSleepMs")
-			
-			//workaround for sdnc replication issue
-			sleep(tsleep == null ? 5000 : tsleep as Long)
 
 			//neeed the same url as used by vfmodules
 			String SDNCGetRequest =
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
index 8774effff9..602df6bc1f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
@@ -45,6 +45,8 @@ import static org.apache.commons.lang3.StringUtils.*
  * @param - disableRollback
  * @param - failExists  - O
  * @param - serviceInstanceId
+ * @param - globalCustomerId - O
+ * @param - subscriptionServiceType - O
  * @param - parentServiceInstanceId
  * @param - allottedReourceId - O
  * @param - allottedResourceModelInfo
@@ -78,6 +80,9 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 		utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)
 
 		try {
+			String msoRequestId	 = execution.getVariable("msoRequestId")
+			utils.log("DEBUG", " msoRequestId  = " + msoRequestId,  isDebugEnabled)
+			
 			execution.setVariable("prefix", Prefix)
 
 			//Config Inputs
@@ -90,6 +95,15 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 			execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
 			utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
 
+			String sdncReplDelay = execution.getVariable('URN_mso_workflow_sdnc_replication_delay')
+			if (isBlank(sdncReplDelay)) {
+				msg = "URN_mso_workflow_sdnc_replication_delay is null"
+				utils.log("DEBUG", msg, isDebugEnabled)
+				exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
+			}
+			execution.setVariable("sdncReplDelay", sdncReplDelay)
+			utils.log("DEBUG","SDNC replication delay: " + sdncReplDelay, isDebugEnabled)
+
 			//Request Inputs
 			if (isBlank(execution.getVariable("serviceInstanceId"))){
 				msg = "Input serviceInstanceId is null"
@@ -215,6 +229,7 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 			String arRole = execution.getVariable("allottedResourceRole")
 			String CSI_resourceLink = execution.getVariable("CSI_resourceLink")
 			String arModelInfo = execution.getVariable("allottedResourceModelInfo")
+			utils.log("DEBUG", "arModelInfo is:\n" + arModelInfo, isDebugEnabled)
 			String modelInvariantId = jsonUtil.getJsonValue(arModelInfo, "modelInvariantUuid")
 			String modelVersionId = jsonUtil.getJsonValue(arModelInfo, "modelUuid")
 			String modelCustomizationId = jsonUtil.getJsonValue(arModelInfo, "modelCustomizationUuid")
@@ -303,6 +318,8 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 
 			String allottedResourceId = execution.getVariable("allottedResourceId")
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String globalCustomerId = execution.getVariable("globalCustomerId")
+			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
 			String parentServiceInstanceId = execution.getVariable("parentServiceInstanceId")
 			String serviceChainServiceInstanceId = execution.getVariable("serviceChainServiceInstanceId")
 			String callbackUrl = execution.getVariable("sdncCallbackUrl")
@@ -355,23 +372,23 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 					</request-information>
 					<service-information>
 						<service-id></service-id>
-						<subscription-service-type></subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
-						<service-instance-id>${parentServiceInstanceId}</service-instance-id>
+						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
+						<onap-model-information></onap-model-information>
+						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
-						<global-customer-id></global-customer-id>
+						<global-customer-id>${globalCustomerId}</global-customer-id>
 					</service-information>
 					<allotted-resource-information>
 						<allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
 						<allotted-resource-type>tunnelxconn</allotted-resource-type>
 						<parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-						<ecomp-model-information>
+						<onap-model-information>
 							<model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
 							<model-uuid>${modelUUId}</model-uuid>
 							<model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
 							<model-version>${modelVersion}</model-version>
 							<model-name>${modelName}</model-name>
-						</ecomp-model-information>
+						</onap-model-information>
 					</allotted-resource-information>
 					<tunnelxconn-request-input>
 							<brg-wan-mac-address>${brgWanMacAddress}</brg-wan-mac-address>
@@ -550,11 +567,6 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
 			String sdncRequestId = UUID.randomUUID().toString()
-			
-			String tsleep = execution.getVariable("junitSleepMs")
-			
-			//workaround for sdnc replication issue
-			sleep(tsleep == null ? 5000 : tsleep as Long)
 
 			//neeed the same url as used by vfmodules
 			String SDNCGetRequest =
@@ -602,8 +614,8 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 		
 			String txca = utils.getNodeXml(arData, "tunnelxconn-assignments")
 			execution.setVariable("vni", utils.getNodeText1(txca, "vni"))
-			execution.setVariable("vgmuxBearerIP", utils.getNodeText1(txca, "vgmux_bearer_ip"))
-			execution.setVariable("vgmuxLanIP", utils.getNodeText1(txca, "vgmux_lan_ip"))
+			execution.setVariable("vgmuxBearerIP", utils.getNodeText1(txca, "vgmux-bearer-ip"))
+			execution.setVariable("vgmuxLanIP", utils.getNodeText1(txca, "vgmux-lan-ip"))
 			
 			String ari = utils.getNodeXml(arData, "allotted-resource-identifiers")
 			execution.setVariable("allotedResourceName", utils.getNodeText1(ari, "allotted-resource-name"))
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy
index bfdccc80a1..167c9c8b54 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy
@@ -195,7 +195,7 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{
 					<service-information>
 						<service-id></service-id>
 						<subscription-service-type></subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
+						<onap-model-information></onap-model-information>
 						<service-instance-id>${parentServiceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id></global-customer-id>
@@ -204,13 +204,13 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{
 						<allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
 						<allotted-resource-type>brg</allotted-resource-type>
 						<parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-						<ecomp-model-information>
+						<onap-model-information>
 							<model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
 							<model-uuid>${modelUUId}</model-uuid>
 							<model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
 							<model-version>${modelVersion}</model-version>
 							<model-name>${modelName}</model-name>
-						</ecomp-model-information>
+						</onap-model-information>
 					</allotted-resource-information>
 					<brg-request-input>
 					</brg-request-input>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy
index 1f729ac05d..eb045eb54b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy
@@ -195,7 +195,7 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{
 					<service-information>
 						<service-id></service-id>
 						<subscription-service-type></subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
+						<onap-model-information></onap-model-information>
 						<service-instance-id>${parentServiceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id></global-customer-id>
@@ -204,13 +204,13 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{
 						<allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
 						<allotted-resource-type>tunnelxconn</allotted-resource-type>
 						<parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-						<ecomp-model-information>
+						<onap-model-information>
 							<model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
 							<model-uuid>${modelUUId}</model-uuid>
 							<model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
 							<model-version>${modelVersion}</model-version>
 							<model-name>${modelName}</model-name>
-						</ecomp-model-information>
+						</onap-model-information>
 					</allotted-resource-information>
 					<tunnelxconn-request-input>
 					</tunnelxconn-request-input>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java
deleted file mode 100644
index 33b40b7bf0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java
+++ /dev/null
@@ -1,46 +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.openecomp.mso.bpmn.infrastructure.workflow.service;
-
-import javax.ws.rs.Path;
-
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.ProcessEngines;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
-
-
-/**
- * 
- * @version 1.0
- * Asynchronous Workflow processing using JAX RS RESTeasy implementation
- * Both Synchronous and Asynchronous BPMN process can benefit from this implementation since the workflow gets executed in the background
- * and the server thread is freed up, server scales better to process more incoming requests
- * 
- * Usage: For synchronous process, when you are ready to send the response invoke the callback to write the response
- * For asynchronous process - the activity may send a acknowledgement response and then proceed further on executing the process
- */
-@Path("/async")
-public class WorkflowAsyncInfrastructureResource extends WorkflowAsyncResource {
-	
-    protected ProcessEngineServices getProcessEngineServices() {
-        return pes4junit.orElse(ProcessEngines.getProcessEngine("infrastructure"));
-    }
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
index 16811979c1..80b11bbdf5 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
@@ -26,14 +26,10 @@ import java.util.Set;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
+import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;
 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;
 
-/**
- * @version 1.0
- * RESTeasy workflow application which wires synchronous and asynchronous response
- *
- */
 @ApplicationPath("/")
 public class WorkflowResourceApplication extends Application {
     private Set<Object> singletons = new HashSet<Object>();
@@ -41,7 +37,7 @@ public class WorkflowResourceApplication extends Application {
 
     public WorkflowResourceApplication() {
         singletons.add(new WorkflowResource());
-        singletons.add(new WorkflowAsyncInfrastructureResource());
+        singletons.add(new WorkflowAsyncResource());
         singletons.add(new WorkflowMessageResource());
     }
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java
index 4495e87789..6ca93f7238 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java
@@ -20,9 +20,22 @@
 
 package org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.json.JSONObject;
+import org.onap.msb.sdk.discovery.common.RouteException;
 import org.onap.msb.sdk.httpclient.RestServiceCreater;
 import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
 import org.openecomp.mso.bpmn.core.BaseTask;
@@ -31,10 +44,13 @@ import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.Generic
 import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoLogger;
 import org.openecomp.mso.requestsdb.RequestsDatabase;
-import org.openecomp.mso.requestsdb.RequestsDbConstant;
 import org.openecomp.mso.requestsdb.ResourceOperationStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -42,36 +58,308 @@ import java.util.Map;
  */
 public abstract class AbstractSdncOperationTask extends BaseTask {
 
+    private static final Logger logger = LoggerFactory.getLogger(AbstractSdncOperationTask.class);
+
     private static final String DEFAULT_MSB_IP = "127.0.0.1";
-    private static final int DEFAULT_MSB_Port = 10081;
+    private static final int DEFAULT_MSB_Port = 80;
     private static final String SDCADAPTOR_INPUTS = "resourceParameters";
+    public static final String ONAP_IP = "ONAP_IP";
     private RequestsDatabase requestsDB = RequestsDatabase.getInstance();
 
+    private static final String postBodyTemplate = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ns=\"http://org.openecomp.mso/requestsdb\"><soapenv:Header/><soapenv:Body>\n"+
+            "     <ns:updateResourceOperationStatus>\n"+
+            "                <errorCode>$errorCode</errorCode>\n"+
+            "                <jobId>$jobId</jobId>\n"+
+            "                <operType>$operType</operType>\n"+
+            "                <operationId>$operationId</operationId>\n"+
+            "                <progress>$progress</progress>\n"+
+            "                <resourceTemplateUUID>$resourceTemplateUUID</resourceTemplateUUID>\n"+
+            "                <serviceId>$serviceId</serviceId>\n"+
+            "                <status>$status</status>\n"+
+            "                <statusDescription>$statusDescription</statusDescription>\n"+
+            "     </ns:updateResourceOperationStatus></soapenv:Body></soapenv:Envelope>";
+
+    private static final String getBodyTemplate = " <soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ns=\"http://org.openecomp.mso/requestsdb\"><soapenv:Header/><soapenv:Body>\n" +
+            "     <ns:getResourceOperationStatus>\n" +
+            "                <operationId>$operationId</operationId>\n" +
+            "                <resourceTemplateUUID>$resourceTemplateUUID</resourceTemplateUUID>\n" +
+            "                <serviceId>$serviceId</serviceId>\n" +
+            "     </ns:getResourceOperationStatus></soapenv:Body></soapenv:Envelope>";
+
+
+    private void updateResOperStatus(ResourceOperationStatus resourceOperationStatus) throws RouteException {
+        logger.info("AbstractSdncOperationTask.updateResOperStatus begin!");
+        String url = "http://mso:8080/dbadapters/RequestsDbAdapter";
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Authorization", "Basic QlBFTENsaWVudDpwYXNzd29yZDEk");
+        httpPost.addHeader("Content-type", "application/soap+xml");
+        String postBody = getPostStringBody(resourceOperationStatus);
+        httpPost.setEntity(new StringEntity(postBody, ContentType.APPLICATION_XML));
+        httpPost(url, httpPost);
+        logger.info("AbstractSdncOperationTask.updateResOperStatus end!");
+        //requestsDB.updateResOperStatus(resourceOperationStatus);
+    }
+
+    protected String getPostbody(Object inputEntity) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        String postBody = null;
+        try {
+            objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+            postBody = objectMapper.writeValueAsString(inputEntity);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return postBody;
+    }
+
+    protected String httpPost(String url, HttpPost httpPost) throws RouteException {
+        logger.info("AbstractSdncOperationTask.httpPost begin!");
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        String result = null;
+        boolean var15 = false;
+
+        String errorMsg;
+        label91: {
+            try {
+                var15 = true;
+                CloseableHttpResponse closeableHttpResponse = httpClient.execute(httpPost);
+                result = EntityUtils.toString(closeableHttpResponse.getEntity());
+                logger.info("result = {}", result);
+//                LOGGER.info(MessageEnum.RA_RESPONSE_FROM_SDNC, result.toString(), "SDNC", "");
+                if(closeableHttpResponse.getStatusLine().getStatusCode() != 200) {
+                    logger.info("exception: fail for status code = {}", closeableHttpResponse.getStatusLine().getStatusCode());
+                    throw new RouteException(result, "SERVICE_GET_ERR");
+                }
 
-    private static MsoLogger logger = MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL);
+                closeableHttpResponse.close();
+                var15 = false;
+                break label91;
+            } catch (IOException var19) {
+                errorMsg = url + ":httpPostWithJSON connect faild";
+                logger.info("exception: POST_CONNECT_FAILD : {}", errorMsg);
+                throwsRouteException(errorMsg, var19, "POST_CONNECT_FAILD");
+                var15 = false;
+            } finally {
+                if(var15) {
+                    try {
+                        httpClient.close();
+                    } catch (IOException var16) {
+                        String errorMsg1 = url + ":close  httpClient faild";
+                        logger.info("exception: CLOSE_CONNECT_FAILD : {}", errorMsg1);
+                        throwsRouteException(errorMsg1, var16, "CLOSE_CONNECT_FAILD");
+                    }
+
+                }
+            }
+
+            try {
+                httpClient.close();
+            } catch (IOException var17) {
+                errorMsg = url + ":close  httpClient faild";
+                logger.info("exception: CLOSE_CONNECT_FAILD : {}", errorMsg);
+                throwsRouteException(errorMsg, var17, "CLOSE_CONNECT_FAILD");
+            }
+        }
+
+        try {
+            httpClient.close();
+        } catch (IOException var18) {
+            errorMsg = url + ":close  httpClient faild";
+            logger.info("exception: CLOSE_CONNECT_FAILD : {}", errorMsg);
+            throwsRouteException(errorMsg, var18, "CLOSE_CONNECT_FAILD");
+        }
+        logger.info("AbstractSdncOperationTask.httpPost end!");
+        return result;
+    }
+
+    private static void throwsRouteException(String errorMsg, Exception e, String errorCode) throws RouteException {
+        String msg = errorMsg + ".errorMsg:" + e.getMessage();
+        logger.info("exception: {}", msg);
+        throw new RouteException(errorMsg, errorCode);
+    }
+
+    private String getPostStringBody(ResourceOperationStatus resourceOperationStatus) {
+        logger.info("AbstractSdncOperationTask.getPostStringBody begin!");
+        String postBody = new String(postBodyTemplate);
+        postBody = postBody.replace("$errorCode", resourceOperationStatus.getErrorCode());
+        postBody = postBody.replace("$jobId", resourceOperationStatus.getJobId());
+        postBody = postBody.replace("$operType", resourceOperationStatus.getOperType());
+        postBody = postBody.replace("$operationId", resourceOperationStatus.getOperationId());
+        postBody = postBody.replace("$progress", resourceOperationStatus.getProgress());
+        postBody = postBody.replace("$resourceTemplateUUID", resourceOperationStatus.getResourceTemplateUUID());
+        postBody = postBody.replace("$serviceId", resourceOperationStatus.getServiceId());
+        postBody = postBody.replace("$status", resourceOperationStatus.getStatus());
+        postBody = postBody.replace("$statusDescription", resourceOperationStatus.getStatusDescription());
+        logger.info("AbstractSdncOperationTask.getPostStringBody end!");
+        return postBody;
+    }
+
+    private String getGetStringBody(String serviceId, String operationId, String resourceTemplateUUID) {
+        logger.info("AbstractSdncOperationTask.getGetStringBody begin!");
+        String getBody = new String(getBodyTemplate);
+        getBody = getBody.replace("$operationId", operationId);
+        getBody = getBody.replace("$resourceTemplateUUID", resourceTemplateUUID);
+        getBody = getBody.replace("$serviceId", serviceId);
+        logger.info("AbstractSdncOperationTask.getGetStringBody end!");
+        return getBody;
+    }
+
+    private ResourceOperationStatus getResourceOperationStatus(String serviceId, String operationId, String resourceTemplateUUID) throws RouteException {
+        logger.info("AbstractSdncOperationTask.getResourceOperationStatus begin!");
+        String url = "http://mso:8080/dbadapters/RequestsDbAdapter";
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Authorization", "Basic QlBFTENsaWVudDpwYXNzd29yZDEk");
+        httpPost.addHeader("Content-type", "application/soap+xml");
+        String getBody = getGetStringBody(serviceId, operationId, resourceTemplateUUID);
+        httpPost.setEntity(new StringEntity(getBody, ContentType.APPLICATION_XML));
+        String result = httpPost(url, httpPost);
+        ResourceOperationStatus resourceOperationStatus = getResourceOperationStatusFromXmlString(result);
+        logger.info("AbstractSdncOperationTask.getResourceOperationStatus end!");
+        return resourceOperationStatus;
+
+        //return requestsDB.getResourceOperationStatus(serviceId, operationId, resourceTemplateUUID);
+    }
+
+    private String httpGet(String url, HttpGet httpGet) throws RouteException {
+        logger.info("AbstractSdncOperationTask.httpGet begin!");
+        boolean var16 = false;
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        String result = "";
+        String errorMsg;
+        label109:
+        {
+            label110:
+            {
+                try {
+                    var16 = true;
+                    CloseableHttpResponse e = httpClient.execute(httpGet);
+                    result = EntityUtils.toString(e.getEntity());
+                    logger.info("result = {}", result);
+                    if (e.getStatusLine().getStatusCode() != 200) {
+                        logger.info("exception: fail for status code = {}", e.getStatusLine().getStatusCode());
+                        throw new RouteException(result, "SERVICE_GET_ERR");
+                    }
+
+                    e.close();
+                    var16 = false;
+                    break label110;
+                } catch (ClientProtocolException var21) {
+                    errorMsg = url + ":httpGetWithJSON connect faild";
+                    logger.info("exception: GET_CONNECT_FAILD {}", errorMsg);
+                    throwsRouteException(errorMsg, var21, "GET_CONNECT_FAILD");
+                    var16 = false;
+                } catch (IOException var22) {
+                    errorMsg = url + ":httpGetWithJSON connect faild";
+                    logger.info("exception: GET_CONNECT_FAILD {}", errorMsg);
+                    throwsRouteException(errorMsg, var22, "GET_CONNECT_FAILD");
+                    var16 = false;
+                    break label109;
+                } finally {
+                    if (var16) {
+                        try {
+                            httpClient.close();
+                        } catch (IOException var17) {
+                            String errorMsg1 = url + ":close  httpClient faild";
+                            logger.info("exception: CLOSE_CONNECT_FAILD {}", errorMsg1);
+                            throwsRouteException(errorMsg1, var17, "CLOSE_CONNECT_FAILD");
+                        }
+
+                    }
+                }
+
+                try {
+                    httpClient.close();
+                } catch (IOException var19) {
+                    errorMsg = url + ":close  httpClient faild";
+                    logger.info("exception: CLOSE_CONNECT_FAILD {}", errorMsg);
+                    throwsRouteException(errorMsg, var19, "CLOSE_CONNECT_FAILD");
+                }
+
+            }
+
+            try {
+                httpClient.close();
+            } catch (IOException var20) {
+                errorMsg = url + ":close  httpClient faild";
+                logger.info("exception: CLOSE_CONNECT_FAILD {}", errorMsg);
+                throwsRouteException(errorMsg, var20, "CLOSE_CONNECT_FAILD");
+            }
+
+        }
+
+        try {
+            httpClient.close();
+        } catch (IOException var18) {
+            errorMsg = url + ":close  httpClient faild";
+            logger.info("exception: CLOSE_CONNECT_FAILD {}", errorMsg);
+            throwsRouteException(errorMsg, var18, "CLOSE_CONNECT_FAILD");
+        }
+        logger.info("AbstractSdncOperationTask.httpGet end!");
+        return result;
+    }
+
+    private ResourceOperationStatus getResourceOperationStatusFromXmlString(String result) {
+        logger.info("AbstractSdncOperationTask.getResourceOperationStatusFromXmlString begin!");
+        ResourceOperationStatus resourceOperationStatus = new ResourceOperationStatus();
+        resourceOperationStatus.setErrorCode(getValueByName("errorCode", result));
+        resourceOperationStatus.setJobId(getValueByName("jobId", result));
+        resourceOperationStatus.setOperType(getValueByName("operType", result));
+        resourceOperationStatus.setOperationId(getValueByName("operationId", result));
+        resourceOperationStatus.setProgress(getValueByName("progress", result));
+        resourceOperationStatus.setResourceTemplateUUID(getValueByName("resourceTemplateUUID", result));
+        resourceOperationStatus.setServiceId(getValueByName("serviceId", result));
+        resourceOperationStatus.setStatus(getValueByName("status", result));
+        resourceOperationStatus.setStatusDescription(getValueByName("statusDescription", result));
+        logger.info("AbstractSdncOperationTask.getResourceOperationStatusFromXmlString end!");
+        return resourceOperationStatus;
+    }
+
+    private String getValueByName(String Name, String xml) {
+        if (!StringUtils.isBlank(xml) && xml.contains(Name)) {
+            String start = "<" + Name + ">";
+            String end = "</" + Name + ">";
+            return xml.substring(xml.indexOf(start), xml.indexOf(end)).replace(start, "");
+        }
+        return "";
+    }
+
+    protected static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
 
     @Override
     public void execute(DelegateExecution execution) {
+        logger.info("AbstractSdncOperationTask.execute begin!");
         GenericResourceApi genericResourceApiClient = getGenericResourceApiClient(execution);
-        updateProgress(execution, RequestsDbConstant.Status.PROCESSING, null, "10", "execute begin!");
+//        updateProgress(execution, RequestsDbConstant.Status.PROCESSING, null, "10", "execute begin!");
         Map<String, String> inputs = getInputs(execution);
-        updateProgress(execution, null, null, "30", "getGenericResourceApiClient finished!");
+//        updateProgress(execution, null, null, "30", "getGenericResourceApiClient finished!");
         try {
             sendRestrequestAndHandleResponse(execution, inputs, genericResourceApiClient);
             execution.setVariable("SDNCA_SuccessIndicator", true);
-            updateProgress(execution, RequestsDbConstant.Status.FINISHED, null, RequestsDbConstant.Progress.ONE_HUNDRED, "execute finished!");
+//            updateProgress(execution, RequestsDbConstant.Status.FINISHED, null, RequestsDbConstant.Progress.ONE_HUNDRED, "execute finished!");
         } catch (Exception e) {
+            logger.info("exception: AbstractSdncOperationTask.fail!");
+            logger.error("exception: AbstractSdncOperationTask.fail!:", e);
             e.printStackTrace();
             execution.setVariable("SDNCA_SuccessIndicator", false);
         }
+        logger.info("AbstractSdncOperationTask.execute end!");
     }
 
     protected Map<String, String> getInputs(DelegateExecution execution) {
+        logger.info("AbstractSdncOperationTask.getInputs begin!");
         Map<String, String> inputs = new HashMap<>();
         String json = (String) execution.getVariable(SDCADAPTOR_INPUTS);
         JSONObject jsonObject = new JSONObject(json);
         JSONObject paras = jsonObject.getJSONObject("additionalParamForNs");
-        paras.keySet().stream().forEach(key -> inputs.put(key, paras.getString((String) key)));
+        Iterator<String> iterator = paras.keys();
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+            inputs.put(key, paras.getString(key));
+        }
+/*        if (paras.keys().hasNext()) {
+            paras.keySet().stream().forEach(key -> inputs.put(key, paras.getString((String) key)));
+        }*/
+        logger.info("AbstractSdncOperationTask.getInputs end!");
         return inputs;
     }
 
@@ -84,35 +372,104 @@ public abstract class AbstractSdncOperationTask extends BaseTask {
                                String errorCode,
                                String progress,
                                String statusDescription) {
+        logger.info("AbstractSdncOperationTask.updateProgress begin!");
         String serviceId = (String) execution.getVariable("serviceId");
         String operationId = (String) execution.getVariable("operationId");
-        String resourceTemplateUUID = (String) execution.getVariable("resourceTemplateUUID");
-        ResourceOperationStatus resourceOperationStatus = requestsDB.getResourceOperationStatus(serviceId, operationId, resourceTemplateUUID);
-        if (!StringUtils.isBlank(status)) {
-            resourceOperationStatus.setStatus(status);
+        String resourceTemplateUUID = (String) execution.getVariable("resourceUUID");
+        try {
+            ResourceOperationStatus resourceOperationStatus = getResourceOperationStatus(serviceId, operationId, resourceTemplateUUID);
+            if (!StringUtils.isBlank(status)) {
+                resourceOperationStatus.setStatus(status);
+            }
+            if (!StringUtils.isBlank(errorCode)) {
+                resourceOperationStatus.setErrorCode(errorCode);
+            }
+            if (!StringUtils.isBlank(progress)) {
+                resourceOperationStatus.setProgress(progress);
+            }
+            if (!StringUtils.isBlank(statusDescription)) {
+                resourceOperationStatus.setStatusDescription(statusDescription);
+            }
+            updateResOperStatus(resourceOperationStatus);
+            logger.info("AbstractSdncOperationTask.updateProgress end!");
+        } catch (Exception exception) {
+            System.out.println(exception);
+            logger.info("exception: AbstractSdncOperationTask.updateProgress fail!");
+            logger.error("exception: AbstractSdncOperationTask.updateProgress fail:", exception);
+            LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " updateProgress catch exception: ", "", this.getTaskName(), MsoLogger.ErrorCode.UnknownError, exception.getClass().toString());
         }
-        if (!StringUtils.isBlank(errorCode)) {
-            resourceOperationStatus.setErrorCode(errorCode);
+    }
+
+
+    protected boolean isSend2SdncDirectly() {
+        logger.info("AbstractSdncOperationTask.isSend2SdncDirectly begin!");
+        Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("topology.properties");
+        if (properties != null) {
+            String sdncIp = properties.get("sdnc-ip");
+            String sdncPort = properties.get("sdnc-port");
+            if (!StringUtils.isBlank(sdncIp) && isIp(sdncIp) && !StringUtils.isBlank(sdncPort)) {
+                logger.info("AbstractSdncOperationTask.isSend2SdncDirectly = true.");
+                return true;
+            }
         }
-        if (!StringUtils.isBlank(progress)) {
-            resourceOperationStatus.setProgress(progress);
+        logger.info("AbstractSdncOperationTask.isSend2SdncDirectly = false.");
+        return false;
+    }
+
+    protected String getSdncIp() {
+        logger.info("AbstractSdncOperationTask.getSdncIp begin.");
+        String sdncIp = null;
+        Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("topology.properties");
+        if (properties != null) {
+            sdncIp = properties.get("sdnc-ip");
         }
-        if (!StringUtils.isBlank(statusDescription)) {
-            resourceOperationStatus.setStatusDescription(statusDescription);
+        String returnIp = StringUtils.isBlank(sdncIp) || !isIp(sdncIp) ? null : sdncIp;
+        logger.info("AbstractSdncOperationTask.getSdncIp: sdncIp = {}", returnIp);
+        return returnIp;
+    }
+
+    protected String getSdncPort() {
+        logger.info("AbstractSdncOperationTask.getSdncPort begin.");
+        String sdncPort = null;
+        Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("topology.properties");
+        if (properties != null) {
+            sdncPort = properties.get("sdnc-port");
         }
-        requestsDB.updateResOperStatus(resourceOperationStatus);
+        String returnPort = StringUtils.isBlank(sdncPort) ? null : sdncPort;
+        logger.info("AbstractSdncOperationTask.getSdncPort: returnPort = {}", sdncPort);
+        return returnPort;
     }
 
     private GenericResourceApi getGenericResourceApiClient(DelegateExecution execution) {
-        updateProgress(execution, null, null, "20", "getGenericResourceApiClient begin!");
-        Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
-        String msbIp = getString(properties, "msb.address", DEFAULT_MSB_IP);
-        int msbPort = Integer.valueOf(getString(properties, "msb.port", String.valueOf(DEFAULT_MSB_Port)));
+        logger.info("AbstractSdncOperationTask.getGenericResourceApiClient begin!");
+//        updateProgress(execution, null, null, "20", "getGenericResourceApiClient begin!");
+        String msbIp = System.getenv().get(ONAP_IP);
+        int msbPort = DEFAULT_MSB_Port;
+        Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("topology.properties");
+        if (properties != null) {
+            if (StringUtils.isBlank(msbIp) || !isIp(msbIp)) {
+                msbIp = properties.get("msb-ip");
+                if (StringUtils.isBlank(msbIp)) {
+                    msbIp = getString(properties, "msb.address", DEFAULT_MSB_IP);
+                }
+            }
+            String strMsbPort = properties.get("msb-port");
+            if (StringUtils.isBlank(strMsbPort)) {
+                strMsbPort = getString(properties, "msb.port", String.valueOf(DEFAULT_MSB_Port));
+            }
+            msbPort = Integer.valueOf(strMsbPort);
+        }
+        logger.info("AbstractSdncOperationTask.getGenericResourceApiClient msbIp = " + msbIp + " msbPort = " + msbPort);
         MSBServiceClient msbClient = new MSBServiceClient(msbIp, msbPort);
         RestServiceCreater restServiceCreater = new RestServiceCreater(msbClient);
+        logger.info("AbstractSdncOperationTask.getGenericResourceApiClient end!");
         return restServiceCreater.createService(GenericResourceApi.class);
     }
 
+    protected boolean isIp(String msbIp) {
+        return !StringUtils.isBlank(msbIp) && msbIp.split("\\.").length == 4;
+    }
+
     private String getString(Map<String, String> properties, String name, String defaultValue) {
         String vlaue = properties.get(name);
         try {
@@ -121,7 +478,7 @@ public abstract class AbstractSdncOperationTask extends BaseTask {
             }
         } catch (Exception e) {
             System.out.println(e);
-            logger.error(MessageEnum.GENERAL_EXCEPTION, " getMsbIp catch exception: ", "", this.getTaskName(), MsoLogger.ErrorCode.UnknownError, e.getClass().toString());
+            LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " getMsbIp catch exception: ", "", this.getTaskName(), MsoLogger.ErrorCode.UnknownError, e.getClass().toString());
         }
         return defaultValue;
     }
@@ -134,7 +491,7 @@ public abstract class AbstractSdncOperationTask extends BaseTask {
             }
         } catch (Exception e) {
             System.out.println(e);
-            logger.error(MessageEnum.GENERAL_EXCEPTION, " getMsbIp catch exception: ", "", this.getTaskName(), MsoLogger.ErrorCode.UnknownError, e.getClass().toString());
+            LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " getMsbIp catch exception: ", "", this.getTaskName(), MsoLogger.ErrorCode.UnknownError, e.getClass().toString());
         }
         return defaultValue;
     }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java
index 9e0b4f7806..e8bfcf5caa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncNetworkTopologyOperationTask.java
@@ -20,13 +20,21 @@
 
 package org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask;
 
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.msb.sdk.discovery.common.RouteException;
 import org.openecomp.mso.bpmn.core.WorkflowException;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.GenericResourceApi;
+import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.HeaderUtil;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.builder.NetworkRpcInputEntityBuilder;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.RpcNetworkTopologyOperationInputEntity;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.RpcNetworkTopologyOperationOutputEntity;
+import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.requestsdb.RequestsDbConstant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
@@ -34,20 +42,48 @@ import java.util.Map;
  * Created by 10112215 on 2017/9/20.
  */
 public class SdncNetworkTopologyOperationTask extends AbstractSdncOperationTask {
+    private static final Logger logger = LoggerFactory.getLogger(SdncNetworkTopologyOperationTask.class);
+
+
+    private static final String URL = "/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation";
+
     @Override
     public void sendRestrequestAndHandleResponse(DelegateExecution execution,
                                                  Map<String, String> inputs,
                                                  GenericResourceApi genericResourceApiClient) throws Exception {
+        logger.info("SdncNetworkTopologyOperationTask.sendRestrequestAndHandleResponse begin!");
         updateProgress(execution, null, null, "40", "sendRestrequestAndHandleResponse begin!");
         NetworkRpcInputEntityBuilder builder = new NetworkRpcInputEntityBuilder();
         RpcNetworkTopologyOperationInputEntity inputEntity = builder.build(execution, inputs);
         updateProgress(execution, null, null, "50", "RequestBody build finished!");
-        RpcNetworkTopologyOperationOutputEntity outputEntity = genericResourceApiClient.postNetworkTopologyOperation(inputEntity).execute().body();
-        updateProgress(execution, null, null, "90", "sendRestrequestAndHandleResponse finished!");
-        saveOutput(execution, outputEntity);
+        RpcNetworkTopologyOperationOutputEntity outputEntity;
+        if (!isSend2SdncDirectly()) {
+            outputEntity = genericResourceApiClient.postNetworkTopologyOperation
+                    (HeaderUtil.DefaulAuth, inputEntity).execute().body();
+            updateProgress(execution, null, null, "90", "sendRestrequestAndHandleResponse finished!");
+            saveOutput(execution, outputEntity);
+        } else {
+            Send2SdncDirectly(HeaderUtil.DefaulAuth, inputEntity);
+        }
+        logger.info("SdncNetworkTopologyOperationTask.sendRestrequestAndHandleResponse end!");
+    }
+
+    private void Send2SdncDirectly(String defaulAuth,
+                                   RpcNetworkTopologyOperationInputEntity inputEntity) throws RouteException {
+        logger.info("SdncNetworkTopologyOperationTask.Send2SdncDirectly begin!");
+        String url = "http://" + getSdncIp() + ":" + getSdncPort() + URL;
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Authorization", defaulAuth);
+        httpPost.addHeader("Content-type", "application/json");
+        String postBody = getPostbody(inputEntity);
+        LOGGER.info(MessageEnum.RA_SEND_REQUEST_SDNC, postBody.toString(), "SDNC", "");
+        httpPost.setEntity(new StringEntity(postBody, ContentType.APPLICATION_XML));
+        httpPost(url, httpPost);
+        logger.info("SdncNetworkTopologyOperationTask.Send2SdncDirectly end!");
     }
 
     private void saveOutput(DelegateExecution execution, RpcNetworkTopologyOperationOutputEntity output) throws Exception {
+        logger.info("SdncNetworkTopologyOperationTask.saveOutput begin!");
         String responseCode = output.getOutput().getResponseCode();
         if (!"200".equals(responseCode)) {
             String processKey = getProcessKey(execution);
@@ -56,8 +92,11 @@ public class SdncNetworkTopologyOperationTask extends AbstractSdncOperationTask
             WorkflowException workflowException = new WorkflowException(processKey, errorCode, errorMessage);
             execution.setVariable("SDNCA_SuccessIndicator", workflowException);
             updateProgress(execution, RequestsDbConstant.Status.ERROR, String.valueOf(errorCode), null, errorMessage);
+            logger.info("exception: SdncNetworkTopologyOperationTask.saveOutput fail!");
             throw new Exception("");
         }
+        updateProgress(execution, RequestsDbConstant.Status.FINISHED, null, RequestsDbConstant.Progress.ONE_HUNDRED, "execute finished!");
+        logger.info("SdncNetworkTopologyOperationTask.saveOutput end!");
     }
 
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java
index d6ccc8b03b..89d0958c75 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java
@@ -21,14 +21,20 @@
 package org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask;
 
 
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.msb.sdk.discovery.common.RouteException;
 import org.openecomp.mso.bpmn.core.WorkflowException;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.GenericResourceApi;
+import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.HeaderUtil;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.builder.ServiceRpcInputEntityBuilder;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.RpcServiceTopologyOperationInputEntity;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.RpcServiceTopologyOperationOutputEntity;
-import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.ServiceTopologyOperationOutputEntity;
-import org.openecomp.mso.requestsdb.RequestsDbConstant;
+import org.openecomp.mso.logger.MessageEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
@@ -36,20 +42,49 @@ import java.util.Map;
  * Created by 10112215 on 2017/9/26.
  */
 public class SdncServiceTopologyOperationTask extends AbstractSdncOperationTask {
+    private static final Logger logger = LoggerFactory.getLogger(SdncServiceTopologyOperationTask.class);
+
+
+    private static final String URL = "/restconf/operations/GENERIC-RESOURCE-API:service-topology-operation";
+
     @Override
     public void sendRestrequestAndHandleResponse(DelegateExecution execution,
                                                  Map<String, String> inputs,
                                                  GenericResourceApi genericResourceApiClient) throws Exception {
-        updateProgress(execution, null, null, "40", "sendRestrequestAndHandleResponse begin!");
+        logger.info("SdncServiceTopologyOperationTask.sendRestrequestAndHandleResponse begin!");
+//        updateProgress(execution, null, null, "40", "sendRestrequestAndHandleResponse begin!");
         ServiceRpcInputEntityBuilder builder = new ServiceRpcInputEntityBuilder();
         RpcServiceTopologyOperationInputEntity inputEntity = builder.build(execution, inputs);
-        updateProgress(execution, null, null, "50", "RequestBody build finished!");
-        RpcServiceTopologyOperationOutputEntity outputEntity = genericResourceApiClient.postServiceTopologyOperation(inputEntity).execute().body();
-        updateProgress(execution, null, null, "90", "sendRestrequestAndHandleResponse finished!");
-        saveOutput(execution, outputEntity);
+//        updateProgress(execution, null, null, "50", "RequestBody build finished!");
+        RpcServiceTopologyOperationOutputEntity outputEntity;
+        if (!isSend2SdncDirectly()) {
+            outputEntity = genericResourceApiClient.postServiceTopologyOperation
+                    (HeaderUtil.DefaulAuth, inputEntity).execute().body();
+//        updateProgress(execution, null, null, "90", "sendRestrequestAndHandleResponse finished!");
+            saveOutput(execution, outputEntity);
+        } else {
+            Send2SdncDirectly(HeaderUtil.DefaulAuth, inputEntity);
+        }
+        logger.info("SdncServiceTopologyOperationTask.sendRestrequestAndHandleResponse end!");
+
+    }
+
+    private void Send2SdncDirectly(String defaulAuth,
+                                   RpcServiceTopologyOperationInputEntity inputEntity) throws RouteException {
+        logger.info("SdncServiceTopologyOperationTask.Send2SdncDirectly begin!");
+        String url = "http://" + getSdncIp() + ":" + getSdncPort() + URL;
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Authorization", defaulAuth);
+        httpPost.addHeader("Content-type", "application/json");
+        String postBody = getPostbody(inputEntity);
+        LOGGER.info(MessageEnum.RA_SEND_REQUEST_SDNC, postBody.toString(), "SDNC", "");
+        httpPost.setEntity(new StringEntity(postBody, ContentType.APPLICATION_XML));
+        httpPost(url, httpPost);
+        logger.info("SdncServiceTopologyOperationTask.Send2SdncDirectly end!");
     }
 
     private void saveOutput(DelegateExecution execution, RpcServiceTopologyOperationOutputEntity output) throws Exception {
+        logger.info("SdncServiceTopologyOperationTask.saveOutput begin!");
         String responseCode = output.getOutput().getResponseCode();
         if (!"200".equals(responseCode)) {
             String processKey = getProcessKey(execution);
@@ -57,8 +92,10 @@ public class SdncServiceTopologyOperationTask extends AbstractSdncOperationTask
             String errorMessage = output.getOutput().getResponseMessage();
             WorkflowException workflowException = new WorkflowException(processKey, errorCode, errorMessage);
             execution.setVariable("SDNCA_SuccessIndicator", workflowException);
-            updateProgress(execution, RequestsDbConstant.Status.ERROR, String.valueOf(errorCode), null, errorMessage);
+//            updateProgress(execution, RequestsDbConstant.Status.ERROR, String.valueOf(errorCode), null, errorMessage);
+            logger.info("exception: SdncServiceTopologyOperationTask.saveOutput fail!");
             throw new Exception("");
         }
+        logger.info("SdncServiceTopologyOperationTask.saveOutput end!");
     }
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java
index 8d2cb1ef7f..49d702d1ee 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnOperationClient.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.onap.msb.sdk.httpclient.RestServiceCreater;
 import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.GenericResourceApi;
+import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.HeaderUtil;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.builder.NetworkRpcInputEntityBuilder;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.RpcNetworkTopologyOperationInputEntity;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.RpcNetworkTopologyOperationOutputEntity;
@@ -71,7 +72,8 @@ public class SdncUnderlayVpnOperationClient {
         updateProgress(null, null, "50", "RequestBody build finished!");
         RpcNetworkTopologyOperationOutputEntity networkRpcOutputEntiy = null;
         try {
-            networkRpcOutputEntiy = genericResourceApiClient.postNetworkTopologyOperation(body).execute().body();
+            networkRpcOutputEntiy = genericResourceApiClient.postNetworkTopologyOperation
+                    (HeaderUtil.DefaulAuth ,body).execute().body();
         } catch (Exception e) {
             logger.debug("Exception: ", e);
             updateProgress(RequestsDbConstant.Status.ERROR, null, null, "sendRestrequestAndHandleResponse exception:" + e.getMessage());
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnPreprocessTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnPreprocessTask.java
index 49ded45b4a..119ac42e76 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnPreprocessTask.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncUnderlayVpnPreprocessTask.java
@@ -41,7 +41,7 @@ public class SdncUnderlayVpnPreprocessTask extends BaseTask {
     private String getOperType(DelegateExecution execution) {
         String serviceId = (String) execution.getVariable("serviceId");
         String operationId = (String) execution.getVariable("operationId");
-        String resourceTemplateUUID = (String) execution.getVariable("resourceTemplateUUID");
+        String resourceTemplateUUID = (String) execution.getVariable("resourceUUID");
         ResourceOperationStatus resourceOperationStatus = requestsDB.getResourceOperationStatus(serviceId, operationId, resourceTemplateUUID);
         return resourceOperationStatus.getOperType();
     }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/GenericResourceApi.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/GenericResourceApi.java
index 62375afa20..23ad422599 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/GenericResourceApi.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/GenericResourceApi.java
@@ -26,6 +26,7 @@ import org.onap.msb.sdk.httpclient.annotaion.ServiceHttpEndPoint;
 import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.*;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.Header;
 import retrofit2.http.POST;
 
 /**
@@ -35,13 +36,16 @@ import retrofit2.http.POST;
 public interface GenericResourceApi {
 
     @POST("/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation")
-    Call<ResponseBody> postNetworkTopologyOperation(@Body RequestBody input);
+    Call<ResponseBody> postNetworkTopologyOperation(@Header("Authorization") String authorization,
+                                                    @Body RequestBody input);
 
     @POST("/restconf/operations/GENERIC-RESOURCE-API:network-topology-operation")
-    Call<RpcNetworkTopologyOperationOutputEntity> postNetworkTopologyOperation(@Body RpcNetworkTopologyOperationInputEntity input);
+    Call<RpcNetworkTopologyOperationOutputEntity> postNetworkTopologyOperation(@Header("Authorization") String authorization,
+                                                                               @Body RpcNetworkTopologyOperationInputEntity input);
 
     @POST("/restconf/operations/GENERIC-RESOURCE-API:service-topology-operation")
-    Call<RpcServiceTopologyOperationOutputEntity> postServiceTopologyOperation(@Body RpcServiceTopologyOperationInputEntity input);
+    Call<RpcServiceTopologyOperationOutputEntity> postServiceTopologyOperation(@Header("Authorization") String authorization,
+                                                                               @Body RpcServiceTopologyOperationInputEntity input);
 
 }
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/HeaderUtil.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/HeaderUtil.java
new file mode 100644
index 0000000000..a43eb526a6
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/HeaderUtil.java
@@ -0,0 +1,45 @@
+/*-
+ * ============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.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client;
+
+import java.util.Base64;
+
+public class HeaderUtil {
+
+    public static final String USER = "admin";
+    public static final String PASS = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U";
+    public static final String DefaulAuth = getAuthorization(USER, PASS);
+
+    public static String getAuthorization(String usr, String pwd) {
+
+        return "Basic " + base64Encode(usr + ":" + pwd);
+    }
+
+    private static String base64Encode(String str) {
+        String base64 = str;
+        try {
+            base64 = Base64.getEncoder()
+                .encodeToString(str.getBytes("utf-8"));
+        } catch (Exception ex) {
+        }
+        return base64;
+    }
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java
index 0634da7264..299c1c546b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java
@@ -114,25 +114,25 @@ public abstract class AbstractBuilder<IN, OUT> {
      abstract OUT build(DelegateExecution execution, IN input) throws Exception;
 
      protected String getRequestActoin(DelegateExecution execution) {
-          String action = /*RequestInformation.*/RequestAction.CreateNetworkInstance.name();
+          String action = /*RequestInformation.*/RequestAction.CreateNetworkInstance.getName();
           String operType = (String) execution.getVariable(OPERATION_TYPE);
           String resourceType = ((String) execution.getVariable(RESOURCE_TYPE)).toLowerCase();
           if (!StringUtils.isBlank(operType)) {
-               if (RequestsDbConstant.OperationType.DELETE.equals(operType)) {
+               if (RequestsDbConstant.OperationType.DELETE.equalsIgnoreCase(operType)) {
                     if (isOverlay(resourceType)) {
-                         action = /*RequestInformation.*/RequestAction.DeActivateDCINetworkInstance.name();
+                         action = /*RequestInformation.*/RequestAction.DeActivateDCINetworkInstance.getName();
                     } else if (isUnderlay(resourceType)) {
-                         action = /*RequestInformation.*/RequestAction.DeleteNetworkInstance.name();
+                         action = /*RequestInformation.*/RequestAction.DeleteNetworkInstance.getName();
                     } else {
-                         action = /*RequestInformation.*/RequestAction.DeleteServiceInstance.name();
+                         action = /*RequestInformation.*/RequestAction.DeleteServiceInstance.getName();
                     }
-               } else if (RequestsDbConstant.OperationType.CREATE.equals(operType)) {
+               } else if (RequestsDbConstant.OperationType.CREATE.equalsIgnoreCase(operType)) {
                     if (isOverlay(resourceType)) {
-                         action = /*RequestInformation.*/RequestAction.ActivateDCINetworkInstance.name();
+                         action = /*RequestInformation.*/RequestAction.ActivateDCINetworkInstance.getName();
                     } else if (isUnderlay(resourceType)) {
-                         action = /*RequestInformation.*/RequestAction.CreateNetworkInstance.name();
+                         action = /*RequestInformation.*/RequestAction.CreateNetworkInstance.getName();
                     } else {
-                         action = /*RequestInformation.*/RequestAction.CreateServiceInstance.name();
+                         action = /*RequestInformation.*/RequestAction.CreateServiceInstance.getName();
                     }
                }
           }
@@ -148,21 +148,25 @@ public abstract class AbstractBuilder<IN, OUT> {
      }
 
      protected String getSvcAction(DelegateExecution execution) {
-          String action = /*SdncRequestHeader.*/SvcAction.Create.name();
+          String action = /*SdncRequestHeader.*/SvcAction.Create.getName();
           String operType = (String) execution.getVariable(OPERATION_TYPE);
           String resourceType = ((String) execution.getVariable(RESOURCE_TYPE)).toLowerCase();
           if (!StringUtils.isBlank(operType)) {
-               if (RequestsDbConstant.OperationType.DELETE.equals(operType)) {
+               if (RequestsDbConstant.OperationType.DELETE.equalsIgnoreCase(operType)) {
                     if (isOverlay(resourceType)) {
-                         action = /*SdncRequestHeader.*/SvcAction.Deactivate.name();
+                         action = /*SdncRequestHeader.*/SvcAction.Deactivate.getName();
+                    } else if (isUnderlay(resourceType)) {
+                         action = /*SdncRequestHeader.*/SvcAction.Delete.getName();
                     } else {
-                         action = /*SdncRequestHeader.*/SvcAction.Delete.name();
+                         action = /*SdncRequestHeader.*/SvcAction.Unassign.getName();
                     }
-               } else if (RequestsDbConstant.OperationType.CREATE.equals(operType)) {
+               } else if (RequestsDbConstant.OperationType.CREATE.equalsIgnoreCase(operType)) {
                     if (isOverlay(resourceType)) {
-                         action = /*SdncRequestHeader.*/SvcAction.Activate.name();
+                         action = /*SdncRequestHeader.*/SvcAction.Activate.getName();
+                    } else if (isUnderlay(resourceType)) {
+                         action = /*SdncRequestHeader.*/SvcAction.Create.getName();
                     } else {
-                         action = /*SdncRequestHeader.*/SvcAction.Create.name();
+                         action = /*SdncRequestHeader.*/SvcAction.Assign.getName();
                     }
                }
           }
@@ -179,13 +183,13 @@ public abstract class AbstractBuilder<IN, OUT> {
           return requestId;
      }
 
-     protected OnapModelInformationEntity getOnapModelInformationEntity(DelegateExecution execution) {
+     protected OnapModelInformationEntity getOnapServiceModelInformationEntity(DelegateExecution execution) {
           OnapModelInformationEntity onapModelInformationEntity = new OnapModelInformationEntity();
           {
                String modelInvariantUuid = (String) execution.getVariable("modelInvariantUuid");
                String modelVersion = (String) execution.getVariable("modelVersion");
                String modelUuid = (String) execution.getVariable("modelUuid");
-               String modelName = (String) execution.getVariable("modelName");
+               String modelName = (String) execution.getVariable("serviceModelName");
                onapModelInformationEntity.setModelInvariantUuid(modelInvariantUuid);
                onapModelInformationEntity.setModelVersion(modelVersion);
                onapModelInformationEntity.setModelUuid(modelUuid);
@@ -193,6 +197,21 @@ public abstract class AbstractBuilder<IN, OUT> {
           }
           return onapModelInformationEntity;
      }
+     
+     protected OnapModelInformationEntity getOnapNetworkModelInformationEntity(DelegateExecution execution) {
+         OnapModelInformationEntity onapModelInformationEntity = new OnapModelInformationEntity();
+         {
+              String modelInvariantUuid = (String) execution.getVariable("resourceInvariantUUID");
+              String modelVersion = (String) execution.getVariable("modelVersion");
+              String modelUuid = (String) execution.getVariable("resourceUUID");
+              String modelName = (String) execution.getVariable("resourceType");
+              onapModelInformationEntity.setModelInvariantUuid(modelInvariantUuid);
+              onapModelInformationEntity.setModelVersion(modelVersion);
+              onapModelInformationEntity.setModelUuid(modelUuid);
+              onapModelInformationEntity.setModelName(modelName);
+         }
+         return onapModelInformationEntity;
+    }
 
      protected List<ParamEntity> getParamEntities(Map<String, String> inputs) {
           List<ParamEntity> paramEntityList = new ArrayList<>();
@@ -218,9 +237,9 @@ public abstract class AbstractBuilder<IN, OUT> {
 
      protected ServiceInformationEntity getServiceInformationEntity(DelegateExecution execution) {
           ServiceInformationEntity serviceInformationEntity = new ServiceInformationEntity();
-          serviceInformationEntity.setServiceId((String) execution.getVariable("productFamilyId"));
-          serviceInformationEntity.setSubscriptionServiceType((String) execution.getVariable("subscriptionServiceType"));
-          serviceInformationEntity.setOnapModelInformation(getOnapModelInformationEntity(execution));
+          serviceInformationEntity.setServiceId("VOLTE_SERVICE_ID");
+          serviceInformationEntity.setSubscriptionServiceType((String) execution.getVariable("serviceType"));
+          serviceInformationEntity.setOnapModelInformation(getOnapServiceModelInformationEntity(execution));
           serviceInformationEntity.setServiceInstanceId((String) execution.getVariable("serviceInstanceId"));
           serviceInformationEntity.setGlobalCustomerId((String) execution.getVariable("globalSubscriberId"));
           return serviceInformationEntity;
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java
index 94838ed1ff..8d0caaa765 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java
@@ -47,6 +47,7 @@ public class NetworkRpcInputEntityBuilder extends AbstractBuilder<Map<String, St
                 List<ParamEntity> paramEntityList = getParamEntities(inputs);
                 networkInputPaarametersEntity.setParamList(paramEntityList);
             }
+            networkRequestInputEntity.setNetworkInputPaarameters(networkInputPaarametersEntity);
         }
         networkTopologyOperationInputEntity.setNetworkRequestInput(networkRequestInputEntity);
     }
@@ -85,7 +86,7 @@ public class NetworkRpcInputEntityBuilder extends AbstractBuilder<Map<String, St
     private void loadNetworkInformationEntity(DelegateExecution execution, NetworkTopologyOperationInputEntity networkTopologyOperationInputEntity) {
         NetworkInformationEntity networkInformationEntity = new NetworkInformationEntity();
         {
-            OnapModelInformationEntity onapModelInformationEntity = getOnapModelInformationEntity(execution);
+            OnapModelInformationEntity onapModelInformationEntity = getOnapNetworkModelInformationEntity(execution);
             networkInformationEntity.setOnapModelInformation(onapModelInformationEntity);
         }
         networkTopologyOperationInputEntity.setNetworkInformation(networkInformationEntity);
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInformationEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInformationEntity.java
index 02ac6824a1..3d59d3b73e 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInformationEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInformationEntity.java
@@ -26,13 +26,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/20.
  */
 public class NetworkInformationEntity {
-    @JsonProperty("network-id")
+    @JsonProperty("GENERIC-RESOURCE-API:network-id")
     private String networkId;
 
-    @JsonProperty("network-type")
+    @JsonProperty("GENERIC-RESOURCE-API:network-type")
     private String networkType;
 
-    @JsonProperty("onap-model-information")
+    @JsonProperty("GENERIC-RESOURCE-API:onap-model-information")
     private OnapModelInformationEntity onapModelInformation;
 
     public String getNetworkId() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInputPaarametersEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInputPaarametersEntity.java
index b45a21d3ac..f7b055efcf 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInputPaarametersEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkInputPaarametersEntity.java
@@ -36,6 +36,6 @@ public class NetworkInputPaarametersEntity {
         this.paramList = paramList;
     }
 
-    @JsonProperty("param")
+    @JsonProperty("GENERIC-RESOURCE-API:param")
     private List<ParamEntity> paramList;
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java
index 1aff6e948a..420d547a39 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java
@@ -26,19 +26,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/20.
  */
 public class NetworkRequestInputEntity {
-    @JsonProperty("network-name")
+    @JsonProperty("GENERIC-RESOURCE-API:network-name")
     private String networkName;
 
-    @JsonProperty("tenant")
+    @JsonProperty("GENERIC-RESOURCE-API:tenant")
     private String tenant;
 
-    @JsonProperty("aic-cloud-region")
+    @JsonProperty("GENERIC-RESOURCE-API:aic-cloud-region")
     private String aicCloudRegion;
 
-    @JsonProperty("aic-clli")
+    @JsonProperty("GENERIC-RESOURCE-API:aic-clli")
     private String aicClli;
 
-    @JsonProperty("network-input-parameters")
+    @JsonProperty("GENERIC-RESOURCE-API:network-input-parameters")
     private NetworkInputPaarametersEntity networkInputPaarameters;
 
     public String getNetworkName() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkResponseInformationEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkResponseInformationEntity.java
index 69ee28758d..aa8ea39cd1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkResponseInformationEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkResponseInformationEntity.java
@@ -26,10 +26,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/22.
  */
 public class NetworkResponseInformationEntity {
-    @JsonProperty("instance-id")
+    @JsonProperty("GENERIC-RESOURCE-API:instance-id")
     private String instanceId;
 
-    @JsonProperty("object-path")
+    @JsonProperty("GENERIC-RESOURCE-API:object-path")
     private String objectPath;
 
     public String getInstanceId() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationInputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationInputEntity.java
index 2fbc23e0cd..1ce0b455ed 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationInputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationInputEntity.java
@@ -26,19 +26,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/20.
  */
 public class NetworkTopologyOperationInputEntity {
-    @JsonProperty("sdnc-request-header")
+    @JsonProperty("GENERIC-RESOURCE-API:sdnc-request-header")
     private SdncRequestHeaderEntity sdncRequestHeader;
 
-    @JsonProperty("request-information")
+    @JsonProperty("GENERIC-RESOURCE-API:request-information")
     private RequestInformationEntity requestInformation;
 
-    @JsonProperty("service-information")
+    @JsonProperty("GENERIC-RESOURCE-API:service-information")
     private ServiceInformationEntity serviceInformation;
 
-    @JsonProperty("network-information")
+    @JsonProperty("GENERIC-RESOURCE-API:network-information")
     private NetworkInformationEntity networkInformation;
 
-    @JsonProperty("network-request-input")
+    @JsonProperty("GENERIC-RESOURCE-API:network-request-input")
     private NetworkRequestInputEntity networkRequestInput;
 
     public SdncRequestHeaderEntity getSdncRequestHeader() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationOutputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationOutputEntity.java
index 4be0844fc9..c835efb9ed 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationOutputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkTopologyOperationOutputEntity.java
@@ -26,22 +26,22 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/22.
  */
 public class NetworkTopologyOperationOutputEntity {
-    @JsonProperty("svc-request-id")
+    @JsonProperty("GENERIC-RESOURCE-API:svc-request-id")
     private String svcRequestId;
 
-    @JsonProperty("response-code")
+    @JsonProperty("GENERIC-RESOURCE-API:response-code")
     private String responseCode;
 
-    @JsonProperty("response-message")
+    @JsonProperty("GENERIC-RESOURCE-API:response-message")
     private String responseMessage;
 
-    @JsonProperty("ack-final-indicator")
+    @JsonProperty("GENERIC-RESOURCE-API:ack-final-indicator")
     private String ackFinalIndicator;
 
-    @JsonProperty("network-response-information")
+    @JsonProperty("GENERIC-RESOURCE-API:network-response-information")
     private NetworkResponseInformationEntity networkResponseInformation;
 
-    @JsonProperty("service-response-information")
+    @JsonProperty("GENERIC-RESOURCE-API:service-response-information")
     private ServiceResponseInformationEntity serviceResponseInformation;
 
     public String getSvcRequestId() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/OnapModelInformationEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/OnapModelInformationEntity.java
index f061c9ab0a..eeb8eda61f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/OnapModelInformationEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/OnapModelInformationEntity.java
@@ -26,19 +26,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/20.
  */
 public class OnapModelInformationEntity {
-    @JsonProperty("model-invariant-uuid")
+    @JsonProperty("GENERIC-RESOURCE-API:model-invariant-uuid")
     private String modelInvariantUuid;
 
-    @JsonProperty("model-customization-uuid")
+    @JsonProperty("GENERIC-RESOURCE-API:model-customization-uuid")
     private String modelCustomizationUuid;
 
-    @JsonProperty("model-uuid")
+    @JsonProperty("GENERIC-RESOURCE-API:model-uuid")
     private String modelUuid;
 
-    @JsonProperty("model-version")
+    @JsonProperty("GENERIC-RESOURCE-API:model-version")
     private String modelVersion;
 
-    @JsonProperty("model-name")
+    @JsonProperty("GENERIC-RESOURCE-API:model-name")
     private String modelName;
 
     public String getModelInvariantUuid() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ParamEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ParamEntity.java
index 8c2f217839..b45a1c3265 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ParamEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ParamEntity.java
@@ -26,10 +26,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/20.
  */
 public class ParamEntity {
-    @JsonProperty("name")
+    @JsonProperty("GENERIC-RESOURCE-API:name")
     private String name;
 
-    @JsonProperty("value")
+    @JsonProperty("GENERIC-RESOURCE-API:value")
     private String value;
 
     public String getName() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RequestInformationEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RequestInformationEntity.java
index 1538b64c54..2982e5afc5 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RequestInformationEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RequestInformationEntity.java
@@ -74,21 +74,21 @@ public class RequestInformationEntity {
         this.orerVersion = orerVersion;
     }
 
-    @JsonProperty("request-id")
+    @JsonProperty("GENERIC-RESOURCE-API:request-id")
     private String requestId;
 
-    @JsonProperty("request-action")
+    @JsonProperty("GENERIC-RESOURCE-API:request-action")
     private String requestAction;
 
-    @JsonProperty("source")
+    @JsonProperty("GENERIC-RESOURCE-API:source")
     private String source;
 
-    @JsonProperty("notification-url")
+    @JsonProperty("GENERIC-RESOURCE-API:notification-url")
     private String notificationUrl;
 
-    @JsonProperty("order-number")
+    @JsonProperty("GENERIC-RESOURCE-API:order-number")
     private String orderUnmber;
 
-    @JsonProperty("order-version")
+    @JsonProperty("GENERIC-RESOURCE-API:order-version")
     private String orerVersion;
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationInputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationInputEntity.java
index ed8ae578a1..b20e9ab833 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationInputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationInputEntity.java
@@ -34,6 +34,6 @@ public class RpcNetworkTopologyOperationInputEntity {
         this.input = input;
     }
 
-    @JsonProperty("input")
+    @JsonProperty("GENERIC-RESOURCE-API:input")
     private NetworkTopologyOperationInputEntity input = null;
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationOutputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationOutputEntity.java
index 745d6c66b5..40d336e000 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationOutputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcNetworkTopologyOperationOutputEntity.java
@@ -34,6 +34,6 @@ public class RpcNetworkTopologyOperationOutputEntity {
         this.output = output;
     }
 
-    @JsonProperty("output")
+    @JsonProperty("GENERIC-RESOURCE-API:output")
     private NetworkTopologyOperationOutputEntity output;
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationInputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationInputEntity.java
index 5b49e11efd..54933cce2a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationInputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationInputEntity.java
@@ -34,6 +34,6 @@ public class RpcServiceTopologyOperationInputEntity {
         this.serviceTopologyOperationInputEntity = serviceTopologyOperationInputEntity;
     }
 
-    @JsonProperty("input")
+    @JsonProperty("GENERIC-RESOURCE-API:input")
     private ServiceTopologyOperationInputEntity serviceTopologyOperationInputEntity;
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationOutputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationOutputEntity.java
index c59cc4eed1..02fb1116e1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationOutputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/RpcServiceTopologyOperationOutputEntity.java
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/26.
  */
 public class RpcServiceTopologyOperationOutputEntity {
-    @JsonProperty("output")
+    @JsonProperty("GENERIC-RESOURCE-API:output")
     private ServiceTopologyOperationOutputEntity output;
 
     public ServiceTopologyOperationOutputEntity getOutput() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/SdncRequestHeaderEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/SdncRequestHeaderEntity.java
index 1ea1045cc0..7e28aa07b6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/SdncRequestHeaderEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/SdncRequestHeaderEntity.java
@@ -26,13 +26,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/20.
  */
 public class SdncRequestHeaderEntity {
-    @JsonProperty("svc-request-id")
+    @JsonProperty("GENERIC-RESOURCE-API:svc-request-id")
     private String svcRequestId;
 
-    @JsonProperty("svc-action")
+    @JsonProperty("GENERIC-RESOURCE-API:svc-action")
     private String svcAction;
 
-    @JsonProperty("svc-notification-url")
+    @JsonProperty("GENERIC-RESOURCE-API:svc-notification-url")
     private String svcNotificationUrl;
 
     public String getSvcRequestId() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInformationEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInformationEntity.java
index 58d50fa724..46b53902a4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInformationEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInformationEntity.java
@@ -26,22 +26,22 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/20.
  */
 public class ServiceInformationEntity {
-    @JsonProperty("service-id")
+    @JsonProperty("GENERIC-RESOURCE-API:service-id")
     private String serviceId;
 
-    @JsonProperty("subscription-service-type")
+    @JsonProperty("GENERIC-RESOURCE-API:subscription-service-type")
     private String subscriptionServiceType;
 
-    @JsonProperty("onap-model-information")
+    @JsonProperty("GENERIC-RESOURCE-API:onap-model-information")
     private OnapModelInformationEntity onapModelInformation;
 
-    @JsonProperty("service-instance-id")
+    @JsonProperty("GENERIC-RESOURCE-API:service-instance-id")
     private String serviceInstanceId;
 
-    @JsonProperty("global-customer-id")
+    @JsonProperty("GENERIC-RESOURCE-API:global-customer-id")
     private String globalCustomerId;
 
-    @JsonProperty("subscriber-name")
+    @JsonProperty("GENERIC-RESOURCE-API:subscriber-name")
     private String subscriberName;
 
     public String getServiceId() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInputParametersEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInputParametersEntity.java
index 038c50c7c6..c056ffa5d9 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInputParametersEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceInputParametersEntity.java
@@ -36,6 +36,6 @@ public class ServiceInputParametersEntity {
         this.paramList = paramList;
     }
 
-    @JsonProperty("param")
+    @JsonProperty("GENERIC-RESOURCE-API:param")
     private List<ParamEntity> paramList;
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceRequestInputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceRequestInputEntity.java
index 576995df49..934a94610d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceRequestInputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceRequestInputEntity.java
@@ -27,10 +27,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class ServiceRequestInputEntity {
 
-    @JsonProperty("service-instance-name")
+    @JsonProperty("GENERIC-RESOURCE-API:service-instance-name")
     private String serviceInstanceName;
 
-    @JsonProperty("service-input-parameters")
+    @JsonProperty("GENERIC-RESOURCE-API:service-input-parameters")
     private ServiceInputParametersEntity serviceInputParametersEntity;
 
     public String getServiceInstanceName() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceResponseInformationEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceResponseInformationEntity.java
index ade389b30e..ee0104bff0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceResponseInformationEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceResponseInformationEntity.java
@@ -26,10 +26,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/22.
  */
 public class ServiceResponseInformationEntity {
-    @JsonProperty("instance-id")
+    @JsonProperty("GENERIC-RESOURCE-API:instance-id")
     private String instanceId;
 
-    @JsonProperty("object-path")
+    @JsonProperty("GENERIC-RESOURCE-API:object-path")
     private String objectPath;
 
     public String getInstanceId() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationInputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationInputEntity.java
index d817b0c52f..ba46eb7ee1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationInputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationInputEntity.java
@@ -26,16 +26,16 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/26.
  */
 public class ServiceTopologyOperationInputEntity {
-    @JsonProperty("sdnc-request-header")
+    @JsonProperty("GENERIC-RESOURCE-API:sdnc-request-header")
     private SdncRequestHeaderEntity sdncRequestHeader;
 
-    @JsonProperty("request-information")
+    @JsonProperty("GENERIC-RESOURCE-API:request-information")
     private RequestInformationEntity requestInformation;
 
-    @JsonProperty("service-information")
+    @JsonProperty("GENERIC-RESOURCE-API:service-information")
     private ServiceInformationEntity serviceInformation;
 
-    @JsonProperty("service-request-input")
+    @JsonProperty("GENERIC-RESOURCE-API:service-request-input")
     private ServiceRequestInputEntity serviceRequestInput;
 
     public SdncRequestHeaderEntity getSdncRequestHeader() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationOutputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationOutputEntity.java
index ebc1ca807d..216a3d41bd 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationOutputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/ServiceTopologyOperationOutputEntity.java
@@ -26,19 +26,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Created by 10112215 on 2017/9/26.
  */
 public class ServiceTopologyOperationOutputEntity {
-    @JsonProperty("svc-request-id")
+    @JsonProperty("GENERIC-RESOURCE-API:svc-request-id")
     private String svcRequestId;
 
-    @JsonProperty("response-code")
+    @JsonProperty("GENERIC-RESOURCE-API:response-code")
     private String responseCode;
 
-    @JsonProperty("response-message")
+    @JsonProperty("GENERIC-RESOURCE-API:response-message")
     private String responseMessage;
 
-    @JsonProperty("ack-final-indicator")
+    @JsonProperty("GENERIC-RESOURCE-API:ack-final-indicator")
     private String ackFinalIndicator;
 
-    @JsonProperty("service-response-information")
+    @JsonProperty("GENERIC-RESOURCE-API:service-response-information")
     private ServiceResponseInformationEntity serviceResponseInformation;
 
     public String getSvcRequestId() {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java
deleted file mode 100644
index f1224da30c..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java
+++ /dev/null
@@ -1,45 +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.openecomp.mso.bpmn.vcpe.workflow;
-
-import javax.ws.rs.Path;
-
-import org.camunda.bpm.engine.ProcessEngineServices;
-import org.camunda.bpm.engine.ProcessEngines;
-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
-
-
-/**
- * 
- * @version 1.0
- * Asynchronous Workflow processing using JAX RS RESTeasy implementation
- * Both Synchronous and Asynchronous BPMN process can benefit from this implementation since the workflow gets executed in the background
- * and the server thread is freed up, server scales better to process more incoming requests
- * 
- * Usage: For synchronous process, when you are ready to send the response invoke the callback to write the response
- * For asynchronous process - the activity may send a acknowledgement response and then proceed further on executing the process
- */
-@Path("/async")
-public class WorkflowAsyncVcpeResource extends WorkflowAsyncResource {
-	
-	protected ProcessEngineServices getProcessEngineServices() {
-        return pes4junit.orElse(ProcessEngines.getProcessEngine("vcpe"));
-	}
-}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml b/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml
index 4053de8e28..3e81a6a136 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml
@@ -23,7 +23,7 @@
 <process-application
     xmlns="http://www.camunda.org/schema/1.0/ProcessApplication"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <process-engine name="infrastructure">
+  <process-engine name="default">
     <configuration>org.camunda.bpm.engine.impl.cfg.StandaloneProcessEngineConfiguration</configuration>
     <datasource>java:jboss/datasources/ProcessEngine</datasource>
     <properties>
@@ -71,7 +71,7 @@
 
 
   	<process-archive name="MSOInfrastructureBPMN">
- 		<process-engine>infrastructure</process-engine>
+ 		<process-engine>default</process-engine>
   		<properties>
       		<property name="isDeleteUponUndeploy">false</property>
       		<property name="isScanForProcessDefinitions">true</property>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
index b9d5e2c1d2..8fc761c0d3 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
@@ -29,17 +29,18 @@ ex.processJavaException(execution)]]></bpmn:script>
         <camunda:out source="rollbackData" target="rollbackData" />
         <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
         <camunda:in source="serviceInstanceName" target="serviceInstanceName" />
-        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
         <camunda:in source="productFamilyId" target="productFamilyId" />
         <camunda:in source="disableRollback" target="disableRollback" />
-        <camunda:in source="serviceInputParams" target="serviceInputParams" />
+        <camunda:in source="uuiRequest" target="uuiRequest" />
         <camunda:out source="rolledBack" target="rolledBack" />
         <camunda:out source="serviceInstanceName" target="serviceInstanceName" />
         <camunda:in source="failIfExists" target="failIfExists" />
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
-        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
-        <camunda:in sourceExpression="1610" target="sdncVersion" />
+        <camunda:in source="serviceType" target="serviceType" />
         <camunda:in source="initialStatus" target="initialStatus" />
+        <camunda:in source="operationId" target="operationId" />
+        <camunda:in source="operationType" target="operationType" />
+        <camunda:in source="URN_mso_adapters_openecomp_db_endpoint" target="URN_mso_adapters_openecomp_db_endpoint" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_19eilro</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0klbpxx</bpmn:outgoing>
@@ -113,7 +114,7 @@ csi.sendSyncError(execution)]]></bpmn:script>
       <bpmn:sequenceFlow id="SequenceFlow_01umodj" sourceRef="ScriptTask_0u8o9p2" targetRef="CallActivity_1ang7q8" />
     </bpmn:subProcess>
     <bpmn:scriptTask id="ScriptTask_0xupxj9" name="Send Sync Ack Response" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_194rnud</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_19eilro</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  CreateCustomE2EServiceInstance()
@@ -146,18 +147,17 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
       <bpmn:outgoing>SequenceFlow_1euqjsp</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi= new CreateCustomE2EServiceInstance()
-csi.InitServiceOperationStatus(execution)]]></bpmn:script>
+csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="Task_0in343a" />
     <bpmn:serviceTask id="Task_19mxcw3" name="Update Service Operation Status">
       <bpmn:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${CVFMI_dbAdapterEndpoint}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
                 <camunda:entry key="content-type">application/soap+xml</camunda:entry>
-                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
+                <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry>
               </camunda:map>
             </camunda:inputParameter>
             <camunda:inputParameter name="payload">${CVFMI_updateServiceOperStatusRequest}</camunda:inputParameter>
@@ -171,27 +171,22 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
       <bpmn:incoming>SequenceFlow_1euqjsp</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_081z8l2</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="SequenceFlow_194rnud" sourceRef="Task_0in343a" targetRef="ScriptTask_0xupxj9" />
-    <bpmn:scriptTask id="Task_0in343a" name="Send SDNC Service" scriptFormat="java">
-      <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_194rnud</bpmn:outgoing>
-      <bpmn:script></bpmn:script>
-    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="ScriptTask_0xupxj9" />
   </bpmn:process>
   <bpmn:error id="Error_0nbdy47" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateCustomE2EServiceInstance">
       <bpmndi:BPMNShape id="StartEvent_00qj6ro_di" bpmnElement="StartEvent_00qj6ro">
-        <dc:Bounds x="82" y="180" width="36" height="36" />
+        <dc:Bounds x="-6" y="180" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="64" y="221" width="73" height="24" />
+          <dc:Bounds x="-24" y="221" width="73" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_0ka59nc_di" bpmnElement="SubProcess_0ka59nc" isExpanded="true">
         <dc:Bounds x="463" y="632" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0rhljy8_di" bpmnElement="DoCreateE2EServiceInstance">
-        <dc:Bounds x="701" y="158" width="100" height="80" />
+        <dc:Bounds x="751" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0bpd6c0_di" bpmnElement="EndEvent_0bpd6c0">
         <dc:Bounds x="1258" y="286" width="36" height="36" />
@@ -200,7 +195,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1s09c7d_di" bpmnElement="ScriptTask_1s09c7d">
-        <dc:Bounds x="129" y="158" width="100" height="80" />
+        <dc:Bounds x="115" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0ttvn8r_di" bpmnElement="ScriptTask_0ttvn8r">
         <dc:Bounds x="1038" y="158" width="100" height="80" />
@@ -212,7 +207,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         <dc:Bounds x="348" y="370" width="679" height="194" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0xupxj9_di" bpmnElement="ScriptTask_0xupxj9">
-        <dc:Bounds x="577" y="158" width="100" height="80" />
+        <dc:Bounds x="610" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0aqn64l_di" bpmnElement="ExclusiveGateway_0aqn64l" isMarkerVisible="true">
         <dc:Bounds x="903" y="173" width="50" height="50" />
@@ -227,24 +222,24 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0s2spoq_di" bpmnElement="SequenceFlow_0s2spoq">
-        <di:waypoint xsi:type="dc:Point" x="118" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="129" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="30" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="115" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="78.5" y="177" width="90" height="12" />
+          <dc:Bounds x="27.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_19eilro_di" bpmnElement="SequenceFlow_19eilro">
-        <di:waypoint xsi:type="dc:Point" x="677" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="701" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="710" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="751" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="644" y="177" width="90" height="12" />
+          <dc:Bounds x="685.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0klbpxx_di" bpmnElement="SequenceFlow_0klbpxx">
-        <di:waypoint xsi:type="dc:Point" x="801" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="851" y="198" />
         <di:waypoint xsi:type="dc:Point" x="903" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="807" y="183" width="0" height="12" />
+          <dc:Bounds x="832" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yayvrf_di" bpmnElement="SequenceFlow_0yayvrf">
@@ -255,10 +250,10 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0z4faf9_di" bpmnElement="SequenceFlow_0z4faf9">
-        <di:waypoint xsi:type="dc:Point" x="229" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="245" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="215" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="273" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="192" y="177" width="90" height="12" />
+          <dc:Bounds x="199" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_14zu6wr_di" bpmnElement="SequenceFlow_14zu6wr">
@@ -369,35 +364,25 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1euqjsp_di" bpmnElement="SequenceFlow_1euqjsp">
-        <di:waypoint xsi:type="dc:Point" x="345" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="371" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="373" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="446" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="358" y="177" width="0" height="12" />
+          <dc:Bounds x="364.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1a3vwas_di" bpmnElement="Task_1tqjch6">
-        <dc:Bounds x="245" y="158" width="100" height="80" />
+        <dc:Bounds x="273" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2">
-        <di:waypoint xsi:type="dc:Point" x="497" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="522" y="198" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="509.5" y="177" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1afiuuq_di" bpmnElement="Task_19mxcw3">
-        <dc:Bounds x="371" y="158" width="100" height="80" />
+        <dc:Bounds x="446" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_194rnud_di" bpmnElement="SequenceFlow_194rnud">
-        <di:waypoint xsi:type="dc:Point" x="597" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="627" y="198" />
+      <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2">
+        <di:waypoint xsi:type="dc:Point" x="546" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="610" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="612" y="177" width="0" height="12" />
+          <dc:Bounds x="533" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1u5yu0n_di" bpmnElement="Task_0in343a">
-        <dc:Bounds x="476" y="158" width="100" height="80" />
-      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn
index 24a9a6d73c..0316e26d9a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn
@@ -116,7 +116,7 @@ CreateNetworkInstance.prepareDBRequestError(execution)]]></bpmn2:script>
         <bpmn2:extensionElements>
           <camunda:connector>
             <camunda:inputOutput>
-              <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+              <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
               <camunda:inputParameter name="payload">${CRENI_createDBRequest}</camunda:inputParameter>
               <camunda:inputParameter name="headers">
                 <camunda:map>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
index 02f7f4815a..9fe6815570 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
@@ -366,9 +366,8 @@ CreateVcpeResCustService.prepareCreateServiceInstance(execution)]]></bpmn2:scrip
         </camunda:connector>
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0vj46ej</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_13uceka</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0sjpja4</bpmn2:outgoing>
     </bpmn2:serviceTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_13uceka" sourceRef="updateInfraRequest" targetRef="IntermediateThrowEvent_1as6hoa" />
     <bpmn2:scriptTask id="ScriptTask_1qd3uwb" name="Post Process&#10;Create&#10;Service&#10;" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1ky2sv9</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0vj46ej</bpmn2:outgoing>
@@ -431,7 +430,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]></bpmn2:s
       <bpmn2:linkEventDefinition name="StartService" />
     </bpmn2:intermediateCatchEvent>
     <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1as6hoa" name="GoToCreateAllottedResourcesTXC">
-      <bpmn2:incoming>SequenceFlow_13uceka</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1db0ri1</bpmn2:incoming>
       <bpmn2:linkEventDefinition name="CreateAllottedResourcesTXC" />
     </bpmn2:intermediateThrowEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_15odbkz" sourceRef="IntermediateCatchEvent_1i1nwfx" targetRef="prepareCreateService_scriptTask" />
@@ -471,36 +470,11 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]></bpmn2:s
       <bpmn2:incoming>SequenceFlow_0e9e6fo</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0hwsm6n</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:callActivity id="CallActivity_0xt1l8t" name="Call Create BRG Allotted Resource&#10;" calledElement="DoCreateAllottedResourceBRG">
-      <bpmn2:extensionElements>
-        <camunda:in source="msoRequestId" target="msoRequestId" />
-        <camunda:in source="disableRollback" target="disableRollback" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:in source="failExists" target="failExists" />
-        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
-        <camunda:in source="parentServiceInstanceIdBRG" target="parentServiceInstanceId" />
-        <camunda:in source="allottedResourceIdBRG" target="allottedResourceId" />
-        <camunda:in source="allottedResourceModelInfoBRG" target="allottedResourceModelInfo" />
-        <camunda:in source="allottedResourceRoleBRG" target="allottedResourceRole" />
-        <camunda:out source="rollbackData" target="DCARBRG_rollbackData" />
-        <camunda:out source="rolledBack" target="rolledBack" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="allottedResourceId" target="DCARBRG_allottedResourceId" />
-        <camunda:out source="allottedResourceName" target="DCARBRG_allottedResourceName" />
-        <camunda:in source="allottedResourceTypeBRG" target="allottedResourceType" />
-        <camunda:in source="vni" target="vni" />
-        <camunda:in source="vgmuxBearerIP" target="vgmuxBearerIP" />
-        <camunda:in source="brgWanMacAddress" target="brgWanMacAddress" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_0b5ztoe</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0e9e6fo</bpmn2:outgoing>
-    </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_0hwsm6n" sourceRef="ExclusiveGateway_0jqgskx" targetRef="IntermediateThrowEvent_0lt5ltv" />
     <bpmn2:sequenceFlow id="SequenceFlow_0loks1u" name="No" sourceRef="ExclusiveGateway_1xwfgxs" targetRef="ExclusiveGateway_0jqgskx" />
     <bpmn2:sequenceFlow id="SequenceFlow_0b5ztoe" name="Yes" sourceRef="ExclusiveGateway_1xwfgxs" targetRef="CallActivity_0xt1l8t">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("createBRGAR") != null && execution.getVariable("createBRGAR") == true }]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_0e9e6fo" sourceRef="CallActivity_0xt1l8t" targetRef="ExclusiveGateway_0jqgskx" />
     <bpmn2:scriptTask id="ScriptTask_05epj75" name="Prepare to create Allotted Resources BRG" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_15vce9o</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0yecpl2</bpmn2:outgoing>
@@ -595,6 +569,8 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script>
         <camunda:out source="vgmuxLanIP" target="vgmuxLanIP" />
         <camunda:in source="allottedResourceTypeTXC" target="allottedResourceType" />
         <camunda:in source="brgWanMacAddress" target="brgWanMacAddress" />
+        <camunda:in source="globalCustomerId" target="globalCustomerId" />
+        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_16qob4p</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1cgpklo</bpmn2:outgoing>
@@ -616,6 +592,42 @@ def CreateVcpeResCustService= new CreateVcpeResCustService()
 CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0k5vcuu" sourceRef="ScriptTask_18w0jud" targetRef="ExclusiveGateway_1hlbkue" />
+    <bpmn2:callActivity id="CallActivity_0xt1l8t" name="Call Create BRG Allotted Resource&#10;" calledElement="DoCreateAllottedResourceBRG">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="disableRollback" target="disableRollback" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="failExists" target="failExists" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="parentServiceInstanceIdBRG" target="parentServiceInstanceId" />
+        <camunda:in source="allottedResourceIdBRG" target="allottedResourceId" />
+        <camunda:in source="allottedResourceModelInfoBRG" target="allottedResourceModelInfo" />
+        <camunda:in source="allottedResourceRoleBRG" target="allottedResourceRole" />
+        <camunda:out source="rollbackData" target="DCARBRG_rollbackData" />
+        <camunda:out source="rolledBack" target="rolledBack" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="allottedResourceId" target="DCARBRG_allottedResourceId" />
+        <camunda:out source="allottedResourceName" target="DCARBRG_allottedResourceName" />
+        <camunda:in source="allottedResourceTypeBRG" target="allottedResourceType" />
+        <camunda:in source="vni" target="vni" />
+        <camunda:in source="vgmuxBearerIP" target="vgmuxBearerIP" />
+        <camunda:in source="brgWanMacAddress" target="brgWanMacAddress" />
+        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
+        <camunda:in source="globalCustomerId" target="globalCustomerId" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0b5ztoe</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0e9e6fo</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_0e9e6fo" sourceRef="CallActivity_0xt1l8t" targetRef="ExclusiveGateway_0jqgskx" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1x88t9v" name="Await AAI Distribution&#10;&#10;">
+      <bpmn2:incoming>SequenceFlow_0sjpja4</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1db0ri1</bpmn2:outgoing>
+      <bpmn2:timerEventDefinition>
+        <bpmn2:timeDuration xsi:type="bpmn2:tFormalExpression">${aaiDistDelay}</bpmn2:timeDuration>
+      </bpmn2:timerEventDefinition>
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_0sjpja4" sourceRef="updateInfraRequest" targetRef="IntermediateCatchEvent_1x88t9v" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1db0ri1" sourceRef="IntermediateCatchEvent_1x88t9v" targetRef="IntermediateThrowEvent_1as6hoa" />
   </bpmn2:process>
   <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
@@ -913,13 +925,6 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script>
       <bpmndi:BPMNShape id="ServiceTask_16yhzej_di" bpmnElement="updateInfraRequest">
         <dc:Bounds x="794" y="543" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_13uceka_di" bpmnElement="SequenceFlow_13uceka">
-        <di:waypoint xsi:type="dc:Point" x="894" y="583" />
-        <di:waypoint xsi:type="dc:Point" x="1053" y="583" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="974" y="568" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1qd3uwb_di" bpmnElement="ScriptTask_1qd3uwb">
         <dc:Bounds x="623" y="543" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -1143,9 +1148,9 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1as6hoa_di" bpmnElement="IntermediateThrowEvent_1as6hoa">
-        <dc:Bounds x="1056" y="565" width="36" height="36" />
+        <dc:Bounds x="1027" y="666" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="606" width="72" height="24" />
+          <dc:Bounds x="1002" y="707" width="85" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_15odbkz_di" bpmnElement="SequenceFlow_15odbkz">
@@ -1261,9 +1266,6 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script>
           <dc:Bounds x="515" y="1317" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_0xt1l8t_di" bpmnElement="CallActivity_0xt1l8t">
-        <dc:Bounds x="400" y="1151" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0hwsm6n_di" bpmnElement="SequenceFlow_0hwsm6n">
         <di:waypoint xsi:type="dc:Point" x="585" y="1292" />
         <di:waypoint xsi:type="dc:Point" x="628" y="1292" />
@@ -1287,15 +1289,7 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script>
         <di:waypoint xsi:type="dc:Point" x="337" y="1191" />
         <di:waypoint xsi:type="dc:Point" x="395" y="1191" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="353" y="1216.4242424242425" width="21" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0e9e6fo_di" bpmnElement="SequenceFlow_0e9e6fo">
-        <di:waypoint xsi:type="dc:Point" x="500" y="1191" />
-        <di:waypoint xsi:type="dc:Point" x="560" y="1191" />
-        <di:waypoint xsi:type="dc:Point" x="560" y="1267" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="485" y="1166" width="0" height="12" />
+          <dc:Bounds x="354" y="1216" width="19" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_05epj75_di" bpmnElement="ScriptTask_05epj75">
@@ -1500,6 +1494,37 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script>
           <dc:Bounds x="883" y="961" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0xt1l8t_di" bpmnElement="CallActivity_0xt1l8t">
+        <dc:Bounds x="400" y="1151" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0e9e6fo_di" bpmnElement="SequenceFlow_0e9e6fo">
+        <di:waypoint xsi:type="dc:Point" x="500" y="1191" />
+        <di:waypoint xsi:type="dc:Point" x="560" y="1191" />
+        <di:waypoint xsi:type="dc:Point" x="560" y="1267" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="440" y="1166" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_1x88t9v_di" bpmnElement="IntermediateCatchEvent_1x88t9v">
+        <dc:Bounds x="1027" y="565" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1018" y="530" width="54" height="48" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0sjpja4_di" bpmnElement="SequenceFlow_0sjpja4">
+        <di:waypoint xsi:type="dc:Point" x="894" y="583" />
+        <di:waypoint xsi:type="dc:Point" x="1027" y="583" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="960.5" y="562" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1db0ri1_di" bpmnElement="SequenceFlow_1db0ri1">
+        <di:waypoint xsi:type="dc:Point" x="1045" y="601" />
+        <di:waypoint xsi:type="dc:Point" x="1045" y="666" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1060" y="627.5" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
index 72c275380f..84ab4177e2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
@@ -70,7 +70,7 @@ createVfModule.prepareUpdateInfraRequest(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
                 <camunda:entry key="content-type">application/soap+xml</camunda:entry>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn
index ec4afa4ea4..111b6c7032 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn
@@ -200,7 +200,7 @@ createVfModuleVolumeInfraV1.executeMethod('postProcessResponse', execution, isDe
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="payload">${CVMVINFRAV1_createDBRequest}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn
index f24acb4a51..2983589699 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn
@@ -34,8 +34,10 @@ ex.processJavaException(execution)]]></bpmn:script>
         <camunda:in source="serviceInputParams" target="serviceInputParams" />
         <camunda:in source="failIfExists" target="failIfExists" />
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
-        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
+        <camunda:in source="serviceType" target="serviceType" />
         <camunda:in sourceExpression="1610" target="sdncVersion" />
+        <camunda:in source="operationId" target="operationId" />
+        <camunda:in source="operationType" target="operationType" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0zf2qyk</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_07hrbs0</bpmn:outgoing>
@@ -137,7 +139,7 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
   </bpmn:process>
   <bpmn:error id="Error_1erlsmy" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteCustomE2EServiceInstance">
       <bpmndi:BPMNShape id="StartEvent_00m8zen_di" bpmnElement="StartEvent_00m8zen">
         <dc:Bounds x="577" y="209" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -148,99 +150,95 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
         <dc:Bounds x="834" y="660" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1vyx9hu_di" bpmnElement="CallActivity_1vyx9hu">
-        <dc:Bounds x="1121" y="187" width="100" height="80" />
+        <dc:Bounds x="1159" y="187" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0db8bs6_di" bpmnElement="EndEvent_0db8bs6">
-        <dc:Bounds x="1646" y="304" width="36" height="36" />
+        <dc:Bounds x="1686" y="304" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1657" y="340" width="19" height="12" />
+          <dc:Bounds x="1696" y="340" width="22" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0a63hms_di" bpmnElement="ScriptTask_0a63hms">
-        <dc:Bounds x="741" y="187" width="100" height="80" />
+        <dc:Bounds x="724" y="187" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1fzpbop_di" bpmnElement="ScriptTask_1fzpbop">
-        <dc:Bounds x="1453" y="187" width="100" height="80" />
+        <dc:Bounds x="1493" y="187" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1wx4ihe_di" bpmnElement="CallActivity_1wx4ihe">
-        <dc:Bounds x="1614" y="187" width="100" height="80" />
+        <dc:Bounds x="1654" y="187" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_1vbcima_di" bpmnElement="SubProcess_1vbcima" isExpanded="true">
         <dc:Bounds x="736" y="374" width="679" height="194" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1mao77y_di" bpmnElement="ScriptTask_1mao77y">
-        <dc:Bounds x="920" y="187" width="100" height="80" />
+        <dc:Bounds x="936" y="187" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0vu8gx6_di" bpmnElement="ExclusiveGateway_0vu8gx6" isMarkerVisible="true">
-        <dc:Bounds x="1318" y="202" width="50" height="50" />
+        <dc:Bounds x="1358" y="202" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1318" y="174" width="49" height="12" />
+          <dc:Bounds x="1358" y="174" width="50" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1i1g9s6_di" bpmnElement="EndEvent_1i1g9s6">
-        <dc:Bounds x="1325" y="304" width="36" height="36" />
+        <dc:Bounds x="1365" y="304" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1298" y="340" width="0" height="12" />
+          <dc:Bounds x="1293" y="340" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wxumid_di" bpmnElement="SequenceFlow_1wxumid">
         <di:waypoint xsi:type="dc:Point" x="613" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="741" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="724" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="587" y="212" width="90" height="12" />
+          <dc:Bounds x="623.5" y="206" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0zf2qyk_di" bpmnElement="SequenceFlow_0zf2qyk">
-        <di:waypoint xsi:type="dc:Point" x="1020" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1073" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1073" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1121" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1036" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1159" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1043" y="227" width="0" height="12" />
+          <dc:Bounds x="1052.5" y="206" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_07hrbs0_di" bpmnElement="SequenceFlow_07hrbs0">
-        <di:waypoint xsi:type="dc:Point" x="1221" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1318" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1259" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1358" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1225.5" y="212" width="0" height="12" />
+          <dc:Bounds x="1263.5" y="206" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ab5l2q_di" bpmnElement="SequenceFlow_1ab5l2q">
-        <di:waypoint xsi:type="dc:Point" x="1664" y="267" />
-        <di:waypoint xsi:type="dc:Point" x="1664" y="304" />
+        <di:waypoint xsi:type="dc:Point" x="1704" y="267" />
+        <di:waypoint xsi:type="dc:Point" x="1704" y="304" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1634" y="279.5" width="90" height="12" />
+          <dc:Bounds x="1674" y="280" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yowshs_di" bpmnElement="SequenceFlow_0yowshs">
-        <di:waypoint xsi:type="dc:Point" x="841" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="920" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="824" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="835.5" y="206" width="90" height="12" />
+          <dc:Bounds x="835" y="206" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_04urx2e_di" bpmnElement="SequenceFlow_04urx2e">
-        <di:waypoint xsi:type="dc:Point" x="1368" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1453" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1408" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1493" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1370.25" y="203" width="18" height="12" />
+          <dc:Bounds x="1410" y="203" width="20" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ii935p_di" bpmnElement="SequenceFlow_1ii935p">
-        <di:waypoint xsi:type="dc:Point" x="1553" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1614" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1593" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1654" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1495" y="212" width="90" height="12" />
+          <dc:Bounds x="1535" y="212" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1t6ekab_di" bpmnElement="SequenceFlow_1t6ekab">
-        <di:waypoint xsi:type="dc:Point" x="1343" y="252" />
-        <di:waypoint xsi:type="dc:Point" x="1343" y="277" />
-        <di:waypoint xsi:type="dc:Point" x="1343" y="277" />
-        <di:waypoint xsi:type="dc:Point" x="1343" y="304" />
+        <di:waypoint xsi:type="dc:Point" x="1383" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="1383" y="304" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1352" y="277" width="12" height="12" />
+          <dc:Bounds x="1391" y="277" width="15" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1c6ogpt_di" bpmnElement="ScriptTask_1c6ogpt">
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn
index 079599d7ca..3b5c629182 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn
@@ -116,7 +116,7 @@ DeleteNetworkInstance.prepareDBRequestError(execution)]]></bpmn2:script>
         <bpmn2:extensionElements>
           <camunda:connector>
             <camunda:inputOutput>
-              <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+              <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
               <camunda:inputParameter name="payload">${DELNI_deleteDBRequest}</camunda:inputParameter>
               <camunda:inputParameter name="headers">
                 <camunda:map>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn
index 38e1d43910..88c45afda2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn
@@ -253,6 +253,7 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]></bpmn2:script>
         <camunda:out source="rolledBack" target="rolledBack" />
         <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
         <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="cloudConfiguration" target="cloudConfiguration" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_128485i</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_04fys47</bpmn2:outgoing>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn
index a687d5df87..e19ea1bd86 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn
@@ -79,7 +79,7 @@ dvfm.completionHandlerPrep(execution, 'DELVfModI_CompletionHandlerRequest')
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
index 21f74a2a29..c7092ffb30 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
@@ -198,7 +198,7 @@ execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]></bpmn2
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="payload">${DELVfModVol_updateInfraRequest}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn
index 7e54b805e1..a9d81d05bc 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn
@@ -116,7 +116,7 @@ UpdateNetworkInstance.prepareDBRequestError(execution)]]></bpmn2:script>
         <bpmn2:extensionElements>
           <camunda:connector>
             <camunda:inputOutput>
-              <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+              <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
               <camunda:inputParameter name="payload">${UPDNI_createDBRequest}</camunda:inputParameter>
               <camunda:inputParameter name="headers">
                 <camunda:map>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
index 15b5bc7fcf..7e5f41ba26 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
@@ -21,7 +21,7 @@
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="payload">${UPDVfModVol_updateInfraRequest}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn
index a35371e97c..b925b007cd 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.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="_DkzPAHB4EeaJwpcpVN5gXw" 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="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateAllottedResourceBRG" name="DoCreateAllottedResourceBRG" isExecutable="true">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -180,7 +180,7 @@ dcar.validateSDNCResp(execution, response, "activate" )]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_0q1hz2p</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_1iy3cqb" sourceRef="postProcessSDNCGetResponse" targetRef="generateOutputs" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1dgzhsm" sourceRef="UpdateAAIARActive" targetRef="PreProcessSDNCGet" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1dgzhsm" sourceRef="UpdateAAIARActive" targetRef="IntermediateCatchEvent_1f4tse6" />
     <bpmn2:callActivity id="GetAAIParentSI" name="Get AAI  Parent ServiceInstance&#10;" calledElement="GenericGetService">
       <bpmn2:extensionElements>
         <camunda:in source="parentServiceInstanceId" target="GENGS_serviceInstanceId" />
@@ -277,8 +277,8 @@ DoCreateAllottedResourceBRG dcar = new DoCreateAllottedResourceBRG()
 dcar.updateAaiAROrchStatus(execution, "Created")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="PreProcessSDNCGet" name="PreProcess SDNC Get" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1dgzhsm</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0z8luou</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0ec9eiq</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_030mhcm</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.*
 DoCreateAllottedResourceBRG dcar = new DoCreateAllottedResourceBRG()
@@ -326,6 +326,14 @@ DoCreateAllottedResourceBRG dcar = new DoCreateAllottedResourceBRG()
 dcar.generateOutputs(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_09xwplc" sourceRef="generateOutputs" targetRef="EndEvent_3" />
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1f4tse6" name="Await SDNC Replication&#10;&#10;">
+      <bpmn2:incoming>SequenceFlow_1dgzhsm</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0ec9eiq</bpmn2:outgoing>
+      <bpmn2:timerEventDefinition>
+        <bpmn2:timeDuration xsi:type="bpmn2:tFormalExpression">${sdncReplDelay}</bpmn2:timeDuration>
+      </bpmn2:timerEventDefinition>
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_0ec9eiq" sourceRef="IntermediateCatchEvent_1f4tse6" targetRef="PreProcessSDNCGet" />
   </bpmn2:process>
   <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
   <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
@@ -532,10 +540,9 @@ dcar.generateOutputs(execution)]]></bpmn2:script>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1dgzhsm_di" bpmnElement="SequenceFlow_1dgzhsm">
         <di:waypoint xsi:type="dc:Point" x="964" y="624" />
-        <di:waypoint xsi:type="dc:Point" x="964" y="545" />
-        <di:waypoint xsi:type="dc:Point" x="1140" y="545" />
+        <di:waypoint xsi:type="dc:Point" x="964" y="563" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="979" y="584.5" width="0" height="0" />
+          <dc:Bounds x="934" y="593.5" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0e73um9_di" bpmnElement="GetAAIParentSI">
@@ -730,6 +737,19 @@ dcar.generateOutputs(execution)]]></bpmn2:script>
           <dc:Bounds x="575" y="980" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_1f4tse6_di" bpmnElement="IntermediateCatchEvent_1f4tse6">
+        <dc:Bounds x="946" y="527" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="933" y="492" width="61" height="48" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0ec9eiq_di" bpmnElement="SequenceFlow_0ec9eiq">
+        <di:waypoint xsi:type="dc:Point" x="982" y="545" />
+        <di:waypoint xsi:type="dc:Point" x="1140" y="545" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1061" y="524" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn
index 178534f797..a240bb5ffa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.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="_DkzPAHB4EeaJwpcpVN5gXw" 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="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateAllottedResourceTXC" name="DoCreateAllottedResourceTXC" isExecutable="true">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -180,7 +180,6 @@ dcar.validateSDNCResp(execution, response, "activate" )]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_0q1hz2p</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_1iy3cqb" sourceRef="postProcessSDNCGetResponse" targetRef="generateOutputs" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1dgzhsm" sourceRef="UpdateAAIARActive" targetRef="PreProcessSDNCGet" />
     <bpmn2:callActivity id="GetAAIParentSI" name="Get AAI  Parent ServiceInstance&#10;" calledElement="GenericGetService">
       <bpmn2:extensionElements>
         <camunda:in source="parentServiceInstanceId" target="GENGS_serviceInstanceId" />
@@ -262,7 +261,7 @@ dcar.postProcessRollback(execution)]]></bpmn2:script>
     </bpmn2:subProcess>
     <bpmn2:scriptTask id="UpdateAAIARActive" name="Update AAI AR Active" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_00i7x43</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1dgzhsm</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_07kxd8t</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.*
 
 DoCreateAllottedResourceTXC dcar = new DoCreateAllottedResourceTXC()
@@ -277,8 +276,8 @@ DoCreateAllottedResourceTXC dcar = new DoCreateAllottedResourceTXC()
 dcar.updateAaiAROrchStatus(execution, "Created")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="PreProcessSDNCGet" name="PreProcess SDNC Get" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1dgzhsm</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0z8luou</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_08hhqb2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_030mhcm</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.*
 DoCreateAllottedResourceTXC dcar = new DoCreateAllottedResourceTXC()
@@ -326,6 +325,15 @@ DoCreateAllottedResourceTXC dcar = new DoCreateAllottedResourceTXC()
 dcar.generateOutputs(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_09xwplc" sourceRef="generateOutputs" targetRef="EndEvent_3" />
+    <bpmn2:sequenceFlow id="SequenceFlow_07kxd8t" sourceRef="UpdateAAIARActive" targetRef="IntermediateThrowEvent_0ti2fv8" />
+    <bpmn2:intermediateCatchEvent id="IntermediateThrowEvent_0ti2fv8" name="Await SDNC Replication&#10;&#10;">
+      <bpmn2:incoming>SequenceFlow_07kxd8t</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_08hhqb2</bpmn2:outgoing>
+      <bpmn2:timerEventDefinition>
+        <bpmn2:timeDuration xsi:type="bpmn2:tFormalExpression">${sdncReplDelay}</bpmn2:timeDuration>
+      </bpmn2:timerEventDefinition>
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_08hhqb2" sourceRef="IntermediateThrowEvent_0ti2fv8" targetRef="PreProcessSDNCGet" />
   </bpmn2:process>
   <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
   <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
@@ -530,14 +538,6 @@ dcar.generateOutputs(execution)]]></bpmn2:script>
           <dc:Bounds x="1277" y="779" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1dgzhsm_di" bpmnElement="SequenceFlow_1dgzhsm">
-        <di:waypoint xsi:type="dc:Point" x="964" y="624" />
-        <di:waypoint xsi:type="dc:Point" x="964" y="545" />
-        <di:waypoint xsi:type="dc:Point" x="1140" y="545" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="979" y="584.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0e73um9_di" bpmnElement="GetAAIParentSI">
         <dc:Bounds x="843" y="199" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -730,6 +730,26 @@ dcar.generateOutputs(execution)]]></bpmn2:script>
           <dc:Bounds x="575" y="980" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_07kxd8t_di" bpmnElement="SequenceFlow_07kxd8t">
+        <di:waypoint xsi:type="dc:Point" x="964" y="624" />
+        <di:waypoint xsi:type="dc:Point" x="964" y="563" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="979" y="587.5" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_038xgwf_di" bpmnElement="IntermediateThrowEvent_0ti2fv8">
+        <dc:Bounds x="946" y="527" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="933" y="492" width="61" height="48" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_08hhqb2_di" bpmnElement="SequenceFlow_08hhqb2">
+        <di:waypoint xsi:type="dc:Point" x="982" y="545" />
+        <di:waypoint xsi:type="dc:Point" x="1140" y="545" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1061" y="524" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
index 109cf69b92..2fbb898f7b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
@@ -5,14 +5,6 @@
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />
-    <bpmn2:scriptTask id="getAAICustomerById_scriptTask" name="Get AAI Customer By globalCustomerId " scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateE2EServiceInstance()
-dcsi.getAAICustomerById(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="ExclusiveGateway_09wkav2" />
     <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
@@ -22,7 +14,7 @@ dcsi.preProcessRequest(execution)
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="CustomE2EGetService" targetRef="ScriptTask_0i8cqdy" />
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="getAAICustomerById_scriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="CustomE2EGetService" />
     <bpmn2:callActivity id="CustomE2EGetService" name="Call Custom E2E Get Service" calledElement="CustomE2EGetService">
       <bpmn2:extensionElements>
         <camunda:in source="serviceInstanceName" target="GENGS_serviceInstanceName" />
@@ -31,35 +23,26 @@ dcsi.preProcessRequest(execution)
         <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
         <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="serviceType" target="GENGS_serviceType" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:callActivity id="CustomE2EPutService" name="Call Custom E2E Put Service" calledElement="CustomE2EPutService">
       <bpmn2:extensionElements>
         <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" />
         <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" />
-        <camunda:in source="subscriptionServiceType" target="GENPS_serviceType" />
+        <camunda:in source="serviceType" target="GENPS_serviceType" />
         <camunda:in sourceExpression="service-instance" target="GENPS_type" />
         <camunda:in source="serviceInstanceData" target="GENPS_payload" />
         <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" />
         <camunda:in source="msoRequestId" target="GENPS_requesId" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1w01tqs</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_129ih1g</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:sequenceFlow id="SequenceFlow_129ih1g" sourceRef="CustomE2EPutService" targetRef="ScriptTask_0q37vn9" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="sdncVersion is 1610 or serviceInstance name is populated?" default="SequenceFlow_1uw2p9a">
-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="CustomE2EGetService">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("serviceInstanceName" )  != null && execution.getVariable("serviceInstanceName" )  != "" ) || execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="CustomE2EPutService" />
     <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true">
       <bpmn2:startEvent id="StartEvent_0yljq9y">
         <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>
@@ -100,17 +83,6 @@ dcsi.postProcessRollback(execution)
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_1xzgv5k" sourceRef="ScriptTask_1p0vyip" targetRef="EndEvent_117lkk3" />
     </bpmn2:subProcess>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nk6aol" name="sdncVersion is 1610?">
-      <bpmn2:incoming>SequenceFlow_1dd86x8</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_00v4npo</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1170ztf</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:endEvent id="EndEvent_10659gr">
-      <bpmn2:incoming>SequenceFlow_00v4npo</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_00v4npo" name="yes" sourceRef="ExclusiveGateway_1nk6aol" targetRef="EndEvent_10659gr">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion" ) == "1610"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
     <bpmn2:scriptTask id="ScriptTask_0i8cqdy" name="Post Process AAI GET" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1w01tqs</bpmn2:outgoing>
@@ -121,27 +93,26 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_1w01tqs" sourceRef="ScriptTask_0i8cqdy" targetRef="CustomE2EPutService" />
     <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_129ih1g</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1dd86x8</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_03fabby</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def ddsi = new DoCreateE2EServiceInstance()
 ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" />
     <bpmn2:scriptTask id="ScriptTask_0081lne" name="Prepare  Resource Requst For overlay" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1pjr82f</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ofqw6v</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-String nsName = "overlay"
+execution.setVariable("resourceType", "overlay")
 def csi = new  DoCreateE2EServiceInstance()
-csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
+csi.preResourceRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_0wvq4t8" name="Prepare Resource Request for vEPC" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_05gdjox</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15zgrcq</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-String resourceName= "vEPC"
+execution.setVariable("resourceType", "vEPC")
 def csi = new  DoCreateE2EServiceInstance()
-csi.preResourceRequest(execution, resourceName)]]></bpmn2:script>
+csi.preResourceRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="CallActivity_0uwm4l1" name="Call DoCreateVFCNetworkServiceInstance For vEPC" calledElement="DoCreateVFCNetworkServiceInstance">
       <bpmn2:extensionElements>
@@ -170,14 +141,13 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_15zgrcq" sourceRef="ScriptTask_0wvq4t8" targetRef="CallActivity_0uwm4l1" />
     <bpmn2:sequenceFlow id="SequenceFlow_1vvdkcs" sourceRef="CallActivity_09c3ajg" targetRef="ScriptTask_1xdjlzm" />
     <bpmn2:sequenceFlow id="SequenceFlow_092ghvu" sourceRef="ScriptTask_1xdjlzm" targetRef="EndEvent_0kbbt94" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1170ztf" sourceRef="ExclusiveGateway_1nk6aol" targetRef="Task_0uiekmn" />
     <bpmn2:endEvent id="EndEvent_0kbbt94">
       <bpmn2:incoming>SequenceFlow_092ghvu</bpmn2:incoming>
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_0k4q7jm" sourceRef="CallActivity_0uwm4l1" targetRef="Task_0aidjmp" />
     <bpmn2:sequenceFlow id="SequenceFlow_1qctzm0" sourceRef="Task_0uiekmn" targetRef="Task_0raqlqc" />
-    <bpmn2:scriptTask id="Task_0uiekmn" name="Prepare Resource Oper Status">
-      <bpmn2:incoming>SequenceFlow_1170ztf</bpmn2:incoming>
+    <bpmn2:scriptTask id="Task_0uiekmn" name="Prepare Resource Oper Status" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_03fabby</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1qctzm0</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def ddsi = new DoCreateE2EServiceInstance()
@@ -188,11 +158,11 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${CVFMI_dbAdapterEndpoint}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
                 <camunda:entry key="content-type">application/soap+xml</camunda:entry>
-                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
+                <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry>
               </camunda:map>
             </camunda:inputParameter>
             <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter>
@@ -211,9 +181,9 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_0k4q7jm</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ua1bbk</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-String nsName = "vIMS"
+execution.setVariable("resourceType", "vIMS")
 def csi = new  DoCreateE2EServiceInstance()
-csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
+csi.preResourceRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1hgiln0" sourceRef="Task_03n6y9h" targetRef="Task_0io5qby" />
     <bpmn2:callActivity id="Task_03n6y9h" name="Call DoCreateVFCNetworkServiceInstance For vIMS" calledElement="DoCreateVFCNetworkServiceInstance">
@@ -239,13 +209,13 @@ csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
     </bpmn2:serviceTask>
     <bpmn2:sequenceFlow id="SequenceFlow_17i1ors" sourceRef="Task_0pkhzoj" targetRef="Task_0gs55f1" />
     <bpmn2:sequenceFlow id="SequenceFlow_1pjr82f" sourceRef="Task_0gs55f1" targetRef="ScriptTask_0081lne" />
-    <bpmn2:scriptTask id="Task_0pkhzoj" name="Prepare Resource Request For underlay">
+    <bpmn2:scriptTask id="Task_0pkhzoj" name="Prepare Resource Request For underlay" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1vo0235</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_17i1ors</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-String nsName = "underlay"
+execution.setVariable("resourceType", "underlay")
 def csi = new  DoCreateE2EServiceInstance()
-csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
+csi.preResourceRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:serviceTask id="Task_0gs55f1" name="Call Underlay Create" camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncNetworkTopologyOperationTask">
       <bpmn2:incoming>SequenceFlow_17i1ors</bpmn2:incoming>
@@ -255,53 +225,44 @@ csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_0ofqw6v</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1vvdkcs</bpmn2:outgoing>
     </bpmn2:serviceTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_03fabby" sourceRef="ScriptTask_0q37vn9" targetRef="Task_0uiekmn" />
   </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="DoCreateE2EServiceInstance">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">
-        <dc:Bounds x="152" y="79" width="36" height="36" />
+        <dc:Bounds x="34" y="79" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="147" y="120" width="48" height="14" />
+          <dc:Bounds x="28" y="120" width="50" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
         <dc:Bounds x="245" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
-        <di:waypoint xsi:type="dc:Point" x="188" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="70" y="97" />
         <di:waypoint xsi:type="dc:Point" x="245" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="217" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="getAAICustomerById_scriptTask">
-        <dc:Bounds x="393" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_62">
-        <di:waypoint xsi:type="dc:Point" x="493" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="565" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="529" y="82" width="0" height="0" />
+          <dc:Bounds x="112.5" y="82" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_4">
-        <di:waypoint xsi:type="dc:Point" x="839" y="94" />
+        <di:waypoint xsi:type="dc:Point" x="626" y="94" />
         <di:waypoint xsi:type="dc:Point" x="971" y="94" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="905" y="79" width="0" height="0" />
+          <dc:Bounds x="753.5" y="79" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_62">
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="CallActivity_1md4kyb_di">
         <di:waypoint xsi:type="dc:Point" x="345" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="393" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="526" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="369" y="82" width="0" height="0" />
+          <dc:Bounds x="390.5" y="82" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="CustomE2EGetService">
-        <dc:Bounds x="739" y="57" width="100" height="80" />
+        <dc:Bounds x="526" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="CustomE2EPutService">
         <dc:Bounds x="972" y="206" width="100" height="80" />
@@ -313,27 +274,6 @@ csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
           <dc:Bounds x="1023" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">
-        <dc:Bounds x="565" y="72" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="547" y="7" width="81" height="62" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">
-        <di:waypoint xsi:type="dc:Point" x="615" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="739" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="635" y="76" width="18" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">
-        <di:waypoint xsi:type="dc:Point" x="590" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="590" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="972" y="246" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="594" y="132.89706349694825" width="12" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">
         <dc:Bounds x="-155" y="387" width="783" height="195" />
       </bpmndi:BPMNShape>
@@ -366,47 +306,19 @@ csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
           <dc:Bounds x="-18" y="467" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true">
-        <dc:Bounds x="997" y="460" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="905" y="472" width="72" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_10659gr_di" bpmnElement="EndEvent_10659gr">
-        <dc:Bounds x="1103" y="467" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1121" y="508" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_00v4npo_di" bpmnElement="SequenceFlow_00v4npo">
-        <di:waypoint xsi:type="dc:Point" x="1047" y="485" />
-        <di:waypoint xsi:type="dc:Point" x="1103" y="485" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1063" y="461" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0i8cqdy_di" bpmnElement="ScriptTask_0i8cqdy">
         <dc:Bounds x="971" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1w01tqs_di" bpmnElement="SequenceFlow_1w01tqs">
         <di:waypoint xsi:type="dc:Point" x="1021" y="137" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />
         <di:waypoint xsi:type="dc:Point" x="1021" y="206" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1036" y="172" width="0" height="0" />
+          <dc:Bounds x="991" y="171.5" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9">
         <dc:Bounds x="972" y="336" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1dd86x8_di" bpmnElement="SequenceFlow_1dd86x8">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="416" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="460" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="438" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux">
         <dc:Bounds x="76" y="442" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -469,13 +381,6 @@ csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
           <dc:Bounds x="-809" y="838" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1170ztf_di" bpmnElement="SequenceFlow_1170ztf">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="588" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="992" y="543" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_01p249c_di" bpmnElement="EndEvent_0kbbt94">
         <dc:Bounds x="-823" y="841" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -563,6 +468,13 @@ csi.preResourceRequest(execution, nsName)]]></bpmn2:script>
       <bpmndi:BPMNShape id="ServiceTask_1cnnn5b_di" bpmnElement="CallActivity_09c3ajg">
         <dc:Bounds x="-578" y="819" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_03fabby_di" bpmnElement="SequenceFlow_03fabby">
+        <di:waypoint xsi:type="dc:Point" x="1022" y="416" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="588" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1037" y="496" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
index 58eb1f04f2..67b0f968fa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
@@ -34,10 +34,10 @@ dcsi.instantiateNetworkService(execution)]]></bpmn:script>
       <bpmn:outgoing>createNSFailed_SequenceFlow</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="createNSSuccess_SequenceFlow" name="yes" sourceRef="ExclusiveGateway_0zfksms" targetRef="instantiate_NSTask">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("nsInstanceName" )  != null && execution.getVariable("nsInstanceName" )  != "" )}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("nsInstanceId" )  != null && execution.getVariable("nsInstanceId" )  != "" )}]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="createNSFailed_SequenceFlow" name="no" sourceRef="ExclusiveGateway_0zfksms" targetRef="createNSFailed_EndEvent">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("nsInstanceName" )  == null || execution.getVariable("nsInstanceName" )  == "" )}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("nsInstanceId" )  == null || execution.getVariable("nsInstanceId" )  == "" )}]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:exclusiveGateway id="ExclusiveGateway_1is7zys" name="Instantiate NS Success?">
       <bpmn:incoming>SequenceFlow_1ywe21t</bpmn:incoming>
@@ -80,12 +80,12 @@ dcsi.instantiateNetworkService(execution)]]></bpmn:script>
 def dcsi = new DoCreateVFCNetworkServiceInstance()
 dcsi.queryNSProgress(execution)]]></bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:scriptTask id="finishNSCreate_Task" name="Finish NS Create">
+    <bpmn:scriptTask id="finishNSCreate_Task" name="Add NS RelationShip" scriptFormat="groovy">
       <bpmn:incoming>operationFinished_SequenceFlow</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0cq2q6g</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def dcsi = new DoCreateVFCNetworkServiceInstance()
-dcsi.finishNSCreate(execution)]]></bpmn:script>
+dcsi.addNSRelationship(execution)]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_0xqo13p" sourceRef="queryJob_Task" targetRef="ExclusiveGateway_15492gl" />
     <bpmn:scriptTask id="timeDelay_Task" name="timeDelay" scriptFormat="groovy">
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
index 91f5404c9b..10e49a198b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
@@ -18,7 +18,7 @@ ddsi.preProcessRequest(execution)
     <bpmn:callActivity id="CallActivity_06izbke" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">
       <bpmn:extensionElements>
         <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />
-        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />
+        <camunda:in source="serviceType" target="GENDS_serviceType" />
         <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />
         <camunda:in sourceExpression="service-instance" target="GENDS_type" />
         <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />
@@ -26,38 +26,11 @@ ddsi.preProcessRequest(execution)
         <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />
         <camunda:out source="WorkflowException" target="WorkflowExcpeton" />
       </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_0uhpfcl</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_0vg4q7x</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0g6bxqw</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_0c6gz3v" name="SI found in AAI" default="SequenceFlow_0g20hqr">
-      <bpmn:incoming>SequenceFlow_0vi0sv6</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1pcmc9e</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_0g20hqr</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:endEvent id="EndEvent_0123yz3">
-      <bpmn:incoming>SequenceFlow_0g20hqr</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_0veiutm" name="sdncVersion is 1610 ">
-      <bpmn:incoming>SequenceFlow_1pcmc9e</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1av166w</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_0uhpfcl</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:callActivity id="CallActivity_0x2ulh3" name="Call AAI Generic GetService" calledElement="GenericGetService">
-      <bpmn:extensionElements>
-        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />
-        <camunda:in sourceExpression="service-instance" target="GENGS_type" />
-        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
-        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />
-        <camunda:out source="GENGS_service" target="GENGS_service" />
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_11e6bfy</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0sj8yc8</bpmn:outgoing>
-    </bpmn:callActivity>
     <bpmn:scriptTask id="ScriptTask_1rtnsh8" name="Post Process AAI GET" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_0sj8yc8</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_188ejvu</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0vi0sv6</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def ddsi = new DoCustomDeleteE2EServiceInstance()
@@ -89,30 +62,24 @@ ex.processJavaException(execution)]]></bpmn:script>
       <bpmn:sequenceFlow id="SequenceFlow_18vlzfo" name="" sourceRef="ScriptTask_0nha3pr" targetRef="EndEvent_06utmg4" />
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="SequenceFlow_0vz7cd9" sourceRef="StartEvent_0212h2r" targetRef="ScriptTask_06phzgv" />
-    <bpmn:sequenceFlow id="SequenceFlow_11e6bfy" sourceRef="ScriptTask_06phzgv" targetRef="CallActivity_0x2ulh3" />
+    <bpmn:sequenceFlow id="SequenceFlow_11e6bfy" sourceRef="ScriptTask_06phzgv" targetRef="CallActivity_076pc2z" />
     <bpmn:sequenceFlow id="SequenceFlow_0e7inkl" sourceRef="ScriptTask_01erufg" targetRef="EndEvent_1uqzt26" />
     <bpmn:sequenceFlow id="SequenceFlow_0g6bxqw" sourceRef="CallActivity_06izbke" targetRef="ScriptTask_01erufg" />
-    <bpmn:sequenceFlow id="SequenceFlow_0vi0sv6" sourceRef="ScriptTask_1rtnsh8" targetRef="ExclusiveGateway_0c6gz3v" />
-    <bpmn:sequenceFlow id="SequenceFlow_1pcmc9e" name="yes" sourceRef="ExclusiveGateway_0c6gz3v" targetRef="ExclusiveGateway_0veiutm">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true}]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_0g20hqr" name="no" sourceRef="ExclusiveGateway_0c6gz3v" targetRef="EndEvent_0123yz3" />
-    <bpmn:sequenceFlow id="SequenceFlow_0sj8yc8" sourceRef="CallActivity_0x2ulh3" targetRef="ScriptTask_1rtnsh8" />
-    <bpmn:callActivity id="CallActivity_Del_VFC" name="Call Network Service Delete for vEPC" calledElement="DODeleteVFCNetworkServiceInstance">
+    <bpmn:sequenceFlow id="SequenceFlow_0vi0sv6" sourceRef="ScriptTask_1rtnsh8" targetRef="ScriptTask_146jt8v" />
+    <bpmn:callActivity id="CallActivity_Del_VFC" name="Call Network Service Delete for vEPC" calledElement="DoDeleteVFCNetworkServiceInstance">
       <bpmn:extensionElements>
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
         <camunda:in source="serviceType" target="serviceType" />
-        <camunda:in source="serviceId" target="serviceId" />
+        <camunda:in source="serviceInstanceId" target="serviceId" />
         <camunda:in source="operationId" target="operationId" />
-        <camunda:in source="resouceTemplateUUID" target="resouceTemplateUUID" />
-        <camunda:in source="resouceInstanceId" target="resouceInstanceId" />
+        <camunda:in source="resourceTemplateId" target="resourceTemplateId" />
+        <camunda:in source="resourceInstanceId" target="resourceInstanceId" />
         <camunda:in source="resourceType" target="resourceType" />
         <camunda:in source="operationType" target="operationType" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1wmjau1</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0qquvgc</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:sequenceFlow id="SequenceFlow_1av166w" sourceRef="ExclusiveGateway_0veiutm" targetRef="Task_0oriv78" />
     <bpmn:sequenceFlow id="SequenceFlow_0qquvgc" sourceRef="CallActivity_Del_VFC" targetRef="ScriptTask_0mdub03" />
     <bpmn:scriptTask id="ScriptTask_0vcz9mj" name="Prepare Resource Delele For vEPC" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1931m8u</bpmn:incoming>
@@ -142,7 +109,7 @@ def ddsi = new DoCustomDeleteE2EServiceInstance()
 ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="ScriptTask_0z30dax" name="Prepare Resource Delele For Overlay" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_13sc98g</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_0l4w9nr</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1dza4q4</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 String resourceName = "overlay"
@@ -151,42 +118,9 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_1dza4q4" sourceRef="ScriptTask_0z30dax" targetRef="CallActivity_Del_SDNC_cust" />
     <bpmn:sequenceFlow id="SequenceFlow_0rpu756" sourceRef="CallActivity_Del_SDNC_cust" targetRef="Task_14erap6" />
-    <bpmn:sequenceFlow id="SequenceFlow_0uhpfcl" name="yes" sourceRef="ExclusiveGateway_0veiutm" targetRef="CallActivity_06izbke">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{ execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_030y6yz" sourceRef="Task_0oriv78" targetRef="Task_0pkgoxn" />
-    <bpmn:scriptTask id="Task_0oriv78" name="Prepare Resource Oper Status">
-      <bpmn:incoming>SequenceFlow_1av166w</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_030y6yz</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def ddsi = new DoCustomDeleteE2EServiceInstance()
-ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:serviceTask id="Task_0pkgoxn" name="Init Resource Oper Status">
-      <bpmn:extensionElements>
-        <camunda:connector>
-          <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
-            <camunda:inputParameter name="headers">
-              <camunda:map>
-                <camunda:entry key="content-type">application/soap+xml</camunda:entry>
-                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
-              </camunda:map>
-            </camunda:inputParameter>
-            <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="method">POST</camunda:inputParameter>
-            <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter>
-            <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter>
-          </camunda:inputOutput>
-          <camunda:connectorId>http-connector</camunda:connectorId>
-        </camunda:connector>
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_030y6yz</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_13sc98g</bpmn:outgoing>
-    </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_1wnkgpx" sourceRef="Task_0z1x3sg" targetRef="Task_0963dho" />
     <bpmn:sequenceFlow id="SequenceFlow_1931m8u" sourceRef="Task_0963dho" targetRef="ScriptTask_0vcz9mj" />
-    <bpmn:scriptTask id="Task_0z1x3sg" name="Prepare Resource Delele For vIMS">
+    <bpmn:scriptTask id="Task_0z1x3sg" name="Prepare Resource Delele For vIMS" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1m7tont</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1wnkgpx</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -195,15 +129,14 @@ def ddsi = new DoCustomDeleteE2EServiceInstance()
 ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_1m7tont" sourceRef="ScriptTask_1g0tsto" targetRef="Task_0z1x3sg" />
-    <bpmn:sequenceFlow id="SequenceFlow_13sc98g" sourceRef="Task_0pkgoxn" targetRef="ScriptTask_0z30dax" />
-    <bpmn:callActivity id="Task_0963dho" name="Call Network Service Delete for vIMS" calledElement="DODeleteVFCNetworkServiceInstance">
+    <bpmn:callActivity id="Task_0963dho" name="Call Network Service Delete for vIMS" calledElement="DoDeleteVFCNetworkServiceInstance">
       <bpmn:extensionElements>
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
         <camunda:in source="serviceType" target="serviceType" />
-        <camunda:in source="serviceId" target="serviceId" />
+        <camunda:in source="serviceInstanceId" target="serviceId" />
         <camunda:in source="operationId" target="operationId" />
-        <camunda:in source="resouceTemplateUUID" target="resouceTemplateUUID" />
-        <camunda:in source="resouceInstanceId" target="resouceInstanceId" />
+        <camunda:in source="resourceTemplateId" target="resourceTemplateId" />
+        <camunda:in source="resourceInstanceId" target="resourceInstanceId" />
         <camunda:in source="resourceType" target="resourceType" />
         <camunda:in source="operationType" target="operationType" />
       </bpmn:extensionElements>
@@ -218,7 +151,7 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_0d9lmlv" sourceRef="Task_14erap6" targetRef="Task_1j1u666" />
     <bpmn:sequenceFlow id="SequenceFlow_1g4djgh" sourceRef="Task_1j1u666" targetRef="Task_0edkv0m" />
     <bpmn:sequenceFlow id="SequenceFlow_0uc2beq" sourceRef="Task_0edkv0m" targetRef="ScriptTask_1g0tsto" />
-    <bpmn:scriptTask id="Task_14erap6" name="Prepare Resource Delele For Underlay">
+    <bpmn:scriptTask id="Task_14erap6" name="Prepare Resource Delele For Underlay" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0rpu756</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0d9lmlv</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -234,6 +167,53 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
       <bpmn:incoming>SequenceFlow_1g4djgh</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0uc2beq</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:scriptTask id="ScriptTask_146jt8v" name="Prepare Resource Oper Status" scriptFormat="groovy">
+      <bpmn:incoming>SequenceFlow_0vi0sv6</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1ym9otf</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddsi = new DoCustomDeleteE2EServiceInstance()
+ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:serviceTask id="ServiceTask_00tg69u" name="Init Resource Oper Status">
+      <bpmn:extensionElements>
+        <camunda:connector>
+          <camunda:inputOutput>
+            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="headers">
+              <camunda:map>
+                <camunda:entry key="content-type">application/soap+xml</camunda:entry>
+                <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry>
+              </camunda:map>
+            </camunda:inputParameter>
+            <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter>
+            <camunda:inputParameter name="method">POST</camunda:inputParameter>
+            <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter>
+            <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter>
+          </camunda:inputOutput>
+          <camunda:connectorId>http-connector</camunda:connectorId>
+        </camunda:connector>
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_1ym9otf</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0l4w9nr</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="SequenceFlow_1ym9otf" sourceRef="ScriptTask_146jt8v" targetRef="ServiceTask_00tg69u" />
+    <bpmn:sequenceFlow id="SequenceFlow_0l4w9nr" sourceRef="ServiceTask_00tg69u" targetRef="ScriptTask_0z30dax" />
+    <bpmn:callActivity id="CallActivity_076pc2z" name="Call AAI Generic GetService" calledElement="GenericGetService">
+      <bpmn:extensionElements>
+        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />
+        <camunda:in sourceExpression="service-instance" target="GENGS_type" />
+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
+        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />
+        <camunda:out source="GENGS_service" target="GENGS_service" />
+        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />
+        <camunda:in source="serviceType" target="GENGS_serviceType" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_11e6bfy</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_188ejvu</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:sequenceFlow id="SequenceFlow_188ejvu" sourceRef="CallActivity_076pc2z" targetRef="ScriptTask_1rtnsh8" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCustomDeleteE2EServiceInstance">
@@ -255,29 +235,8 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
       <bpmndi:BPMNShape id="CallActivity_06izbke_di" bpmnElement="CallActivity_06izbke">
         <dc:Bounds x="1188" y="779" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0c6gz3v_di" bpmnElement="ExclusiveGateway_0c6gz3v" isMarkerVisible="true">
-        <dc:Bounds x="-89" y="-42" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-99" y="-63" width="71" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0123yz3_di" bpmnElement="EndEvent_0123yz3">
-        <dc:Bounds x="-82" y="107" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-154" y="148" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0veiutm_di" bpmnElement="ExclusiveGateway_0veiutm" isMarkerVisible="true">
-        <dc:Bounds x="-8" y="-42" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-15" y="12" width="72" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_0x2ulh3_di" bpmnElement="CallActivity_0x2ulh3">
-        <dc:Bounds x="-382" y="-57" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1rtnsh8_di" bpmnElement="ScriptTask_1rtnsh8">
-        <dc:Bounds x="-231" y="-57" width="100" height="80" />
+        <dc:Bounds x="-193" y="-57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_01erufg_di" bpmnElement="ScriptTask_01erufg">
         <dc:Bounds x="1188" y="915" width="100" height="80" />
@@ -294,9 +253,9 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_11e6bfy_di" bpmnElement="SequenceFlow_11e6bfy">
         <di:waypoint xsi:type="dc:Point" x="-419" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="-382" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="-357" y="-17" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-445.5" y="-38" width="90" height="12" />
+          <dc:Bounds x="-433" y="-38" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0e7inkl_di" bpmnElement="SequenceFlow_0e7inkl">
@@ -314,31 +273,10 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0vi0sv6_di" bpmnElement="SequenceFlow_0vi0sv6">
-        <di:waypoint xsi:type="dc:Point" x="-131" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="-89" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="-93" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="-26" y="-17" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-155" y="-38" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1pcmc9e_di" bpmnElement="SequenceFlow_1pcmc9e">
-        <di:waypoint xsi:type="dc:Point" x="-39" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="-8" y="-17" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-21.375" y="-15" width="19" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0g20hqr_di" bpmnElement="SequenceFlow_0g20hqr">
-        <di:waypoint xsi:type="dc:Point" x="-64" y="8" />
-        <di:waypoint xsi:type="dc:Point" x="-64" y="107" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-83" y="28" width="12" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0sj8yc8_di" bpmnElement="SequenceFlow_0sj8yc8">
-        <di:waypoint xsi:type="dc:Point" x="-282" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="-231" y="-17" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-301.5" y="-38" width="90" height="12" />
+          <dc:Bounds x="-104.5" y="-38" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="StartEvent_0sf5lpt_di" bpmnElement="StartEvent_0sf5lpt">
@@ -373,13 +311,6 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
       <bpmndi:BPMNShape id="CallActivity_1x56smn_di" bpmnElement="CallActivity_Del_VFC">
         <dc:Bounds x="1188" y="483" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1av166w_di" bpmnElement="SequenceFlow_1av166w">
-        <di:waypoint xsi:type="dc:Point" x="42" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="87" y="-17" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="19.5" y="-38" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0qquvgc_di" bpmnElement="SequenceFlow_0qquvgc">
         <di:waypoint xsi:type="dc:Point" x="1238" y="563" />
         <di:waypoint xsi:type="dc:Point" x="1238" y="642" />
@@ -404,43 +335,22 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
         <dc:Bounds x="1188" y="-57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0z30dax_di" bpmnElement="ScriptTask_0z30dax">
-        <dc:Bounds x="377" y="-57" width="100" height="80" />
+        <dc:Bounds x="316" y="-57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1dza4q4_di" bpmnElement="SequenceFlow_1dza4q4">
-        <di:waypoint xsi:type="dc:Point" x="477" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="523" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="416" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="499" y="-17" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="455" y="-38" width="90" height="12" />
+          <dc:Bounds x="412.5" y="-38" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0rpu756_di" bpmnElement="SequenceFlow_0rpu756">
-        <di:waypoint xsi:type="dc:Point" x="623" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="711" y="-17" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="622" y="-38" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0uhpfcl_di" bpmnElement="SequenceFlow_0uhpfcl">
-        <di:waypoint xsi:type="dc:Point" x="17" y="8" />
-        <di:waypoint xsi:type="dc:Point" x="17" y="819" />
-        <di:waypoint xsi:type="dc:Point" x="1188" y="819" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="540.0043516100959" y="793" width="19" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_030y6yz_di" bpmnElement="SequenceFlow_030y6yz">
-        <di:waypoint xsi:type="dc:Point" x="187" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="212" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="599" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="679" y="-16" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="199.5" y="-38" width="0" height="12" />
+          <dc:Bounds x="594" y="-37.5" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_19o0tpz_di" bpmnElement="Task_0oriv78">
-        <dc:Bounds x="87" y="-57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ServiceTask_07erhm6_di" bpmnElement="Task_0pkgoxn">
-        <dc:Bounds x="212" y="-57" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wnkgpx_di" bpmnElement="SequenceFlow_1wnkgpx">
         <di:waypoint xsi:type="dc:Point" x="1237" y="134" />
         <di:waypoint xsi:type="dc:Point" x="1238" y="192" />
@@ -465,13 +375,6 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
           <dc:Bounds x="1253" y="32.5" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_13sc98g_di" bpmnElement="SequenceFlow_13sc98g">
-        <di:waypoint xsi:type="dc:Point" x="312" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="377" y="-17" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="344.5" y="-38" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1mwacgl_di" bpmnElement="Task_0963dho">
         <dc:Bounds x="1188" y="192" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -483,38 +386,68 @@ ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0v9q75y_di" bpmnElement="CallActivity_Del_SDNC_cust">
-        <dc:Bounds x="523" y="-57" width="100" height="80" />
+        <dc:Bounds x="499" y="-57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0d9lmlv_di" bpmnElement="SequenceFlow_0d9lmlv">
-        <di:waypoint xsi:type="dc:Point" x="811" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="898" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="779" y="-16" />
+        <di:waypoint xsi:type="dc:Point" x="855" y="-17" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="854.5" y="-38" width="0" height="12" />
+          <dc:Bounds x="772" y="-37.5" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1g4djgh_di" bpmnElement="SequenceFlow_1g4djgh">
-        <di:waypoint xsi:type="dc:Point" x="998" y="-17" />
-        <di:waypoint xsi:type="dc:Point" x="1052" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="955" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="1021" y="-17" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1025" y="-38" width="0" height="12" />
+          <dc:Bounds x="943" y="-38" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0uc2beq_di" bpmnElement="SequenceFlow_0uc2beq">
-        <di:waypoint xsi:type="dc:Point" x="1152" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="1121" y="-17" />
         <di:waypoint xsi:type="dc:Point" x="1188" y="-17" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1170" y="-38" width="0" height="12" />
+          <dc:Bounds x="1109.5" y="-38" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1e5z0wu_di" bpmnElement="Task_14erap6">
-        <dc:Bounds x="711" y="-57" width="100" height="80" />
+        <dc:Bounds x="679" y="-56" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0f0965f_di" bpmnElement="Task_1j1u666">
-        <dc:Bounds x="898" y="-57" width="100" height="80" />
+        <dc:Bounds x="855" y="-57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0p4b7e1_di" bpmnElement="Task_0edkv0m">
-        <dc:Bounds x="1052" y="-57" width="100" height="80" />
+        <dc:Bounds x="1021" y="-57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_146jt8v_di" bpmnElement="ScriptTask_146jt8v">
+        <dc:Bounds x="-26" y="-57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_00tg69u_di" bpmnElement="ServiceTask_00tg69u">
+        <dc:Bounds x="144" y="-57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ym9otf_di" bpmnElement="SequenceFlow_1ym9otf">
+        <di:waypoint xsi:type="dc:Point" x="74" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="144" y="-17" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="64" y="-38" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0l4w9nr_di" bpmnElement="SequenceFlow_0l4w9nr">
+        <di:waypoint xsi:type="dc:Point" x="244" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="316" y="-17" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="235" y="-38" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_076pc2z_di" bpmnElement="CallActivity_076pc2z">
+        <dc:Bounds x="-357" y="-57" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_188ejvu_di" bpmnElement="SequenceFlow_188ejvu">
+        <di:waypoint xsi:type="dc:Point" x="-257" y="-17" />
+        <di:waypoint xsi:type="dc:Point" x="-193" y="-17" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-225" y="-38" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericAlaCarteServiceInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericAlaCarteServiceInstanceTest.groovy
new file mode 100644
index 0000000000..e5d9d62392
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericAlaCarteServiceInstanceTest.groovy
@@ -0,0 +1,215 @@
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.camunda.bpm.engine.runtime.Execution
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.MockitoAnnotations
+import org.openecomp.mso.bpmn.common.scripts.MsoUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+class CreateGenericAlaCarteServiceInstanceTest  {
+	
+	@Rule
+	public WireMockRule wireMockRule = new WireMockRule(8090);
+	
+		String Prefix="CRESI_"
+		def utils = new MsoUtils()
+		JsonUtils jsonUtil = new JsonUtils()
+		VidUtils vidUtils = new VidUtils()
+		
+	String createDBRequestError =
+"""<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+						<soapenv:Header/>
+						<soapenv:Body>
+							<ns:updateInfraRequest xmlns:ns="http://org.openecomp.mso/requestsdb">
+								<requestId>88f65519-9a38-4c4b-8445-9eb4a5a5af56</requestId>
+								<lastModifiedBy>BPMN</lastModifiedBy>
+								<statusMessage>Received error from SDN-C: No availability zone available</statusMessage>
+								<responseBody></responseBody>
+								<requestStatus>FAILED</requestStatus>
+								<vnfOutputs>&lt;network-id&gt;&lt;/network-id&gt;&lt;network-name&gt;&lt;/network-names&gt;</vnfOutputs>
+							</ns:updateInfraRequest>
+					   	</soapenv:Body>
+					   </soapenv:Envelope>"""
+
+	  String falloutHandlerRequest =
+					   """<aetgt:FalloutHandlerRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+					                             xmlns:ns="http://org.openecomp/mso/request/types/v1"
+					                             xmlns:wfsch="http://org.openecomp/mso/workflow/schema/v1">
+					   <request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					      <request-id>b69c9054-da09-4a2c-adf5-51042b62bfac</request-id>
+					      <action>CREATE</action>
+					      <source>VID</source>
+					   </request-info>
+						<aetgt:WorkflowException xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1">
+							<aetgt:ErrorMessage>Received error from SDN-C: No availability zone available.</aetgt:ErrorMessage>
+							<aetgt:ErrorCode>5300</aetgt:ErrorCode>
+						</aetgt:WorkflowException>
+					</aetgt:FalloutHandlerRequest>"""
+					
+		String completeMsoProcessRequest =
+					   """<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+                            xmlns:ns="http://org.openecomp/mso/request/types/v1"
+                            xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+   <request-info>
+      <request-id>88f65519-9a38-4c4b-8445-9eb4a5a5af56</request-id>
+      <action>CREATE</action>
+      <source>VID</source>
+   </request-info>
+   <aetgt:status-message>Network has been created successfully.</aetgt:status-message>
+   <aetgt:mso-bpel-name>BPMN Network action: CREATE</aetgt:mso-bpel-name>
+</aetgt:MsoCompletionRequest>"""
+
+		String jsonIncomingRequest =
+	"""{
+        "requestDetails": {
+        "modelInfo": {
+        "modelType": "service",
+        "modelInvariantId": "1de901ed-17af-4b03-bc1f-41659cfa27cb",
+        "modelVersionId": "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
+        "modelName": "demoVLB",
+        "modelVersion": "1.0"
+        },
+        "cloudConfiguration" : {
+        "lcpCloudRegionId": "RegionOne",
+        "tenantId": "onap"
+        },
+        "subscriberInfo": {
+        "globalSubscriberId": "Demonstration",
+        "subscriberName": "Demonstration"
+        },
+        "requestInfo": {
+        "instanceName": "sample-instance-2",
+        "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "source": "VID",
+        "requestorId":"1234",
+        "suppressRollback": "false"
+        },
+        "requestParameters": {
+        "subscriptionServiceType": "vLB"
+        }
+        }
+        }"""
+
+	    @Before
+		public void init()
+		{
+			MockitoAnnotations.initMocks(this)
+			
+		}
+
+		public void initializeVariables(Execution mockExecution) {
+			
+			//verify(mockExecution).setVariable(Prefix + "Success", false)
+			
+			//verify(mockExecution).setVariable(Prefix + "CompleteMsoProcessRequest", "")
+			//verify(mockExecution).setVariable(Prefix + "FalloutHandlerRequest", "")
+			//verify(mockExecution).setVariable(Prefix + "isSilentSuccess", false)
+				
+		}
+				
+		@Test
+		//@Ignore  
+		public void preProcessRequest() {
+			
+			println "************ preProcessRequest() ************* " 
+			ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+			// Initialize prerequisite variables
+			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+			when(mockExecution.getVariable("bpmnRequest")).thenReturn(jsonIncomingRequest)
+			try{
+									
+				// preProcessRequest(Execution execution)						
+				CreateGenericALaCarteServiceInstance createGenericALaCarteServiceInstance = new CreateGenericALaCarteServiceInstance()
+				createGenericALaCarteServiceInstance.preProcessRequest(mockExecution)
+
+				//verify(mockExecution).getVariable("isDebugLogEnabled")
+				//verify(mockExecution).setVariable("prefix", Prefix)
+			
+				initializeVariables(mockExecution)
+				//verify(mockExecution).setVariable(Prefix + "Success", false)
+			}catch(Exception e){
+				//ignore
+			}			
+		}
+		
+		@Test
+		//@Ignore
+		public void sendSyncResponse() {
+			
+			println "************ sendSyncResponse ************* "
+			
+			ExecutionEntity mockExecution = setupMock()
+			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+			when(mockExecution.getVariable("isAsyncProcess")).thenReturn(true)
+			when(mockExecution.getVariable("mso-request-id")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")
+			when(mockExecution.getVariable("serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+			try{
+				// preProcessRequest(Execution execution)
+				CreateGenericALaCarteServiceInstance createGenericALaCarteServiceInstance = new CreateGenericALaCarteServiceInstance()
+				createGenericALaCarteServiceInstance.sendSyncResponse(mockExecution)
+
+				//verify(mockExecution).setVariable("prefix", Prefix)
+				//verify(mockExecution).setVariable("createServiceRestRequest", "202")
+			}catch(Exception e){
+				//ignore
+			}
+		}
+		
+		@Test
+		//@Ignore
+		public void sendSyncError() {
+			
+			println "************ sendSyncError ************* "
+			
+			ExecutionEntity mockExecution = setupMock()
+			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+			when(mockExecution.getVariable("isAsyncProcess")).thenReturn(true)
+			when(mockExecution.getVariable("mso-request-id")).thenReturn("e8ebf6a0-f8ea-4dc0-8b99-fe98a87722d6")
+			when(mockExecution.getVariable("serviceInstanceId")).thenReturn("f70e927b-6087-4974-9ef8-c5e4d5847ca4")
+			try{
+				CreateGenericALaCarteServiceInstance createGenericALaCarteServiceInstance = new CreateGenericALaCarteServiceInstance()
+				createGenericALaCarteServiceInstance.sendSyncError(mockExecution)
+
+				//verify(mockExecution).setVariable("prefix", Prefix)
+				//verify(mockExecution).setVariable("createServiceRestRequest", "500")
+			}catch(Exception e){
+				//ignore
+			}
+		}
+		
+		private ExecutionEntity setupMock() {
+			
+			ProcessDefinition mockProcessDefinition = mock(ProcessDefinition.class)
+			when(mockProcessDefinition.getKey()).thenReturn("CreateGenericALaCarteSeviceInstance")
+			RepositoryService mockRepositoryService = mock(RepositoryService.class)
+			when(mockRepositoryService.getProcessDefinition()).thenReturn(mockProcessDefinition)
+			when(mockRepositoryService.getProcessDefinition().getKey()).thenReturn("CreateGenericALaCarteSeviceInstance")
+			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("CreateGenericALaCarteSeviceInstance")
+			when(mockExecution.getProcessInstanceId()).thenReturn("CreateGenericALaCarteSeviceInstance")
+			when(mockExecution.getProcessEngineServices()).thenReturn(mockProcessEngineServices)
+			when(mockExecution.getProcessEngineServices().getRepositoryService().getProcessDefinition(mockExecution.getProcessDefinitionId())).thenReturn(mockProcessDefinition)
+			
+			return mockExecution
+		}
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstanceTest.groovy
new file mode 100644
index 0000000000..8ccb18a625
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstanceTest.groovy
@@ -0,0 +1,160 @@
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.camunda.bpm.engine.runtime.Execution
+import org.junit.Before
+import org.junit.BeforeClass
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.MockitoAnnotations
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.infrastructure.scripts.DeleteCustomE2EServiceInstance
+import org.openecomp.mso.bpmn.mock.FileUtil
+import org.openecomp.mso.bpmn.vcpe.scripts.GroovyTestBase
+
+import static org.junit.Assert.assertTrue
+import static org.junit.Assert.assertTrue
+import static org.junit.Assert.assertTrue
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+
+class DeleteCustomE2EServiceInstanceTest extends GroovyTestBase {
+
+    private static String request
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(GroovyTestBase.PORT)
+
+    String Prefix = "CVRCS_"
+    String RbType = "DCRENI_"
+
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        request = FileUtil.readResourceFile("__files/InfrastructureFlows/DeleteCustomE2EService.json")
+    }
+
+    @Before
+    public void init()
+    {
+        MockitoAnnotations.initMocks(this)
+    }
+
+    public DeleteCustomE2EServiceInstanceTest(){
+        super("DeleteCustomE2EServiceInstance")
+    }
+    @Test
+    public void preProcessRequestTest () {
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        DeleteCustomE2EServiceInstance instance = new DeleteCustomE2EServiceInstance()
+        mex.setVariable("isDebugLogEnabled","true")
+        instance.preProcessRequest(mex);
+
+        verify(mex).getVariable(GroovyTestBase.DBGFLAG)
+
+        verify(mex).setVariable("globalSubscriberId", "38829939920000")
+        verify(mex).setVariable("operationId", "59960003992")
+        verify(mex).setVariable("URN_mso_adapters_openecomp_db_endpoint", "http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter")
+    }
+
+    @Test
+    public void sendSyncResponseTest() {
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        DeleteCustomE2EServiceInstance instance = new DeleteCustomE2EServiceInstance()
+        instance.sendSyncResponse(mex)
+        verify(mex).setVariable("DeleteCustomE2EServiceInstanceWorkflowResponseSent", "true")
+    }
+
+    @Test
+    public void prepareCompletionRequestTest(){
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        DeleteCustomE2EServiceInstance instance = new DeleteCustomE2EServiceInstance()
+        instance.prepareCompletionRequest(mex)
+        String msoComplitionRequest = FileUtil.readResourceFile("__files/GenericFlows/MsoCompletionRequest.xml")
+        //verify(mex).setVariable("completionRequest", msoComplitionRequest)
+    }
+
+    @Test
+    public void sendSyncErrorTest(){
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        DeleteCustomE2EServiceInstance instance = new DeleteCustomE2EServiceInstance()
+        instance.sendSyncError(mex)
+
+    }
+
+    @Test
+    public void prepareFalloutRequest(){
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        DeleteCustomE2EServiceInstance instance = new DeleteCustomE2EServiceInstance()
+        instance.prepareFalloutRequest(mex)
+        String requestInfo =
+                """<request-info xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+					<request-id>null</request-id>
+					<action>DELETE</action>
+					<source>null</source>
+				   </request-info>"""
+        //verify(mex).setVariable("falloutRequest", requestInfo)
+    }
+
+    @Test
+    public void processJavaExceptionTest(){
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        DeleteCustomE2EServiceInstance instance = new DeleteCustomE2EServiceInstance()
+        instance.processJavaException()
+    }
+
+
+    private void initPreProcess(ExecutionEntity mex) {
+        when(mex.getVariable(GroovyTestBase.DBGFLAG)).thenReturn("true")
+        when(mex.getVariable("bpmnRequest")).thenReturn(request)
+        when(mex.getVariable("mso-request-id")).thenReturn("mri")
+        when(mex.getVariable("serviceType")).thenReturn("VoLTE")
+        when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
+        when(mex.getVariable("requestAction")).thenReturn("ra")
+        when(mex.getVariable("operationId")).thenReturn("59960003992")
+    }
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericAlaCarteServiceInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericAlaCarteServiceInstanceTest.groovy
new file mode 100644
index 0000000000..ae25c33a2d
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteGenericAlaCarteServiceInstanceTest.groovy
@@ -0,0 +1,105 @@
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import org.camunda.bpm.engine.ProcessEngineServices
+import org.camunda.bpm.engine.RepositoryService
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.camunda.bpm.engine.repository.ProcessDefinition
+import org.camunda.bpm.engine.runtime.Execution
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.MockitoAnnotations
+import org.openecomp.mso.bpmn.common.scripts.MsoUtils
+import org.openecomp.mso.bpmn.core.WorkflowException
+import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.VidUtils
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+
+class DeleteGenericAlaCarteServiceInstanceTest  {
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(8090);
+
+    String Prefix="DELSI_"
+    def utils = new MsoUtils()
+		JsonUtils jsonUtil = new JsonUtils()
+		VidUtils vidUtils = new VidUtils()
+
+    String jsonIncomingRequest =
+            """{
+        "requestDetails": {
+        "modelInfo": {
+        "modelType": "service",
+        "modelInvariantId": "1de901ed-17af-4b03-bc1f-41659cfa27cb",
+        "modelVersionId": "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
+        "modelName": "demoVLB",
+        "modelVersion": "1.0"
+        },
+        "cloudConfiguration" : {
+        "lcpCloudRegionId": "RegionOne",
+        "tenantId": "onap"
+        },
+        "subscriberInfo": {
+        "globalSubscriberId": "Demonstration",
+        "subscriberName": "Demonstration"
+        },
+        "requestInfo": {
+        "instanceName": "sample-instance-2",
+        "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "source": "VID",
+        "requestorId":"1234",
+        "suppressRollback": "false"
+        },
+        "requestParameters": {
+        "subscriptionServiceType": "vLB"
+        }
+        }
+        }"""
+
+	    @Before
+		public void init()
+		{
+			MockitoAnnotations.initMocks(this)
+			
+		}
+
+		public void initializeVariables(Execution mockExecution) {
+			
+			verify(mockExecution).setVariable(Prefix + "Success", false)
+			
+			verify(mockExecution).setVariable(Prefix + "CompleteMsoProcessRequest", "")
+			verify(mockExecution).setVariable(Prefix + "FalloutHandlerRequest", "")
+			verify(mockExecution).setVariable(Prefix + "isSilentSuccess", false)
+				
+		}
+				
+		@Test
+		//@Ignore  
+		public void preProcessRequest() {
+			
+			println "************ preProcessRequest() ************* " 
+			ExecutionEntity mockExecution = mock(ExecutionEntity.class)
+			// Initialize prerequisite variables
+			when(mockExecution.getVariable("isDebugLogEnabled")).thenReturn("true")
+			when(mockExecution.getVariable("bpmnRequest")).thenReturn(jsonIncomingRequest)
+			
+			try {
+                // preProcessRequest(Execution execution)
+                DeleteGenericALaCarteServiceInstance deleteGenericALaCarteServiceInstance = new DeleteGenericALaCarteServiceInstance()
+                deleteGenericALaCarteServiceInstance.preProcessRequest(mockExecution)
+
+                verify(mockExecution).getVariable("isDebugLogEnabled")
+                verify(mockExecution).setVariable("prefix", Prefix)
+
+                initializeVariables(mockExecution)
+                //verify(mockExecution).setVariable(Prefix + "Success", false)
+            }catch(Exception e){
+                //ignore
+            }
+
+		}
+}
+\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy
index 2bb88632db..b22431a660 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy
@@ -89,13 +89,13 @@ class DoCreateNetworkInstanceRollbackTest  {
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
@@ -137,13 +137,13 @@ class DoCreateNetworkInstanceRollbackTest  {
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy
index d0b87b3737..b45dd0bb4e 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy
@@ -2085,12 +2085,12 @@ String assignRpcSDNCRequest =
       <service-information>
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>
             <model-version>1.0</model-version>
             <model-name>HNGW Protected OAM</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
          <global-customer-id>globalId_45678905678</global-customer-id>
          <subscriber-name>MSO_1610_dev</subscriber-name>
@@ -2098,13 +2098,13 @@ String assignRpcSDNCRequest =
       <network-information>
          <network-id>networkId</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>
             <model-version>1</model-version>
             <model-name>CONTRAIL_EXTERNAL</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-input>
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
@@ -2139,12 +2139,12 @@ String activateSDNCRequest =
       <service-information>
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>
             <model-version>1.0</model-version>
             <model-name>HNGW Protected OAM</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
          <global-customer-id>globalId_45678905678</global-customer-id>
          <subscriber-name>MSO_1610_dev</subscriber-name>
@@ -2152,13 +2152,13 @@ String activateSDNCRequest =
       <network-information>
          <network-id>networkId</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>
             <model-version>1</model-version>
             <model-name>CONTRAIL_EXTERNAL</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-input>
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
@@ -2232,12 +2232,12 @@ String sdncRpcRollbackRequest =
       <service-information>
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>
             <model-version>1.0</model-version>
             <model-name>HNGW Protected OAM</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
          <global-customer-id>globalId_45678905678</global-customer-id>
          <subscriber-name>MSO_1610_dev</subscriber-name>
@@ -2245,13 +2245,13 @@ String sdncRpcRollbackRequest =
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>
             <model-version>1</model-version>
             <model-name>CONTRAIL_EXTERNAL</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-input>
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
@@ -2286,12 +2286,12 @@ String sdncActivateRollbackRequest =
       <service-information>
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>
             <model-version>1.0</model-version>
             <model-name>HNGW Protected OAM</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
          <global-customer-id>globalId_45678905678</global-customer-id>
          <subscriber-name>MSO_1610_dev</subscriber-name>
@@ -2299,13 +2299,13 @@ String sdncActivateRollbackRequest =
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>
             <model-version>1</model-version>
             <model-name>CONTRAIL_EXTERNAL</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-input>
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
@@ -2461,13 +2461,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
@@ -2508,13 +2508,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
@@ -3985,4 +3985,4 @@ String sdncAdapterWorkflowAssignResponse =
 
 			return mockExecution
 		}
-}
-\ No newline at end of file
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstanceTest.groovy
new file mode 100644
index 0000000000..2cf09fe144
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstanceTest.groovy
@@ -0,0 +1,143 @@
+package org.openecomp.mso.bpmn.infrastructure.scripts
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import org.junit.Before
+import org.junit.BeforeClass
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.MockitoAnnotations
+import org.openecomp.mso.bpmn.infrastructure.scripts.DoCustomDeleteE2EServiceInstance
+import org.openecomp.mso.bpmn.mock.FileUtil
+import org.openecomp.mso.bpmn.vcpe.scripts.GroovyTestBase
+
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+import static org.mockito.Mockito.when
+
+class DoCustomDeleteE2EServiceInstanceTest extends GroovyTestBase {
+
+    private static String request
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(GroovyTestBase.PORT)
+
+    String Prefix = "CVRCS_"
+    String RbType = "DCRENI_"
+
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        request = FileUtil.readResourceFile("__files/InfrastructureFlows/DeleteCustomE2EService.json")
+    }
+
+    @Before
+    public void init()
+    {
+        MockitoAnnotations.initMocks(this)
+    }
+    public DoCustomDeleteE2EServiceInstanceTest(){
+        super("DoCustomDeleteE2EServiceInstance")
+    }
+
+    @Test
+    public void preProcessRequestTest(){
+
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+
+        DoCustomDeleteE2EServiceInstance instance = new DoCustomDeleteE2EServiceInstance()
+        instance.preProcessRequest(mex)
+        verify(mex).setVariable("sdncCallbackUrl", "/mso/sdncadapter/")
+        verify(mex).setVariable("siParamsXml", "")
+    }
+
+    @Ignore
+    @Test
+    public void postProcessAAIGETTest(){
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        when(mex.getVariable("GENGS_SuccessIndicator")).thenReturn(true)
+
+        String aaiGetResponse = FileUtil.readResourceFile("__files/GenericFlows/aaiGetResponse.xml")
+        when(mex.getVariable("GENGS_service")).thenReturn(aaiGetResponse)
+        DoCustomDeleteE2EServiceInstance instance = new DoCustomDeleteE2EServiceInstance()
+        instance.postProcessAAIGET(mex)
+		// TODO: what to test here?
+//        verify(mex).setVariable("subscriptionServiceType", "e2eserviceInstance/delete")
+    }
+
+    @Ignore
+    @Test
+    public void preInitResourcesOperStatusTest(){
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        when(mex.getVariable("serviceRelationShip")).thenReturn("[{\"resourceInstanceId\":\"3333\",\"resourceType\":\"overlay\"},{\"resourceInstanceId\":\"4444\",\"resourceType\":\"underlay\"},{\"resourceInstanceId\":\"1111\",\"resourceType\":\"vIMS\"},{\"resourceInstanceId\":\"222\",\"resourceType\":\"vEPC\"}]")
+        DoCustomDeleteE2EServiceInstance instance = new DoCustomDeleteE2EServiceInstance()
+        instance.preInitResourcesOperStatus(mex)
+		// TODO: what to test here?
+//        verify(mex).setVariable("CVFMI_dbAdapterEndpoint", "http://localhost:8080/mso")
+    }
+
+    @Test
+    public void preResourceDeleteTest() {
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        when(mex.getVariable("serviceRelationShip")).thenReturn("[{\"resourceInstanceId\":\"3333\",\"resourceType\":\"overlay\"},{\"resourceInstanceId\":\"4444\",\"resourceType\":\"underlay\"},{\"resourceInstanceId\":\"1111\",\"resourceType\":\"vIMS\"},{\"resourceInstanceId\":\"222\",\"resourceType\":\"vEPC\"}]")
+        DoCustomDeleteE2EServiceInstance instance = new DoCustomDeleteE2EServiceInstance()
+        instance.preResourceDelete(mex,"overlay")
+        verify(mex).setVariable("resourceType", "overlay")
+    }
+
+    @Ignore
+    @Test
+    public void postProcessSDNCDeleteTest(){
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        when(mex.getVariable("SDNCA_SuccessIndicator")).thenReturn("true")
+        when(mex.getVariable("DDELSI_sdncResponseSuccess")).thenReturn("true")
+        when(mex.getVariable("prefix")).thenReturn("DDELSI_")
+        DoCustomDeleteE2EServiceInstance instance = new DoCustomDeleteE2EServiceInstance()
+        String response = FileUtil.readResourceFile("__files/GenericFlows/SDNCDeleteResponse.xml")
+        String method = "deleteE2E";
+        instance.postProcessSDNCDelete(mex, response, method)
+		// TODO: what to test here?
+//        verify(mex).setVariable("DDELSI_sdncRequestDataResponseCode", "0")
+    }
+
+    @Test
+    public void postProcessAAIDELTest() {
+        ExecutionEntity mex = setupMock()
+        def map = setupMap(mex)
+        initPreProcess(mex)
+        when(mex.getVariable("GENDS_SuccessIndicator")).thenReturn("true")
+        DoCustomDeleteE2EServiceInstance instance = new DoCustomDeleteE2EServiceInstance()
+        instance.postProcessAAIDEL(mex)
+    }
+
+    private void initPreProcess(ExecutionEntity mex) {
+        when(mex.getVariable(GroovyTestBase.DBGFLAG)).thenReturn("true")
+        when(mex.getVariable("bpmnRequest")).thenReturn(request)
+        when(mex.getVariable("mso-request-id")).thenReturn("mri")
+        when(mex.getVariable("serviceType")).thenReturn("VoLTE")
+        when(mex.getVariable("serviceInstanceId")).thenReturn("e151059a-d924-4629-845f-264db19e50b4")
+        when(mex.getVariable("requestAction")).thenReturn("ra")
+        when(mex.getVariable("operationId")).thenReturn("59960003992")
+        when(mex.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("/mso/sdncadapter/")
+        when(mex.getVariable("GENGS_FoundIndicator")).thenReturn("true")
+        when(mex.getVariable("GENGS_siResourceLink")).thenReturn("/service-subscription/e2eserviceInstance/delete/service-instances/")
+        when(mex.getVariable("globalSubscriberId")).thenReturn("4993921112123")
+        when(mex.getVariable("GENGS_service")).thenReturn("test3434")
+        when(mex.getVariable("URN_mso_openecomp_adapters_db_endpoint")).thenReturn("http://localhost:8080/mso")
+    }
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy
index 96a84deb26..bdfd415440 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy
@@ -89,13 +89,13 @@ class DoDeleteNetworkInstanceRollbackTest  {
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
@@ -136,13 +136,13 @@ class DoDeleteNetworkInstanceRollbackTest  {
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy
index 0f87b6400e..f1dbb4b768 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy
@@ -858,12 +858,12 @@ String aaiResponseWithRelationship =
       <service-information>
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>
             <model-version>1.0</model-version>
             <model-name>HNGW Protected OAM</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
          <global-customer-id>globalId_45678905678</global-customer-id>
          <subscriber-name/>
@@ -871,13 +871,13 @@ String aaiResponseWithRelationship =
       <network-information>
          <network-id>networkId</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>
             <model-version>1</model-version>
             <model-name>CONTRAIL_EXTERNAL</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-input>
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
@@ -912,12 +912,12 @@ String aaiResponseWithRelationship =
       <service-information>
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>
             <model-version>1.0</model-version>
             <model-name>HNGW Protected OAM</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>
          <global-customer-id>globalId_45678905678</global-customer-id>
          <subscriber-name/>
@@ -925,13 +925,13 @@ String aaiResponseWithRelationship =
       <network-information>
          <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <onap-model-information>
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>
             <model-version>1</model-version>
             <model-name>CONTRAIL_EXTERNAL</model-name>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-input>
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>
@@ -1926,4 +1926,4 @@ String sdncAdapterWorkflowFormattedResponse_404 =
 
 		}
 
-}
-\ No newline at end of file
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy
index c97bedbac1..f4b1a87dd2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy
@@ -88,13 +88,13 @@ class DoUpdateNetworkInstanceRollbackTest  {
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
@@ -136,13 +136,13 @@ class DoUpdateNetworkInstanceRollbackTest  {
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
@@ -312,4 +312,4 @@ class DoUpdateNetworkInstanceRollbackTest  {
 			return mockExecution
 		}
 
-}
-\ No newline at end of file
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy
index fb44067b68..08088dd544 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy
@@ -1505,13 +1505,13 @@ String rollbackSDNCRequest =
       <network-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
          <network-type>CONTRAIL_EXTERNAL</network-type>
-         <ecomp-model-information>
+         <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>
-         </ecomp-model-information>
+         </onap-model-information>
       </network-information>
       <network-request-information>
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
index c5eff73084..f0645b2bc7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
@@ -85,7 +85,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** preProcessRequest *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRequest() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -96,6 +96,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 
 		verify(mex).getVariable(DBGFLAG)
 		verify(mex).setVariable("prefix", Prefix)
+		verify(mex).setVariable("aaiDistDelay", "aaidelay")
 		verify(mex).setVariable("createVcpeServiceRequest", request)
 		verify(mex).setVariable("msoRequestId", "mri")
 		assertEquals("sii", map.get("serviceInstanceId"))
@@ -118,7 +119,21 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
+	public void preProcessRequest_MissingAaiDistDelay() {
+		ExecutionEntity mex = setupMock()
+		def map = setupMap(mex)
+		initPreProcess(mex)
+		
+		when(mex.getVariable("URN_mso_workflow_aai_distribution_delay")).thenReturn(null)
+		
+		CreateVcpeResCustService CreateVcpeResCustService = new CreateVcpeResCustService()
+		
+		assertTrue(doBpmnError( { _ -> CreateVcpeResCustService.preProcessRequest(mex) }))
+	}
+			
+	@Test
+	// @Ignore  
 	public void preProcessRequest_EmptyParts() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -160,7 +175,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRequest_MissingSubscriberId() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -178,7 +193,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRequest_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcess(mex)
@@ -191,7 +206,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRequest_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcess(mex)
@@ -206,7 +221,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** sendSyncResponse *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void sendSyncResponse() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -229,7 +244,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void sendSyncResponse_Ex() {
 		ExecutionEntity mex = setupMock()
 		initSendSyncResponse(mex)
@@ -245,7 +260,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareDecomposeService *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareDecomposeService() {
 		ExecutionEntity mex = setupMock()
 		initPrepareDecomposeService(mex)
@@ -258,7 +273,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareDecomposeService_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareDecomposeService(mex)
@@ -274,7 +289,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareCreateServiceInstance *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateServiceInstance() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateServiceInstance(mex)
@@ -288,7 +303,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateServiceInstance_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateServiceInstance(mex)
@@ -304,7 +319,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** postProcessServiceInstanceCreate *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessServiceInstanceCreate() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -323,7 +338,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessServiceInstanceCreate_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPostProcessServiceInstanceCreate(mex)
@@ -336,7 +351,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessServiceInstanceCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPostProcessServiceInstanceCreate(mex)
@@ -352,7 +367,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** processDecomposition *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void processDecomposition() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initProcessDecomposition(mex, true, true)
@@ -371,7 +386,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void processDecomposition_EmptyNet_EmptyVnf() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initProcessDecomposition(mex, true, true)
@@ -392,7 +407,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void processDecomposition_Ex() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initProcessDecomposition(mex, true, true)
@@ -408,7 +423,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareCreateAllottedResourceTXC *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceTXC() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceTXC(mex)
@@ -426,7 +441,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceTXC_NullArList() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initPrepareCreateAllottedResourceTXC(mex)
@@ -446,7 +461,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceTXC_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceTXC(mex)
@@ -462,7 +477,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareCreateAllottedResourceBRG *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceBRG() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceBRG(mex)
@@ -480,7 +495,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceBRG_NullArList() {
 		ExecutionEntity mex = setupMock()
 		def svcdecomp = initPrepareCreateAllottedResourceBRG(mex)
@@ -500,7 +515,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareCreateAllottedResourceBRG_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareCreateAllottedResourceBRG(mex)
@@ -516,7 +531,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareVnfAndModulesCreate *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -532,7 +547,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate_EmptyList() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -550,7 +565,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate_NullList() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -568,7 +583,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareVnfAndModulesCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPrepareVnfAndModulesCreate(mex)
@@ -584,7 +599,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** validateVnfCreate *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void validateVnfCreate() {
 		ExecutionEntity mex = setupMock()
 		initValidateVnfCreate(mex)
@@ -598,7 +613,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void validateVnfCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initValidateVnfCreate(mex)
@@ -614,7 +629,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** postProcessResponse *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessResponse() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -635,7 +650,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessResponse_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -649,7 +664,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessResponse_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -666,7 +681,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** preProcessRollback *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		def wfe = initPreProcessRollback(mex)
@@ -680,7 +695,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRollback_NullWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -697,7 +712,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -714,7 +729,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void preProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -734,7 +749,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** postProcessRollback *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		def wfe = initPostProcessRollback(mex)
@@ -748,7 +763,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessRollback_NullWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -765,7 +780,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -778,7 +793,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void postProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -798,7 +813,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** prepareFalloutRequest *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareFalloutRequest() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -817,7 +832,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void prepareFalloutRequest_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -833,7 +848,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** sendSyncError *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void sendSyncError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -857,7 +872,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void sendSyncError_NotWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -883,7 +898,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void sendSyncError_NullWfe() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -909,7 +924,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void sendSyncError_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -928,7 +943,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	// ***** processJavaException *****
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void processJavaException() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -948,7 +963,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void processJavaException_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -964,7 +979,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	}
 			
 	@Test
-//	@Ignore  
+	// @Ignore  
 	public void processJavaException_Ex() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -985,6 +1000,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	private void initPreProcess(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
 		when(mex.getVariable("bpmnRequest")).thenReturn(request)
+		when(mex.getVariable("URN_mso_workflow_aai_distribution_delay")).thenReturn("aaidelay")
 		when(mex.getVariable("mso-request-id")).thenReturn("mri")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("requestAction")).thenReturn("ra")
@@ -1008,7 +1024,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		when(mex.getVariable("createVcpeServiceRequest")).thenReturn(request)
 		when(mex.getVariable("serviceDecomposition")).thenReturn(svcdecomp)
 		
-		when(svcdecomp.toJsonString()).thenReturn("mydecomp")
+		when(svcdecomp.toJsonStringNoRootName()).thenReturn("mydecomp")
 	}
 	
 	private void initPostProcessServiceInstanceCreate(ExecutionEntity mex) {
@@ -1037,6 +1053,10 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		return svcdecomp
 	}
 	
+	private initAwaitAaiDistribution(ExecutionEntity mex) {
+		when(mex.getVariable(DBGFLAG)).thenReturn("true")
+	}
+	
 	private ServiceDecomposition initPrepareCreateAllottedResourceTXC(ExecutionEntity mex) {
 		ServiceDecomposition svcdecomp = mock(ServiceDecomposition.class)
 		List<AllottedResource> arlst = new LinkedList<>()
@@ -1078,13 +1098,13 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		ModelInfo mod = mock(ModelInfo.class)
 		HomingSolution home = mock(HomingSolution.class)
 		
-		when(ar.toJsonString()).thenReturn("json"+id)
+		when(ar.toJsonStringNoRootName()).thenReturn("json"+id)
 		when(ar.getAllottedResourceType()).thenReturn("TunnelXConn")
 		when(ar.getModelInfo()).thenReturn(mod)
 		when(ar.getAllottedResourceRole()).thenReturn("TXCr")
 		when(ar.getHomingSolution()).thenReturn(home)
 		
-		when(mod.toJsonString()).thenReturn("model"+id)
+		when(mod.toJsonStringNoRootName()).thenReturn("model"+id)
 		
 		when(home.getServiceInstanceId()).thenReturn("home"+id)
 		
@@ -1096,13 +1116,13 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		ModelInfo mod = mock(ModelInfo.class)
 		HomingSolution home = mock(HomingSolution.class)
 		
-		when(ar.toJsonString()).thenReturn("json"+id)
+		when(ar.toJsonStringNoRootName()).thenReturn("json"+id)
 		when(ar.getAllottedResourceType()).thenReturn("BRG")
 		when(ar.getModelInfo()).thenReturn(mod)
 		when(ar.getAllottedResourceRole()).thenReturn("BRGr")
 		when(ar.getHomingSolution()).thenReturn(home)
 		
-		when(mod.toJsonString()).thenReturn("model"+id)
+		when(mod.toJsonStringNoRootName()).thenReturn("model"+id)
 		
 		when(home.getServiceInstanceId()).thenReturn("home"+id)
 		
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
index df7c0cff97..65c9e456e4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustServiceTest.groovy
@@ -94,22 +94,24 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
 		DeleteVcpeResCustService.preProcessRequest(mex)
 
-		verify(mex).getVariable(DBGFLAG)
-		verify(mex).setVariable("prefix", Prefix)
-		verify(mex).setVariable("DeleteVcpeResCustServiceRequest", request)
-		verify(mex).setVariable("msoRequestId", "mri")
-		verify(mex).setVariable("requestAction", "ra")
-		verify(mex).setVariable("source", "VID")
-		verify(mex).setVariable("globalSubscriberId", CUST)
-		verify(mex).setVariable("globalCustomerId", CUST)
-		verify(mex).setVariable("disableRollback", "false")
-		verify(mex).setVariable("productFamilyId", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb")
-		verify(mex).setVariable("subscriptionServiceType", SVC)	
+		verify(mex).getVariable(DBGFLAG)
 		
-		verify(mex).setVariable("lcpCloudRegionId", "mdt1")
-		verify(mex).setVariable("tenantId", "8b1df54faa3b49078e3416e21370a3ba")
-		verify(mex).setVariable("sdncVersion", "1702")
-		verify(mex).setVariable("GENGS_type", "service-instance")
+		assertEquals(Prefix, map.get("prefix"))
+		assertEquals(request, map.get("DeleteVcpeResCustServiceRequest"))
+		assertEquals("mri", map.get("msoRequestId"))
+		assertEquals("ra", map.get("requestAction"))
+		assertEquals("VID", map.get("source"))
+		assertEquals(CUST, map.get("globalSubscriberId"))
+		assertEquals(CUST, map.get("globalCustomerId"))
+		assertEquals("false", map.get("disableRollback"))
+		assertEquals("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", map.get("productFamilyId"))
+		assertEquals(SVC, map.get("subscriptionServiceType"))
+		
+		assertEquals("mdt1", map.get("lcpCloudRegionId"))
+		assertEquals("8b1df54faa3b49078e3416e21370a3ba", map.get("tenantId"))
+		assertEquals("1707", map.get("sdncVersion"))
+		assertEquals("service-instance", map.get("GENGS_type"))
+		assertEquals("""{"tenantId":"8b1df54faa3b49078e3416e21370a3ba","lcpCloudRegionId":"mdt1"}""", map.get("cloudConfiguration"))
 		assertTrue(map.containsKey(Prefix+"requestInfo"))
 		
 		def reqinfo = map.get(Prefix+"requestInfo")
@@ -146,7 +148,8 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		
 		verify(mex).setVariable("lcpCloudRegionId", "mdt1")
 		verify(mex).setVariable("tenantId", "8b1df54faa3b49078e3416e21370a3ba")
-		verify(mex).setVariable("sdncVersion", "1702")
+		assertEquals("""{"tenantId":"8b1df54faa3b49078e3416e21370a3ba","lcpCloudRegionId":"mdt1"}""", map.get("cloudConfiguration"))
+		verify(mex).setVariable("sdncVersion", "1707")
 		verify(mex).setVariable("GENGS_type", "service-instance")
 		assertTrue(map.containsKey(Prefix+"requestInfo"))
 		
@@ -256,16 +259,18 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		def map = setupMap(mex)
 		initPrepareServiceDelete(mex)
 		
+		myMockGetAr("/aai/v11/anytxc", 200, "arGetTXCById.xml");
+		myMockGetAr("/aai/v11/anybrg", 200, "arGetBRGById.xml");
+		myMockGetAr("/aai/v11/other", 200, "arGetOtherById.xml");
+		
 		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
 		DeleteVcpeResCustService.prepareServiceDelete(mex)
-
-		verify(mex).getVariable(DBGFLAG)
 		
 		verify(mex).setVariable(Prefix+"TunnelXConn", true)
-		assertEquals("txcA", map.get("TXC_allottedResourceId"))
+		assertEquals("ar-txcA", map.get("TXC_allottedResourceId"))
 		
 		verify(mex).setVariable(Prefix+"BRG", true)
-		assertEquals("brgB", map.get("BRG_allottedResourceId"))
+		assertEquals("ar-brgB", map.get("BRG_allottedResourceId"))
 		
 		verify(mex).setVariable(Prefix+"vnfsCount", 2)
 		assertNotNull(map.get(Prefix+"relatedVnfIdList"))
@@ -351,9 +356,62 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 		when(mex.getVariable("GENGS_FoundIndicator")).thenReturn(true)
 		when(mex.getVariable("mso-request-id")).thenReturn("mri")
 		when(mex.getVariable("DeleteVcpeResCustServiceRequest")).thenReturn(request)
+		when(mex.getVariable("URN_aai_endpoint")).thenReturn(aaiUriPfx)
 		when(mex.getVariable("GENGS_service")).thenReturn(FileUtil.readResourceFile("__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml"))
 	}
 	
+	// ***** getAaiAr *****
+	
+	@Test
+//	@Ignore
+	public void getAaiAr() {
+		myMockGetAr("/myurl/ar1", 200, "arGetBRGById.xml");
+		
+		ExecutionEntity mex = setupMock()
+		initGetAaiAr(mex)
+				
+		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
+		def (type, id) = DeleteVcpeResCustService.getAaiAr(mex, "/myurl/ar1")
+		
+		assertEquals("BRG", type)
+		assertEquals("ar-brgB", id)
+	}
+	
+	@Test
+//	@Ignore
+	public void getAaiAr_401() {
+		myMockGetAr("/myurl/ar1", 401, "arGetBRGById.xml");
+		
+		ExecutionEntity mex = setupMock()
+		initGetAaiAr(mex)
+				
+		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
+		def (type, id) = DeleteVcpeResCustService.getAaiAr(mex, "/myurl/ar1")
+		
+		assertEquals(null, type)
+		assertEquals(null, id)
+	}
+	
+	@Test
+//	@Ignore
+	public void getAaiAr_EmptyResponse() {
+		myMockGetAr("/myurl/ar1", 200, "empty.txt");
+		
+		ExecutionEntity mex = setupMock()
+		initGetAaiAr(mex)
+				
+		DeleteVcpeResCustService DeleteVcpeResCustService = new DeleteVcpeResCustService()
+		def (type, id) = DeleteVcpeResCustService.getAaiAr(mex, "/myurl/ar1")
+		
+		assertEquals(null, type)
+		assertEquals(null, id)
+	}
+	
+	private void initGetAaiAr(ExecutionEntity mex) {
+		when(mex.getVariable(DBGFLAG)).thenReturn("true")
+		when(mex.getVariable("URN_aai_endpoint")).thenReturn(aaiUriPfx)
+	}
+	
 	// ***** prepareVnfAndModulesDelete *****
 			
 	@Test
@@ -705,5 +763,13 @@ class DeleteVcpeResCustServiceTest extends GroovyTestBase {
 	
 	private initProcessJavaException(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
+	}
+	
+	private void myMockGetAr(String url, int status, String fileResp) {
+		stubFor(get(urlMatching(url))
+				.willReturn(aResponse()
+						.withStatus(status)
+						.withHeader("Content-Type", "text/xml")
+						.withBodyFile("VCPE/DeleteVcpeResCustService/" + fileResp)));
 	}
 }
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
index 1d4d3ea5a3..89c13f179c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRGTest.groovy
@@ -89,6 +89,7 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 		verify(mex).setVariable("prefix", Prefix)
 				
 		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
+		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdnc_replication_delay"))
 		assertTrue(checkMissingPreProcessRequest("serviceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("parentServiceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("allottedResourceModelInfo"))
@@ -296,8 +297,10 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 		assertTrue(result.indexOf("<sdncadapter:SvcAction>myact</") >= 0)
 		assertTrue(result.indexOf("<allotted-resource-id>ari</") >= 0)
 		assertTrue(result.indexOf("<sdncadapter:SvcInstanceId>sii</") >= 0)
-		assertTrue(result.indexOf("<service-instance-id>psii</") >= 0)
+		assertTrue(result.indexOf("<service-instance-id>sii</") >= 0)
 		assertTrue(result.indexOf("<parent-service-instance-id>psii</") >= 0)
+		assertTrue(result.indexOf("<subscription-service-type>sst</") >= 0)
+		assertTrue(result.indexOf("<global-customer-id>gci</") >= 0)
 		assertTrue(result.indexOf("<sdncadapter:CallbackUrl>scu</") >= 0)
 		assertTrue(result.indexOf("<request-id>mri</") >= 0)
 		assertTrue(result.indexOf("<brg-wan-mac-address>bwma</") >= 0)
@@ -326,8 +329,10 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 		assertTrue(result.indexOf("<sdncadapter:SvcAction>myact</") >= 0)
 		assertTrue(result.indexOf("<allotted-resource-id>ari</") >= 0)
 		assertTrue(result.indexOf("<sdncadapter:SvcInstanceId>sii</") >= 0)
-		assertTrue(result.indexOf("<service-instance-id>psii</") >= 0)
+		assertTrue(result.indexOf("<service-instance-id>sii</") >= 0)
 		assertTrue(result.indexOf("<parent-service-instance-id>psii</") >= 0)
+		assertTrue(result.indexOf("<subscription-service-type>sst</") >= 0)
+		assertTrue(result.indexOf("<global-customer-id>gci</") >= 0)
 		assertTrue(result.indexOf("<sdncadapter:CallbackUrl>scu</") >= 0)
 		assertTrue(result.indexOf("<request-id>mri</") >= 0)
 		assertTrue(result.indexOf("<brg-wan-mac-address>bwma</") >= 0)
@@ -886,6 +891,7 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 	private void initPreProcess(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
 		when(mex.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("sdncurn")
+		when(mex.getVariable("URN_mso_workflow_sdnc_replication_delay")).thenReturn("sdncdelay")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
 		when(mex.getVariable("allottedResourceModelInfo")).thenReturn("armi")
@@ -931,6 +937,8 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 		when(mex.getVariable("allottedResourceId")).thenReturn("ari")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
+		when(mex.getVariable("subscriptionServiceType")).thenReturn("sst")
+		when(mex.getVariable("globalCustomerId")).thenReturn("gci")
 		when(mex.getVariable("sdncCallbackUrl")).thenReturn("scu")
 		when(mex.getVariable("msoRequestId")).thenReturn("mri")
 		when(mex.getVariable("brgWanMacAddress")).thenReturn("bwma")
@@ -963,7 +971,6 @@ class DoCreateAllottedResourceBRGTest extends GroovyTestBase {
 		when(mex.getVariable("aaiARGetResponse")).thenReturn("<selflink>arlink</selflink>")
 		when(mex.getVariable("sdncAssignResponse")).thenReturn("<response-data>&lt;object-path&gt;assignlink&lt;/object-path&gt;</response-data>")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
-		when(mex.getVariable("junitSleepMs")).thenReturn("5")
 		when(mex.getVariable("sdncCallbackUrl")).thenReturn("myurl")
 	}
 	
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
index 2b6d4ba6a0..b27e368316 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXCTest.groovy
@@ -83,7 +83,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessRequest *****
 			
 	@Test
-//		@Ignore  
+	// @Ignore  
 	public void preProcessRequest() {
 		ExecutionEntity mex = setupMock()
 		initPreProcess(mex)
@@ -95,6 +95,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 		verify(mex).setVariable("prefix", Prefix)
 				
 		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdncadapter_callback"))
+		assertTrue(checkMissingPreProcessRequest("URN_mso_workflow_sdnc_replication_delay"))
 		assertTrue(checkMissingPreProcessRequest("serviceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("parentServiceInstanceId"))
 		assertTrue(checkMissingPreProcessRequest("allottedResourceModelInfo"))
@@ -107,7 +108,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** getAaiAR *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void getAaiAR() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -121,7 +122,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void getAaiAR_Duplicate() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -137,7 +138,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void getAaiAR_NotActive() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -153,7 +154,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void getAaiAR_NoStatus() {
 		MockGetAllottedResource(CUST, SVC, INST, ARID, "VCPE/DoCreateAllottedResourceTXC/getArTxc.xml")
 		
@@ -172,7 +173,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** createAaiAR *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void createAaiAR() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -196,7 +197,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void createAaiAR_NoArid_NoModelUuids() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -226,7 +227,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void createAaiAR_MissingPsiLink() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -241,7 +242,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void createAaiAR_HttpFailed() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -254,7 +255,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void createAaiAR_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -269,7 +270,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void createAaiAR_Ex() {
 		ExecutionEntity mex = setupMock()
 		initCreateAaiAr(mex)
@@ -287,7 +288,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** buildSDNCRequest *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void buildSDNCRequest() {
 		ExecutionEntity mex = setupMock()
 		initBuildSDNCRequest(mex)
@@ -300,8 +301,10 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 		assertTrue(result.indexOf("<sdncadapter:SvcAction>myact</") >= 0)
 		assertTrue(result.indexOf("<allotted-resource-id>ari</") >= 0)
 		assertTrue(result.indexOf("<sdncadapter:SvcInstanceId>sii</") >= 0)
-		assertTrue(result.indexOf("<service-instance-id>psii</") >= 0)
+		assertTrue(result.indexOf("<service-instance-id>sii</") >= 0)
 		assertTrue(result.indexOf("<parent-service-instance-id>psii</") >= 0)
+		assertTrue(result.indexOf("<subscription-service-type>sst</") >= 0)
+		assertTrue(result.indexOf("<global-customer-id>gci</") >= 0)
 		assertTrue(result.indexOf("<sdncadapter:CallbackUrl>scu</") >= 0)
 		assertTrue(result.indexOf("<request-id>mri</") >= 0)
 		assertTrue(result.indexOf("<model-invariant-uuid/>") >= 0)
@@ -312,7 +315,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void buildSDNCRequest_Ex() {
 		ExecutionEntity mex = setupMock()
 		initBuildSDNCRequest(mex)
@@ -328,7 +331,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCAssign *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCAssign() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -354,7 +357,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCAssign_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -367,7 +370,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCAssign_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -383,7 +386,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCCreate *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCCreate() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -410,7 +413,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCCreate_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -423,7 +426,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCCreate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -439,7 +442,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCActivate *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCActivate() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -466,7 +469,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCActivate_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -479,7 +482,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCActivate_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNC(mex)
@@ -495,7 +498,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** validateSDNCResp *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void validateSDNCResp() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -519,7 +522,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void validateSDNCResp_Get() {
 		ExecutionEntity mex = setupMock()
 		def data = initValidateSDNCResp(mex)
@@ -538,7 +541,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void validateSDNCResp_Unsuccessful() {
 		ExecutionEntity mex = setupMock()
 		initValidateSDNCResp(mex)
@@ -553,7 +556,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void validateSDNCResp_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		initValidateSDNCResp(mex)
@@ -567,7 +570,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void validateSDNCResp_Ex() {
 		ExecutionEntity mex = setupMock()
 		initValidateSDNCResp(mex)
@@ -584,7 +587,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessSDNCGet *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCGet_FoundAR() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -603,7 +606,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCGet_NotFoundAR() {
 		ExecutionEntity mex = setupMock()
 		def map = setupMap(mex)
@@ -624,7 +627,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessSDNCGet_Ex() {
 		ExecutionEntity mex = setupMock()
 		initPreProcessSDNCGet(mex)
@@ -640,7 +643,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** updateAaiAROrchStatus *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void updateAaiAROrchStatus() {
 		MockPatchAllottedResource(CUST, SVC, INST, ARID)
 		
@@ -655,7 +658,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** generateOutputs *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void generateOutputs() {
 		ExecutionEntity mex = setupMock()
 		def txctop = FileUtil.readResourceFile("__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml")
@@ -674,7 +677,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void generateOutputs_BadXml() {
 		ExecutionEntity mex = setupMock()
 		
@@ -689,7 +692,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void generateOutputs_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		
@@ -704,7 +707,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void generateOutputs_Ex() {
 		ExecutionEntity mex = setupMock()
 		
@@ -722,7 +725,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** preProcessRollback *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		WorkflowException wfe = mock(WorkflowException.class)
@@ -738,7 +741,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessRollback_NotWFE() {
 		ExecutionEntity mex = setupMock()
 		
@@ -753,7 +756,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		
@@ -767,7 +770,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void preProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		
@@ -784,7 +787,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	// ***** postProcessRollback *****
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void postProcessRollback() {
 		ExecutionEntity mex = setupMock()
 		WorkflowException wfe = mock(WorkflowException.class)
@@ -801,7 +804,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void postProcessRollback_NotWFE() {
 		ExecutionEntity mex = setupMock()
 		
@@ -817,7 +820,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void postProcessRollback_BpmnError() {
 		ExecutionEntity mex = setupMock()
 		
@@ -832,7 +835,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	}
 	
 	@Test
-//		@Ignore
+	// @Ignore
 	public void postProcessRollback_Ex() {
 		ExecutionEntity mex = setupMock()
 		
@@ -860,6 +863,7 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 	private void initPreProcess(ExecutionEntity mex) {
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
 		when(mex.getVariable("URN_mso_workflow_sdncadapter_callback")).thenReturn("sdncurn")
+		when(mex.getVariable("URN_mso_workflow_sdnc_replication_delay")).thenReturn("sdncdelay")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
 		when(mex.getVariable("allottedResourceModelInfo")).thenReturn("armi")
@@ -903,6 +907,8 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 		when(mex.getVariable("allottedResourceId")).thenReturn("ari")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
 		when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii")
+		when(mex.getVariable("subscriptionServiceType")).thenReturn("sst")
+		when(mex.getVariable("globalCustomerId")).thenReturn("gci")
 		when(mex.getVariable("sdncCallbackUrl")).thenReturn("scu")
 		when(mex.getVariable("msoRequestId")).thenReturn("mri")
 	}
@@ -923,7 +929,6 @@ class DoCreateAllottedResourceTXCTest extends GroovyTestBase {
 		when(mex.getVariable("aaiARGetResponse")).thenReturn("<selflink>arlink</selflink>")
 		when(mex.getVariable("sdncAssignResponse")).thenReturn("<response-data>&lt;object-path&gt;assignlink&lt;/object-path&gt;</response-data>")
 		when(mex.getVariable("serviceInstanceId")).thenReturn("sii")
-		when(mex.getVariable("junitSleepMs")).thenReturn("5")
 		when(mex.getVariable("sdncCallbackUrl")).thenReturn("myurl")
 	}
 	
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
index 80ec724630..e89c64e6df 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
@@ -89,7 +89,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
 			"</vfModuleException>" + EOL;
 					
 	private final String sdncAdapterDeleteCallback =
-		"<output xmlns=\"org:openecomp:sdnctl:l3api\">" + EOL +
+		"<output xmlns=\"org:onap:sdnctl:l3api\">" + EOL +
 		"  <svc-request-id>{{REQUEST-ID}}</svc-request-id>" + EOL +
 		"  <ack-final-indicator>Y</ack-final-indicator>" + EOL +
 		"</output>" + EOL;
@@ -576,4 +576,4 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
 			}
 
 	
-}
-\ No newline at end of file
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java
index 50cda81a58..852c8f922f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java
@@ -136,12 +136,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
 					"<service-information>" + EOL + 
 					"<service-id/>" + EOL + 
 					"<subscription-service-type>123456789</subscription-service-type>" + EOL + 
-					"<ecomp-model-information>" + EOL + 
+					"<onap-model-information>" + EOL + 
 					"<model-invariant-uuid/>" + EOL + 
 					"<model-uuid/>" + EOL + 
 					"<model-version/>" + EOL + 
 					"<model-name/>" + EOL + 
-					"</ecomp-model-information>" + EOL + 
+					"</onap-model-information>" + EOL + 
 					"<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + 
 					"<subscriber-name/>" + EOL + 
 					"<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + EOL + 
@@ -174,12 +174,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
 				"<service-information>" + EOL + 
 				"<service-id/>" + EOL + 
 				"<subscription-service-type>123456789</subscription-service-type>" + EOL + 
-				"<ecomp-model-information>" + EOL + 
+				"<onap-model-information>" + EOL + 
 				"<model-invariant-uuid/>" + EOL + 
 				"<model-uuid/>" + EOL + 
 				"<model-version/>" + EOL + 
 				"<model-name/>" + EOL + 
-				"</ecomp-model-information>" + EOL + 
+				"</onap-model-information>" + EOL + 
 				"<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + 
 				"<subscriber-name/>" + EOL + 
 				"<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + EOL + 
@@ -196,4 +196,4 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
 		variables.put("rollbackData",rollbackData);
 				
 	}
-}
-\ No newline at end of file
+}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java
index 18a5e079c8..1d0cb0cd10 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java
@@ -67,7 +67,7 @@ public class DoCreateVfModuleRollbackTest extends WorkflowTest {
 			"</vfModuleException>" + EOL;
 				
 	private final String sdncAdapterDeleteCallback =
-		"<output xmlns=\"org:openecomp:sdnctl:l3api\">" + EOL +
+		"<output xmlns=\"org:onap:sdnctl:l3api\">" + EOL +
 		"  <svc-request-id>{{REQUEST-ID}}</svc-request-id>" + EOL +
 		"  <ack-final-indicator>Y</ack-final-indicator>" + EOL +
 		"</output>" + EOL;
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java
index 488c5329b8..c741dfd2ed 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java
@@ -70,7 +70,7 @@ public class DoDeleteVfModuleTest extends WorkflowTest {
 			"</vfModuleException>" + EOL;
 				
 	private final String sdncAdapterDeleteCallback =
-		"<output xmlns=\"org:openecomp:sdnctl:l3api\">" + EOL +
+		"<output xmlns=\"org:onap:sdnctl:l3api\">" + EOL +
 		"  <svc-request-id>{{REQUEST-ID}}</svc-request-id>" + EOL +
 		"  <ack-final-indicator>Y</ack-final-indicator>" + EOL +
 		"</output>" + EOL;
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/CreateVcpeResCustServiceTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/CreateVcpeResCustServiceTest.java
index 8f94187f48..0af43a2c42 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/CreateVcpeResCustServiceTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/CreateVcpeResCustServiceTest.java
@@ -84,6 +84,7 @@ public class CreateVcpeResCustServiceTest extends AbstractTestBase {
 	
 	public void testCreateVcpeResCustService_Success() throws Exception {
 
+		System.out.println("starting:  testCreateVcpeResCustService_Success\n");
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
 		MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
@@ -159,6 +160,7 @@ public class CreateVcpeResCustServiceTest extends AbstractTestBase {
 	
 	public void testCreateVcpeResCustService_NoParts() throws Exception {
 
+		System.out.println("starting: testCreateVcpeResCustService_NoParts\n"  );
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json");
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json");
 		MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
@@ -226,6 +228,7 @@ public class CreateVcpeResCustServiceTest extends AbstractTestBase {
 	
 	public void testCreateVcpeResCustService_Fault_NoRollback() throws Exception {
 
+		System.out.println("starting:  testCreateVcpeResCustService_Fault_NoRollback\n");
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
 		MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
@@ -296,6 +299,7 @@ public class CreateVcpeResCustServiceTest extends AbstractTestBase {
 	
 	public void testCreateVcpeResCustService_Fault_Rollback() throws Exception {
 
+		System.out.println("starting:  testCreateVcpeResCustService_Fault_Rollback\n");
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "2", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
 		MockGetServiceResourcesCatalogData("uuid-miu-svc-011-abcdef", "VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json");
 		MockGetCustomer(CUST, "VCPE/CreateVcpeResCustService/getCustomer.xml");
@@ -367,7 +371,6 @@ public class CreateVcpeResCustServiceTest extends AbstractTestBase {
 		variables.put("request-id", "testRequestId");
 		variables.put("serviceInstanceId", DEC_INST);
 		variables.put("allottedResourceId", ARID);
-		variables.put("junitSleepMs", "5");
 		return variables;
 
 	}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceBRGTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceBRGTest.java
index 5b6f74fc7d..0373266ce1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceBRGTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceBRGTest.java
@@ -277,7 +277,6 @@ public class DoCreateAllottedResourceBRGTest extends AbstractTestBase {
 		variables.put("vni", "BRG");
 		variables.put("vgmuxBearerIP", "bearerip");
 		variables.put("brgWanMacAddress", "wanmac");
-		variables.put("junitSleepMs", "5");
 
 		variables.put("serviceInstanceId", DEC_INST);
 		variables.put("parentServiceInstanceId", DEC_PARENT_INST);
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java
index 4323ccae1a..9cf059c24c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/vcpe/DoCreateAllottedResourceTXCTest.java
@@ -283,7 +283,6 @@ public class DoCreateAllottedResourceTXCTest extends AbstractTestBase {
 		variables.put("allottedResourceType", "TXC");
 		variables.put("allottedResourceId", ARID);
 		variables.put("brgWanMacAddress", "wanmac");
-		variables.put("junitSleepMs", "5");
 
 		variables.put("serviceInstanceId", DEC_INST);
 		variables.put("parentServiceInstanceId", DEC_PARENT_INST);
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
index 4b3ac855df..5e0b8c6c54 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
@@ -1,7 +1,7 @@
 <sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
 	<sdncadapterworkflow:response-data>
 		<tag0:RequestData xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">
-		&lt;output xmlns="org:openecomp:sdnctl:vnf"&gt;&lt;svc-request-id&gt;1660b8da-0a94-442d-8ed5-ea079e3c67c8&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;vnf-information&gt;&lt;vnf-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/vnf-id&gt;&lt;/vnf-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;
+		&lt;output xmlns="org:onap:sdnctl:vnf"&gt;&lt;svc-request-id&gt;1660b8da-0a94-442d-8ed5-ea079e3c67c8&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;vnf-information&gt;&lt;vnf-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/vnf-id&gt;&lt;/vnf-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;
 		</tag0:RequestData>
 	</sdncadapterworkflow:response-data>
-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
-\ No newline at end of file
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/MsoCompletionRequest.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/MsoCompletionRequest.xml
new file mode 100644
index 0000000000..37b17121ae
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/MsoCompletionRequest.xml
@@ -0,0 +1,11 @@
+<aetgt:MsoCompletionRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
+                            xmlns:ns="http://org.openecomp/mso/request/types/v1"
+                            xmlns="http://org.openecomp/mso/infra/vnf-request/v1">
+    <request-info>
+        <request-id>null</request-id>
+        <action>DELETE</action>
+        <source>null</source>
+    </request-info>
+    <aetgt:status-message>E2E Service Instance was deleted successfully.</aetgt:status-message>
+    <aetgt:mso-bpel-name>DeleteCustomE2EServiceInstance</aetgt:mso-bpel-name>
+</aetgt:MsoCompletionRequest>
+\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/SDNCDeleteResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/SDNCDeleteResponse.xml
new file mode 100644
index 0000000000..fd719ff443
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/SDNCDeleteResponse.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sdncadapterworkflow:SDNCAdapterWorkflowResponse
+        xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
+    <sdncadapterworkflow:response-data>
+        <tag0:RequestData
+                xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">
+            <output xmlns="com:att:sdnctl:nbncapi">
+                <ack-final-indicator>Y</ack-final-indicator>
+                <svc-request-id>SK-2016-10-22-001</svc-request-id>
+                <nbnc-response-information>
+                    <response-info>
+                        <result>SUCCESS</result>
+                        <aai-status>ERROR</aai-status>
+                    </response-info>
+                    <virtual-datacenter-list>
+                        <vdc-id>15001417</vdc-id>
+                        <router-list>
+                            <router-name>ALPRTR2</router-name>
+                            <ipe-loopback-address>1.1.1.2</ipe-loopback-address>
+                            <vlan-list>
+                                <vlan-id>1255.ae81</vlan-id>
+                                <border-element-type>VDBE</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>ALPVDBE1</border-element-id>
+                                <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>1995.ae81</vlan-id>
+                                <border-element-type>ASBG</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>ALPASBG1</border-element-id>
+                                <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/2</vlan-id>
+                                <border-element-type>BGF2</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/2</port-id>
+                                <border-element-id>ALPBGF2</border-element-id>
+                                <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/1</vlan-id>
+                                <border-element-type>BGF1</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/1</port-id>
+                                <border-element-id>ALPBGF1</border-element-id>
+                                <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <ipe-id>2</ipe-id>
+                        </router-list>
+                        <router-list>
+                            <router-name>ALPRTR1</router-name>
+                            <ipe-loopback-address>1.1.1.1</ipe-loopback-address>
+                            <vlan-list>
+                                <vlan-id>1255.ae81</vlan-id>
+                                <border-element-type>VDBE</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>ALPVDBE1</border-element-id>
+                                <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>1995.ae81</vlan-id>
+                                <border-element-type>ASBG</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>ALPASBG1</border-element-id>
+                                <border-element-v4-subnet>3.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>3:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/2</vlan-id>
+                                <border-element-type>BGF2</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/2</port-id>
+                                <border-element-id>ALPBGF2</border-element-id>
+                                <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/1</vlan-id>
+                                <border-element-type>BGF1</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/1</port-id>
+                                <border-element-id>ALPBGF1</border-element-id>
+                                <border-element-v4-subnet>3.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>3:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <ipe-id>1</ipe-id>
+                        </router-list>
+                    </virtual-datacenter-list>
+                    <virtual-datacenter-list>
+                        <vdc-id>15001418</vdc-id>
+                        <router-list>
+                            <router-name>SANRTR1</router-name>
+                            <ipe-loopback-address>2.1.1.1</ipe-loopback-address>
+                            <vlan-list>
+                                <vlan-id>1255.ae81</vlan-id>
+                                <border-element-type>VDBE</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>SANVDBE1</border-element-id>
+                                <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>1995.ae81</vlan-id>
+                                <border-element-type>ASBG</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>SANASBG1</border-element-id>
+                                <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/2</vlan-id>
+                                <border-element-type>BGF2</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/2</port-id>
+                                <border-element-id>SANBGF2</border-element-id>
+                                <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/1</vlan-id>
+                                <border-element-type>BGF1</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/1</port-id>
+                                <border-element-id>SANBGF1</border-element-id>
+                                <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <ipe-id>1</ipe-id>
+                        </router-list>
+                        <router-list>
+                            <router-name>SANRTR2</router-name>
+                            <ipe-loopback-address>2.1.1.2</ipe-loopback-address>
+                            <vlan-list>
+                                <vlan-id>1255.ae81</vlan-id>
+                                <border-element-type>VDBE</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>SANVDBE1</border-element-id>
+                                <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>1995.ae81</vlan-id>
+                                <border-element-type>ASBG</border-element-type>
+                                <border-element-tangibility>VIRTUAL</border-element-tangibility>
+                                <port-id></port-id>
+                                <border-element-id>SANASBG1</border-element-id>
+                                <border-element-v4-subnet>4.1.1.0/22</border-element-v4-subnet>
+                                <lag-id>ae81</lag-id>
+                                <border-element-v6-subnet>4:1:1::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/2</vlan-id>
+                                <border-element-type>BGF2</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/2</port-id>
+                                <border-element-id>SANBGF2</border-element-id>
+                                <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <vlan-list>
+                                <vlan-id>85.xe-10/0/1</vlan-id>
+                                <border-element-type>BGF1</border-element-type>
+                                <border-element-tangibility>PHYSICAL</border-element-tangibility>
+                                <port-id>xe-10/0/1</port-id>
+                                <border-element-id>SANBGF1</border-element-id>
+                                <border-element-v4-subnet>4.1.2.0/22</border-element-v4-subnet>
+                                <lag-id></lag-id>
+                                <border-element-v6-subnet>4:1:2::0/22</border-element-v6-subnet>
+                            </vlan-list>
+                            <ipe-id>2</ipe-id>
+                        </router-list>
+                    </virtual-datacenter-list>
+                    <service-type>COLLABORATE</service-type>
+                    <interface-status>DISABLE</interface-status>
+                    <customer-id>custid-888</customer-id>
+                    <service-instance-id>SII-2016-10-22-001</service-instance-id>
+                    <provision-type>CUSTOMER</provision-type>
+                    <vni-id>100668</vni-id>
+                </nbnc-response-information>
+            </output>
+        </tag0:RequestData>
+    </sdncadapterworkflow:response-data>
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
+\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/aaiGetResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/aaiGetResponse.xml
new file mode 100644
index 0000000000..c367b5c959
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/GenericFlows/aaiGetResponse.xml
@@ -0,0 +1,33 @@
+<service-instance xmlns="http://org.openecomp.aai.inventory/v11">
+    <service-instance-id>1234</service-instance-id>
+    <service-instance-name>volte-service</service-instance-name>
+    <service-type>testservicetype</service-type>
+    <service-role>testservicerole</service-role>
+    <description>volte service</description>
+    <model-invariant-id>c1d4305f-cdbd-4bbe-9069-a2f4978fd89e</model-invariant-id>
+    <model-version-id>d4df5c27-98a1-4812-a8aa-c17f055b7a3f</model-version-id>
+    <resource-version>1508838121849</resource-version>
+    <orchestration-status>create</orchestration-status>
+    <relationship-list>
+        <relationship>
+            <related-to>service-instance</related-to>
+            <related-link>/aai/v11/business/customers/customer/test_customer/service-subscription/example-service-type/service-instance/1234_1</related-link>
+            <relationship-data>
+                <relationship-key>customer.global-customer-id</relationship-key>
+                <relationship-value>test_customer</relationship-value>
+            </relationship-data>
+            <relationship-data>
+                <relationship-key>service-subscription.service-type</relationship-key>
+                <relationship-value>test_customer</relationship-value>
+            </relationship-data>
+            <relationship-data>
+                <relationship-key>service-instance.service-instance-id</relationship-key>
+                <relationship-value>1234_1</relationship-value>
+            </relationship-data>
+            <related-to-property>
+                <property-key>service-instance.service-instance-name</property-key>
+                <property-value>volte-service_vEPC</property-value>
+            </related-to-property>
+        </relationship>
+    </relationship-list>
+</service-instance>
+\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteCustomE2EService.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteCustomE2EService.json
new file mode 100644
index 0000000000..00663fddc5
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/DeleteCustomE2EService.json
@@ -0,0 +1,5 @@
+{
+ "globalSubscriberId" : "38829939920000",
+  "operationId" : "59960003992",
+  "serviceType" : "VoLTE"
+}
+\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
index 410ba05e5f..d47fbda01c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
@@ -1,12 +1,12 @@
-<output xmlns="org:openecomp:sdnctl:vnf">
-<brg-topology  xmlns="org:openecomp:sdnctl:vnf">
-    <ecomp-model-information>
+<output xmlns="org:onap:sdnctl:vnf">
+<brg-topology  xmlns="org:onap:sdnctl:vnf">
+    <onap-model-information>
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
         <model-version>1.0</model-version>
         <model-name>BRGmodelname</model-name>
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
-    </ecomp-model-information>
+    </onap-model-information>
     <allotted-resource-identifiers>
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
index ac85be4e97..05583cd7aa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
@@ -1,12 +1,12 @@
-<output xmlns="org:openecomp:sdnctl:vnf">
-<tunnelxconn-topology  xmlns="org:openecomp:sdnctl:vnf">
-    <ecomp-model-information>
+<output xmlns="org:onap:sdnctl:vnf">
+<tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">
+    <onap-model-information>
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
         <model-version>1.0</model-version>
         <model-name>TXCmodelname</model-name>
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
-    </ecomp-model-information>
+    </onap-model-information>
     <allotted-resource-identifiers>
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
@@ -16,8 +16,8 @@
     </allotted-resource-identifiers>
     <tunnelxconn-assignments>
     	<vni>my-vni</vni>
-    	<vgmux_bearer_ip>my-bearer-ip</vgmux_bearer_ip>
-    	<vgmux_lan_ip>my-lan-ip</vgmux_lan_ip>
+    	<vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>
+    	<vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>
     </tunnelxconn-assignments>
 </tunnelxconn-topology>
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
index dc4669e8d9..a0168bd96a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json
@@ -31,9 +31,12 @@
 					"subscriptionServiceType":"123456789",
 					"aLaCarte":"false",
 					"userParams":
-						{
-							"BRG_WAN_MAC_Address" : "brgmac"
-						}
+					   [
+    						{
+    							"name":"BRG_WAN_MAC_Address",
+    							"value":"brgmac"
+    						}
+					   ]
 				}
 				
 		}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
index dc9ac49a4e..17c6d15fe7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json
@@ -29,10 +29,13 @@
 				{
 					"subscriptionServiceType":"123456789",
 					"aLaCarte":"false",
-					"userParams":
-						{
-							"BRG_WAN_MAC_Address" : "brgmac"
-						}
+                    "userParams":
+                       [
+                            {
+                                "name":"BRG_WAN_MAC_Address",
+                                "value":"brgmac"
+                            }
+                       ]
 				}
 				
 		}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
index d5b0713d9f..8583e66d33 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json
@@ -29,10 +29,13 @@
 				{
 					"subscriptionServiceType":"123456789",
 					"aLaCarte":"false",
-					"userParams":
-						{
-							"BRG_WAN_MAC_Address" : "brgmac"
-						}
+                    "userParams":
+                       [
+                            {
+                                "name":"BRG_WAN_MAC_Address",
+                                "value":"brgmac"
+                            }
+                       ]
 				}
 				
 		}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
index 4f95ed2f19..e0511873b6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/getSI.xml
@@ -1,43 +1,35 @@
 <service-instance>
 	
    <service-instance-id>MIS/1604/0026/SW_INTERNET</service-instance-id>
-   <resource-version>123456789</resource-version>
-   
-	<allotted-resources>
-		<allotted-resource>
-			<type>TunnelXConn</type>
-			<id>ar-txcA</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>BRG</type>
-			<id>ar-brgB</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>other</type>
-			<id>ar-otherC</id>
-		</allotted-resource>
-	</allotted-resources>
-	
+   <resource-version>123456789</resource-version>	
 	<relationship-list>
       <relationship>
          <related-to>generic-vnf</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfX</related-link>
+         <related-link>/aai/v7/generic-vnf/vnfX</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netA</related-link>
+         <related-link>/aai/v7/l3-network/netA</related-link>
       </relationship>
       <relationship>
          <related-to>generic-vnf</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfY</related-link>
+         <related-link>/aai/v7/generic-vnf/vnfY</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netB</related-link>
+         <related-link>/aai/v7/l3-network/netB</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netC</related-link>
+         <related-link>/aai/v7/l3-network/netC</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-txcA</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/ar-brgB</related-link>
       </relationship>
    </relationship-list>
 </service-instance>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
index dc4669e8d9..99941c99ce 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json
@@ -30,10 +30,13 @@
 				{
 					"subscriptionServiceType":"123456789",
 					"aLaCarte":"false",
-					"userParams":
-						{
-							"BRG_WAN_MAC_Address" : "brgmac"
-						}
+                    "userParams":
+                       [
+                            {
+                                "name":"BRG_WAN_MAC_Address",
+                                "value":"brgmac"
+                            }
+                       ]
 				}
 				
 		}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
index 6071c51b2d..8b8863e29c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/serviceToDelete.xml
@@ -1,38 +1,36 @@
 <service xmlns="http://org.openecomp.aai.inventory/v9">
-	<allotted-resources>
-		<allotted-resource>
-			<type>TunnelXConn</type>
-			<id>txcA</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>BRG</type>
-			<id>brgB</id>
-		</allotted-resource>
-		<allotted-resource>
-			<type>other</type>
-			<id>otherC</id>
-		</allotted-resource>
-	</allotted-resources>
 	<relationship-list>
       <relationship>
          <related-to>generic-vnf</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfX</related-link>
+         <related-link>/aai/v7/generic-vnf/vnfX</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netA</related-link>
+         <related-link>/aai/v7/l3-network/netA</related-link>
       </relationship>
       <relationship>
          <related-to>generic-vnf</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/generic-vnf/vnfY</related-link>
+         <related-link>/aai/v7/generic-vnf/vnfY/</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netB</related-link>
+         <related-link>/aai/v7/l3-network/netB</related-link>
       </relationship>
       <relationship>
          <related-to>l3-network</related-to>
-         <related-link>https://aai-ext1.test.com:8443/aai/v7/l3-network/netC</related-link>
+         <related-link>/aai/v7/l3-network/netC</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/anytxc</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/anybrg</related-link>
+      </relationship>
+      <relationship>
+         <related-to>allotted-resource</related-to>
+         <related-link>/aai/v11/other</related-link>
       </relationship>
    </relationship-list>
 </service>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
index 410ba05e5f..d47fbda01c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
@@ -1,12 +1,12 @@
-<output xmlns="org:openecomp:sdnctl:vnf">
-<brg-topology  xmlns="org:openecomp:sdnctl:vnf">
-    <ecomp-model-information>
+<output xmlns="org:onap:sdnctl:vnf">
+<brg-topology  xmlns="org:onap:sdnctl:vnf">
+    <onap-model-information>
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
         <model-version>1.0</model-version>
         <model-name>BRGmodelname</model-name>
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
-    </ecomp-model-information>
+    </onap-model-information>
     <allotted-resource-identifiers>
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml
index 6f86e0fb86..c86d9cf77f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml
@@ -20,7 +20,7 @@
 	<service-information>
 	<service-id></service-id>
 	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
+	<onap-model-information></onap-model-information>
 	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
 	<subscriber-name/>
 	<global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
 	<allotted-resource-id>arId-1</allotted-resource-id>
 	<allotted-resource-type>brg</allotted-resource-type>
 	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
+	<onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-	</ecomp-model-information>
+	</onap-model-information>
 	</allotted-resource-information>
 	<brg-request-input>
 	<source-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml
index 30d4c7ae49..4fe8bbcbde 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml
@@ -20,7 +20,7 @@
 	<service-information>
 	<service-id></service-id>
 	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
+	<onap-model-information></onap-model-information>
 	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
 	<subscriber-name/>
 	<global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
 	<allotted-resource-id>arId-1</allotted-resource-id>
 	<allotted-resource-type>brg</allotted-resource-type>
 	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
+	<onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-	</ecomp-model-information>
+	</onap-model-information>
 	</allotted-resource-information>
 	<brg-request-input>
 	<source-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml
index e20850a7b9..7320038de4 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml
@@ -20,7 +20,7 @@
 	<service-information>
 	<service-id></service-id>
 	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
+	<onap-model-information></onap-model-information>
 	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
 	<subscriber-name/>
 	<global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
 	<allotted-resource-id>arId-1</allotted-resource-id>
 	<allotted-resource-type>brg</allotted-resource-type>
 	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
+	<onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-	</ecomp-model-information>
+	</onap-model-information>
 	</allotted-resource-information>
 	<brg-request-input>
 	<source-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
index ac85be4e97..05583cd7aa 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
@@ -1,12 +1,12 @@
-<output xmlns="org:openecomp:sdnctl:vnf">
-<tunnelxconn-topology  xmlns="org:openecomp:sdnctl:vnf">
-    <ecomp-model-information>
+<output xmlns="org:onap:sdnctl:vnf">
+<tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">
+    <onap-model-information>
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>
         <model-version>1.0</model-version>
         <model-name>TXCmodelname</model-name>
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>
-    </ecomp-model-information>
+    </onap-model-information>
     <allotted-resource-identifiers>
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>
@@ -16,8 +16,8 @@
     </allotted-resource-identifiers>
     <tunnelxconn-assignments>
     	<vni>my-vni</vni>
-    	<vgmux_bearer_ip>my-bearer-ip</vgmux_bearer_ip>
-    	<vgmux_lan_ip>my-lan-ip</vgmux_lan_ip>
+    	<vgmux-bearer-ip>my-bearer-ip</vgmux-bearer-ip>
+    	<vgmux-lan-ip>my-lan-ip</vgmux-lan-ip>
     </tunnelxconn-assignments>
 </tunnelxconn-topology>
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml
index efec7eb001..6d2edbe9d6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml
@@ -20,7 +20,7 @@
 	<service-information>
 	<service-id></service-id>
 	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
+	<onap-model-information></onap-model-information>
 	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
 	<subscriber-name/>
 	<global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
 	<allotted-resource-id>arId-1</allotted-resource-id>
 	<allotted-resource-type>tunnelxconn</allotted-resource-type>
 	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
+	<onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-	</ecomp-model-information>
+	</onap-model-information>
 	</allotted-resource-information>
 	<tunnelxconn-request-input>
 	<source-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml
index 9f52758750..d33fadb427 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml
@@ -20,7 +20,7 @@
 	<service-information>
 	<service-id></service-id>
 	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
+	<onap-model-information></onap-model-information>
 	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
 	<subscriber-name/>
 	<global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
 	<allotted-resource-id>arId-1</allotted-resource-id>
 	<allotted-resource-type>tunnelxconn</allotted-resource-type>
 	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
+	<onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-	</ecomp-model-information>
+	</onap-model-information>
 	</allotted-resource-information>
 	<tunnelxconn-request-input>
 	<source-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml
index 025195e326..4a90f1a573 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml
@@ -20,7 +20,7 @@
 	<service-information>
 	<service-id></service-id>
 	<subscription-service-type></subscription-service-type>
-	<ecomp-model-information></ecomp-model-information>
+	<onap-model-information></onap-model-information>
 	<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
 	<subscriber-name/>
 	<global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
 	<allotted-resource-id>arId-1</allotted-resource-id>
 	<allotted-resource-type>tunnelxconn</allotted-resource-type>
 	<parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-	<ecomp-model-information>
+	<onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-	</ecomp-model-information>
+	</onap-model-information>
 	</allotted-resource-information>
 	<tunnelxconn-request-input>
 	<source-network>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
index 11022f6aec..b579f232b1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
@@ -1,4 +1,4 @@
-	<output xmlns="org:openecomp:sdnctl:vnf">
+	<output xmlns="org:onap:sdnctl:vnf">
 		<vnf-information>
 			<vnf-id>skask</vnf-id>			
 		</vnf-information>
@@ -13,4 +13,4 @@
 		<instance-reference>
 			<object-path>restconf/SDNCObjectPath</object-path>
 		</instance-reference>
-	</output>
-\ No newline at end of file
+	</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
index acea1459bc..3cf0c81c72 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
@@ -1,4 +1,4 @@
-<output xmlns="org:openecomp:sdnctl:vnf">
+<output xmlns="org:onap:sdnctl:vnf">
 	<vnf-information>
 		<vnf-id>skask</vnf-id>
 	</vnf-information>
@@ -10,4 +10,4 @@
 		<service-instance-id>0</service-instance-id>
 		<service-type>SDN-MOBILITY</service-type>
 	</service-information>
-</output>
-\ No newline at end of file
+</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
index bf2b3c0882..df5004edf5 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
@@ -1,4 +1,4 @@
-<output xmlns="org:openecomp:sdnctl:vnf">
+<output xmlns="org:onap:sdnctl:vnf">
 	<vnf-information>
 		<vnf-id>skask</vnf-id>
 	</vnf-information>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
index 11022f6aec..b579f232b1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
@@ -1,4 +1,4 @@
-	<output xmlns="org:openecomp:sdnctl:vnf">
+	<output xmlns="org:onap:sdnctl:vnf">
 		<vnf-information>
 			<vnf-id>skask</vnf-id>			
 		</vnf-information>
@@ -13,4 +13,4 @@
 		<instance-reference>
 			<object-path>restconf/SDNCObjectPath</object-path>
 		</instance-reference>
-	</output>
-\ No newline at end of file
+	</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
index 50a71c110e..13f675cd43 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
@@ -5,13 +5,13 @@
 		<vf-module-type>vSAMP10aDEV::base::module-0</vf-module-type>
 		<vf-module-name>zmtn6nf-code-111_base_0</vf-module-name>
 	</vf-module-topology-identifier>
-	<ecomp-model-information>
+	<onap-model-information>
 		<model-name>vSAMP10aDEV::base::module-0</model-name>
 		<model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>
 		<model-version>ff2ae348-214a-11e7-93ae-92361f002673</model-version>
 		<model-invariant-uuid>3a97db99-c4bb-498a-a13a-38f65f1ced3d</model-invariant-uuid>
 		<model-uuid>ff2ae348-214a-11e7-93ae-92361f002673</model-uuid>
-	</ecomp-model-information>
+	</onap-model-information>
 	<tenant>19123c2924c648eb8e42a3c1f14b7682</tenant>
 	<aic-cloud-region>mtn6</aic-cloud-region>
 	<aic-clli>AUSTTXGR</aic-clli>		
@@ -78,4 +78,4 @@
 				</vms>
 			</vf-module-assignments>				
 </vf-module-topology>
-</output>
-\ No newline at end of file
+</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
index bc2c7b9e63..dfb1986057 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
@@ -9,13 +9,13 @@
 		<vnf-id>eac30f85-f61f-4c5f-862e-2c62f9e135de</vnf-id>
 		<vnf-type>null</vnf-type>
 	</vnf-topology-identifier-structure>
-	<ecomp-model-information>
+	<onap-model-information>
 		<model-name>vSAMP10a_macro</model-name>
 		<model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>
 		<model-version>1.0</model-version>
 		<model-invariant-uuid>ef176121-f02c-4dd3-927c-22131d48446b</model-invariant-uuid>
 		<model-uuid>ff2ae348-214a-11e7-93ae-92361f002672</model-uuid>
-	</ecomp-model-information>
+	</onap-model-information>
 	<vnf-resource-assignments>			
 			<vnf-networks>
 					<network-role>mog_exn</network-role>
@@ -79,4 +79,4 @@
 	<aic-cloud-region>mtn6</aic-cloud-region>
 	<aic-clli>AUSTTXGR</aic-clli>
 </vnf-topology>
-</output>
-\ No newline at end of file
+</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
index 11022f6aec..b579f232b1 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
@@ -1,4 +1,4 @@
-	<output xmlns="org:openecomp:sdnctl:vnf">
+	<output xmlns="org:onap:sdnctl:vnf">
 		<vnf-information>
 			<vnf-id>skask</vnf-id>			
 		</vnf-information>
@@ -13,4 +13,4 @@
 		<instance-reference>
 			<object-path>restconf/SDNCObjectPath</object-path>
 		</instance-reference>
-	</output>
-\ No newline at end of file
+	</output>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
index 8a557c433a..325ee3ce97 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -14,7 +14,7 @@ mso.healthcheck.log.debug=false
 mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
 mso.workflow.message.endpoint=http://localhost:8080/mso/WorkflowMessage
 mso.adapters.db.endpoint=http://localhost:28090/dbadapters/MsoRequestsDbAdapter
-mso.openecomp.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
+mso.adapters.openecomp.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
 mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
 
 mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter
@@ -40,6 +40,8 @@ mso.sdnc.timeout.ucpe.async.hours=120
 mso.sdnc.timeout.ucpe.async.minutes=5
 mso.workflow.message.endpoint=http://localhost:28080/mso/WorkflowMesssage
 mso.workflow.sdncadapter.callback=http://localhost:28080/mso/SDNCAdapterCallbackService
+mso.workflow.sdnc.replication.delay=PT0.01S
+mso.workflow.aai.distribution.delay=PT0.01S
 
 mso.catalog.db.endpoint=http://localhost:28090
 
diff --git a/bpmn/MSOURN-plugin/build.properties b/bpmn/MSOURN-plugin/build.properties
deleted file mode 100644
index 7e5fb9f22f..0000000000
--- a/bpmn/MSOURN-plugin/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copy this file to 'build.properties' and modify it to match your system
-# Alternatively, you can also copy it to '${user.home}/.camunda/build.properties'
-# to have a central configuration that works with all camunda BPM projects
-
-# Defines the deployment folder in a camunda BPM installation (backslashes need to be escaped or replaced by forward slashes).
-#deploy.jboss.dir=C:/camunda/camunda-bpm-jboss-7.3.0/server/jboss-as-${jboss-version}/standalone/deployments
-deploy.jboss.dir=C:/D2/jboss-ee/server/jboss-as-7.2.0.Final/standalone/deployments
-\ No newline at end of file
diff --git a/bpmn/MSOURN-plugin/build.xml b/bpmn/MSOURN-plugin/build.xml
deleted file mode 100644
index f2dbc55e52..0000000000
--- a/bpmn/MSOURN-plugin/build.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="urnMap-plugin" default="deploy.jboss">
-
-	<property file="build.properties" />
-	<property file="${user.home}/.camunda/build.properties" />
-	<property name="target.dir" value="target" />
-
-	<condition property="mvn.executable" value="mvn.bat" else="mvn">
-		<os family="windows"/>
-	</condition>
-
-	<target name="deploy.jboss" depends="package.mvn, install.cockpit.plugin" description="Copies the cockit plugin to the deployment directory defined in '${basedir}/build.properties' or '${user.home}/.camunda/build.properties'" />
-
-	<target name="deploy.tomcat" depends="package.mvn" description="Copies the cockpit plugin to the deployment directory defined in '${basedir}/build.properties' or '${user.home}/.camunda/build.properties'">
-		<fail unless="deploy.tomcat.dir" message="No deployment folder has been configured. Please copy the file '${basedir}/build.properties.example' to '${basedir}/build.properties' or '${user.home}/.camunda/build.properties' and change it according to your environment." />
-		<copy file="${target.dir}/${ant.project.name}.jar" todir="${deploy.tomcat.dir}/camunda/WEB-INF/lib" />
-		<touch file="${deploy.tomcat.dir}/camunda/WEB-INF/web.xml"/>
-	</target>
-
-	<target name="package.mvn">
-		<exec executable="${mvn.executable}" dir="." failonerror="true">
-			<env key="MAVEN_OPTS" value="-Xmx1024m -Xms512m -DskipTests=true -Dmaven.test.skip=true" />
-			<arg line="clean package" />
-		</exec>
-	</target>
-
-	<target name="install.cockpit.plugin">
-		<fail unless="deploy.jboss.dir" message="No deployment folder has been configured. Please copy the file '${basedir}/build.properties.example' to '${basedir}/build.properties' or '${user.home}/.camunda/build.properties' and change it according to your environment." />
-		<path id="cockpit.file.id"> 
-			<fileset dir="${deploy.jboss.dir}"> 
-				<include name="camunda-webapp-*.war"/> 
-			</fileset> 
-		</path> 
-		<property name="cockpit.file" refid="cockpit.file.id"/> 
-		<war destfile="${cockpit.file}" update="true">
-			<zipfileset file="${target.dir}/${ant.project.name}.jar" fullpath="WEB-INF/lib/${ant.project.name}.jar" />
-		</war>
-	</target>
-
-	<target name="undeploy.jboss" description="Deletes the cockpit plugin from the deployment directory defined in '${basedir}/build.properties' or '${user.home}/.camunda/build.properties'">
-		<path id="cockpit.file.id"> 
-			<fileset dir="${deploy.jboss.dir}"> 
-				<include name="camunda-webapp-*.war"/> 
-			</fileset> 
-		</path> 
-		<property name="cockpit.file" refid="cockpit.file.id"/>
-		<basename property="cockpit.filename" file="${cockpit.file}"/>
-		<move file="${cockpit.file}" todir="${java.io.tmpdir}"/>
-		<zip destfile="${cockpit.file}">
-			<zipfileset src="${java.io.tmpdir}/${cockpit.filename}">
-				<exclude name="WEB-INF/lib/${ant.project.name}.jar"/>
-			</zipfileset>
-		</zip>
-	</target>
-
-	<target name="undeploy.tomcat" description="Deletes the cockpit plugin from the deployment directory defined in '${basedir}/build.properties' or '${user.home}/.camunda/build.properties'">
-		<delete file="${deploy.tomcat.dir}/camunda/WEB-INF/lib/${ant.project.name}.jar" />
-	</target>
-
-</project>
diff --git a/bpmn/MSOURN-plugin/pom.xml b/bpmn/MSOURN-plugin/pom.xml
deleted file mode 100644
index 40dcd1f666..0000000000
--- a/bpmn/MSOURN-plugin/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.openecomp.so</groupId>
-		<artifactId>bpmn</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.openecomp.so</groupId>
-	<artifactId>cockpit-urnmap-plugin</artifactId>
-
-	<packaging>jar</packaging>
-
-	<name>MSO URN Mapping Cockpit Plugin</name>
-
-	<dependencies>
-		<dependency>
-		    <groupId>org.camunda.bpm.webapp</groupId>
-            <artifactId>camunda-webapp</artifactId>
-            <classifier>classes</classifier>
-            <version>${camunda.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-fileupload</groupId>
-					<artifactId>commons-fileupload</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.2</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0</version>
-		</dependency>
-		<!--  TODO Upate it to ee version -->
-		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine</artifactId>
-			<version>${camunda.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.so</groupId>
-			<artifactId>common</artifactId>
-			<version>${project.version}</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
deleted file mode 100644
index 60d65665fe..0000000000
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
+++ /dev/null
@@ -1,89 +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.openecomp.camunda.bpmn.plugin.urnmap.db;
-
-import org.camunda.bpm.engine.ProcessEngineConfiguration;
-import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.camunda.bpm.engine.impl.cfg.StandaloneProcessEngineConfiguration;
-import org.camunda.bpm.engine.impl.interceptor.CommandContextInterceptor;
-import org.camunda.bpm.engine.impl.interceptor.CommandInterceptor;
-import org.camunda.bpm.engine.impl.interceptor.LogInterceptor;
-import org.camunda.bpm.engine.impl.util.ReflectUtil;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class MyBatisExtendedSessionFactory extends StandaloneProcessEngineConfiguration {
-
-  private String resourceName;
-
-  @Override
-  protected void init() {
-    throw new IllegalArgumentException(
-            "Normal 'init' on process engine only used for extended MyBatis mappings is not allowed, please use 'initFromProcessEngineConfiguration'. You cannot construct a process engine with this configuration.");
-  }
-
-  /**
-   * initialize the {@link ProcessEngineConfiguration} from an existing one,
-   * just using the database settings and initialize the database / MyBatis
-   * stuff.
-   */
-  public void initFromProcessEngineConfiguration(ProcessEngineConfigurationImpl processEngineConfiguration, String resourceName) {
-    this.resourceName = resourceName;
-
-    setDatabaseType(processEngineConfiguration.getDatabaseType());
-    setDataSource(processEngineConfiguration.getDataSource());
-    setDatabaseTablePrefix(processEngineConfiguration.getDatabaseTablePrefix());
-
-    initDataSource();
-    initCommandContextFactory();
-    initTransactionFactory();
-    initTransactionContextFactory();
-    initCommandExecutors();
-    initSqlSessionFactory();
-    initIncidentHandlers();
-    initIdentityProviderSessionFactory();
-    initSessionFactories();
-  }
-
-  /**
-   * In order to always open a new command context set the property
-   * "alwaysOpenNew" to true inside the CommandContextInterceptor.
-   *
-   * If you execute the custom queries inside the process engine
-   * (for example in a service task), you have to do this.
-   */
-  @Override
-  protected Collection<? extends CommandInterceptor> getDefaultCommandInterceptorsTxRequired() {
-    List<CommandInterceptor> defaultCommandInterceptorsTxRequired = new ArrayList<>();
-    defaultCommandInterceptorsTxRequired.add(new LogInterceptor());
-    defaultCommandInterceptorsTxRequired.add(new CommandContextInterceptor(commandContextFactory, this, true));
-    return defaultCommandInterceptorsTxRequired;
-  }
-
-  @Override
-  protected InputStream getMyBatisXmlConfigurationSteam() {
-    return ReflectUtil.getResourceAsStream(resourceName);
-  }
-
-}
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisQueryCommandExecutor.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisQueryCommandExecutor.java
deleted file mode 100644
index f81d8c604d..0000000000
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisQueryCommandExecutor.java
+++ /dev/null
@@ -1,44 +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.openecomp.camunda.bpmn.plugin.urnmap.db;
-
-import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.camunda.bpm.engine.impl.interceptor.Command;
-
-/**
- * Helper to initialize a minimized process engine which does all the transaction and MyBatis mapping stuff for us
- * and can be used to execute queries.
- */
-public class MyBatisQueryCommandExecutor {
-  
-  private MyBatisExtendedSessionFactory myBatisExtendedSessionFactory;
-
-  public MyBatisQueryCommandExecutor(ProcessEngineConfigurationImpl processEngineConfiguration, String mappingResourceName) {
-    myBatisExtendedSessionFactory = new MyBatisExtendedSessionFactory();
-    myBatisExtendedSessionFactory.initFromProcessEngineConfiguration(processEngineConfiguration, mappingResourceName);
-  }
-  
-  public <T> T executeQueryCommand(Command<T> command) {
-	return myBatisExtendedSessionFactory.getCommandExecutorTxRequired().execute(command);
-  }
-  
-  
-}
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNService.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNService.java
deleted file mode 100644
index 1eb0ba6f97..0000000000
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNService.java
+++ /dev/null
@@ -1,49 +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.openecomp.camunda.bpmn.plugin.urnmap.db;
-
-import java.util.List;
-
-import org.camunda.bpm.engine.ProcessEngines;
-import org.camunda.bpm.engine.impl.ProcessEngineImpl;
-import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.camunda.bpm.engine.impl.interceptor.Command;
-import org.camunda.bpm.engine.impl.interceptor.CommandContext;
-
-public class URNService {
-
-
-  public List<URNData> getProperties() {
-    ProcessEngineImpl processEngine = (ProcessEngineImpl) ProcessEngines.getDefaultProcessEngine();
-    ProcessEngineConfigurationImpl processEngineConfiguration = processEngine.getProcessEngineConfiguration();
-
-    MyBatisQueryCommandExecutor commandExecutor = new MyBatisQueryCommandExecutor(processEngineConfiguration, "mappings.xml");
-    return commandExecutor.executeQueryCommand(new Command<List<URNData>>() {
-
-      @SuppressWarnings("unchecked")
-      @Override
-      public List<URNData> execute(CommandContext commandContext) {
-        return (List<URNData>) commandContext.getDbSqlSession().selectList("retrieveUrnKeyValuePair", null);
-      }
-    });
-  }
-
-}
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java
deleted file mode 100644
index 5cf6f6ca05..0000000000
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java
+++ /dev/null
@@ -1,101 +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.openecomp.camunda.bpmn.plugin.urnmap.resources;
-
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.camunda.bpm.cockpit.db.QueryParameters;
-import org.camunda.bpm.cockpit.plugin.resource.AbstractPluginResource;
-import org.camunda.bpm.cockpit.db.CommandExecutor;
-import org.openecomp.camunda.bpmn.plugin.urnmap.db.*;
-
-public class ProcessInstanceResource extends AbstractPluginResource {
-
-  private static final Logger log = LoggerFactory.getLogger(ProcessInstanceResource.class);
-
-  public ProcessInstanceResource(String engineName) {
-    super(engineName);
-  }
-
-  @GET
-  public List<URNData> getUrnDataMap() {    
-    List<URNData> list = getQueryService()
-            .executeQuery(
-                    "cockpit.urnMap.retrieveUrnKeyValuePair",
-                    new QueryParameters<URNData>());
-    
-    log.info("urnmap-plugin project - Results Retrieved: ");
-    log.info("URNName: " + "		" + "URNValue: " );
-    for(URNData d: list)
-    {
-    	log.info(  d.getURNName() + "		"  + d.getURNValue());
-    }
-   
-    return list;
-  }
-  
-  @PUT
-  //public void insertNewRow(String key_, String value_) 
-  public void insertNewRow(String temp) 
-   {  
- 	 log.info("AddNewRow: XXXXXXXXXXXXXXXXX ---> " + temp);
- 	 StringTokenizer st = new StringTokenizer(temp, "|");
- 	 String key_ = "";
- 	 String value_ = "";
- 	 
- 	 while(st.hasMoreTokens()) { 
- 		  key_ = st.nextToken(); 
- 		  value_ = st.nextToken(); 
- 		 System.out.println(key_ + "\t" + value_); 
- 		 } 
-  			 
- 	  log.info("AddNewRow: XXXXXXXXXXXXXXXXX ---> key: " + key_ + " , Value: " + value_);
- 	  URNData nRow = new URNData();
- 	  nRow.setVer_("1"); 	 
- 	  nRow.setURNName(key_);
- 	  nRow.setURNValue(value_);
- 	  
- 	 getQueryService().executeQuery("cockpit.urnMap.insertNewRow", nRow, URNData.class);
- 	 
- 	 log.info("AddNewRow: XXXXXX    END   XXXXXXXXXXX");
-   }
-  
-  @POST
- // public void getPersistData(List<URNData > myList) {  
-  public void getPersistData(URNData d) {  
-	  
-	  log.info("getPersistData:  UrnName: " + d.getURNName() + " , URNValue: " + d.getURNValue() );
-	    
- 	    	getQueryService().executeQuery("cockpit.urnMap.persistURNData", d, URNData.class);
- 	    	//getQueryService().executeQuery("cockpit.sample.persistURNData", d, ProcessInstanceCountDto.class);
-	     
-	    	    
-	    log.info("XXXXXXXXXX - END - XXXXXXXXXXXXXXX");
-  	}
-}
diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
deleted file mode 100644
index 938b9d377f..0000000000
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
+++ /dev/null
@@ -1,239 +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.openecomp.camunda.bpmn.plugin.urnmap.resources;
-/***
-import java.beans.Statement;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-*/
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-
-import org.camunda.bpm.cockpit.db.QueryParameters;
-import org.camunda.bpm.cockpit.plugin.resource.AbstractCockpitPluginResource;
-
-
-//import org.camunda.bpm.cockpit.plugin.resource.AbstractPluginResource;
-import org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData;
-import org.openecomp.mso.logger.MsoLogger;
-
-
-//public class ProcessInstanceResource extends AbstractPluginResource {
-public class URNResource extends AbstractCockpitPluginResource{
-  public URNResource(String engineName) {
-    super(engineName);
-  }
-  
-  private Connection conn;
-  private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
-  @GET
-  public List<URNData> getUrnDataMap() 
-  {  
-	  List<URNData> list = new ArrayList();
-	  PreparedStatement psData = null;
-	  try {
-			
-		    conn = getDBConnection();
-			psData = conn
-						.prepareStatement("select * from MSO_URN_MAPPING order by NAME_");
-			    
-			    ResultSet r = psData.executeQuery();
-			    
-				while(r.next()) 
-				{
-					URNData d = new URNData();
-					d.setURNName(r.getString("NAME_"));
-					d.setURNValue(r.getString("VALUE_"));
-					d.setVer_( r.getString("REV_"));
-					
-					list.add(d);					
-				}
-				
-		} catch (Exception e) 
-		{
-			msoLogger.debug("Exception in getUrnDataMap ", e);			
-		} finally {
-			if(psData != null){
-				try {
-					psData.close();
-					conn.close();
-				} catch (SQLException e) {
-					msoLogger.debug("Exception while closing the PreparedStatement: ", e);
-				}
-			}
-			if(conn != null){
-				try {
-					conn.close();
-				} catch (SQLException e) {
-					msoLogger.debug("Exception while closing the connection: ", e);
-				}
-			}
-		}
-     
-    for(URNData d: list)
-    {
-    	msoLogger.debug(  d.getURNName() + "		"  + d.getURNValue());
-    	//msoLogger.debug("Started Executing " + getTaskName());
-    	msoLogger.debug("Started Executing " + d.getURNName() + " " + d.getURNValue());
-    }
-   
-    return list;
-  }
-  
-  public List<URNData> getUrnDataMapOLD() 
-  {  
-	  
-    List<URNData> list = getQueryService()
-            .executeQuery("cockpit.urnMap.retrieveUrnKeyValuePair", new QueryParameters<URNData>());
-    
-    msoLogger.debug("urnmap-plugin project - Results Retrieved: ");
-    msoLogger.debug("URNName: " + "		" + "URNValue: " );
-    
-    for(URNData d: list)
-    {
-    	msoLogger.debug( d.getURNName() + "		"  + d.getURNValue());
-    }
-   
-    return list;
-  }
-  
-  public Connection getDBConnection()
-  {
-	  try {
-			
-			if(conn == null)
-			{
-				Context ctx = new InitialContext();
-			    DataSource ds = (DataSource)ctx.lookup("java:jboss/datasources/ProcessEngine");//jboss
-		    	conn =			ds.getConnection();
-	 
-			}			 
-			
-		} catch (Exception e) 
-		{
-			msoLogger.debug("Exception in DBConnection ", e);
-		}
-	  
-	  return conn;
-  }
-  
-  @PUT
-  public void insertNewRow(String temp) 
-   {  
- 	 msoLogger.debug("AddNewRow: XXXXXXXXXXXXXXXXX ---> " + temp);
- 	 msoLogger.debug("AddNewRow: EngineName  ---> " + engineName);
- 	 
- 	 StringTokenizer st = new StringTokenizer(temp, "|");
- 	 String key_ = "";
- 	 String value_ = "";
- 	 
- 	 while(st.hasMoreTokens()) { 
- 		  key_ = st.nextToken(); 
- 		  value_ = st.nextToken(); 
- 		 msoLogger.debug(key_ + "\t" + value_); 
- 		 } 
-  			 
-       msoLogger.debug("AddNewRow: XXXXXXXXXXXXXXXXX ---> key: " + key_ + " , Value: " + value_);
- 	  final URNData nRow = new URNData();
- 	  nRow.setVer_("1");
- 	  PreparedStatement psData = null;
-	  
-		msoLogger.debug("----------- START ----------------------");
-		try {
-			
-  		    conn = getDBConnection();
-			psData = conn
-						.prepareStatement("Insert into MSO_URN_MAPPING values ('" + key_ + "', '" + value_  + "', '1')");
-			    
-			    psData.executeUpdate();		 
-			
-		} catch (Exception e) 
-		{
-			msoLogger.debug("Exception in insertNewRow ", e);
-		}finally {
-			if(psData != null){
-				try {
-					psData.close();
-					conn.close();
-				} catch (SQLException e) {
-					msoLogger.debug("Exception while closing the PreparedStatement: ", e);
-				}
-			}
-			if(conn != null){
-				try {
-					conn.close();
-				} catch (SQLException e) {
-					msoLogger.debug("Exception while closing the connection: ", e);
-				}
-			}
-		}
- 	// getQueryService().executeQuery("cockpit.urnMap.insertNewRow", nRow, URNData.class);
-   }
-  
-  @POST
-  public void getPersistData(URNData d) {  
-	  
-	    	//getQueryService().executeQuery("cockpit.urnMap.persistURNData", d, URNData.class);
- 	    PreparedStatement psData = null;
-	  try {
-			
-		    conn = getDBConnection();
-			psData = conn
-						.prepareStatement("UPDATE MSO_URN_MAPPING set VALUE_ ='"+ d.getURNValue() + "' WHERE NAME_='" + d.getURNName() + "'");
-			    
-			    psData.executeUpdate();
-			   
-		} catch (Exception e) 
-		{
-			msoLogger.debug("Exception in PersistData ", e);
-		}finally {
-			if(psData != null){
-				try {
-					psData.close();
-					conn.close();
-				} catch (SQLException e) {
-					msoLogger.debug("Exception while closing the PreparedStatement: ", e);
-				}
-			}
-			if(conn != null){
-				try {
-					conn.close();
-				} catch (SQLException e) {
-					msoLogger.debug("Exception while closing the connection: ", e);
-				}
-			}
-		}
-	 
-  	}
-}
diff --git a/bpmn/MSOURN-plugin/src/main/resources/META-INF/services/org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin b/bpmn/MSOURN-plugin/src/main/resources/META-INF/services/org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin
deleted file mode 100644
index 9a5055af22..0000000000
--- a/bpmn/MSOURN-plugin/src/main/resources/META-INF/services/org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.camunda.bpm.plugin.urnmap.URNMapPlugin
-\ No newline at end of file
diff --git a/bpmn/MSOURN-plugin/src/main/resources/mappings.xml b/bpmn/MSOURN-plugin/src/main/resources/mappings.xml
deleted file mode 100644
index c66704ed15..0000000000
--- a/bpmn/MSOURN-plugin/src/main/resources/mappings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
-
-<configuration>
-	<settings>
-		<setting name="lazyLoadingEnabled" value="false" />
-	</settings>
-	<mappers>
-        <mapper resource="org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml" />
-	</mappers>
-</configuration>
diff --git a/bpmn/MSOURN-plugin/src/main/resources/org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml b/bpmn/MSOURN-plugin/src/main/resources/org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml
deleted file mode 100644
index d0b58618e4..0000000000
--- a/bpmn/MSOURN-plugin/src/main/resources/org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="cockpit.urnMap">
-  <resultMap id="urnDataMap" type="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
-    <result property="URNName" column="URNNAME" jdbcType="VARCHAR"/>
-    <result property="URNValue" column="URNVALUE" jdbcType="VARCHAR" />
-  </resultMap>
-
-  <select id="retrieveUrnKeyValuePair" resultMap="urnDataMap">
-    select NAME_ URNName, VALUE_ URNValue from MSO_URN_MAPPING
-  </select>
-
-
-  <!-- INSERT cockpit.InsertURNData  keyProperty="NAME_" -->
-  <resultMap id="insertNewRow" type="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
-    <result property="URNName" 	  column="NAME_" 	jdbcType="VARCHAR" />
-    <result property="URNValue"   column="VALUE_"   jdbcType="VARCHAR" />
-    <result property="1" 	      column="REV_" 	jdbcType="INTEGER"/>
-  </resultMap>
-  
-	<insert id="insertNewRow" parameterType="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
-	    insert into MSO_URN_MAPPING (NAME_, VALUE_, REV_) 
-	    values (
-	    			#{URNName}, #{URNValue}, 1
-	          )
-	</insert>
-	
-<!-- UPDATE cockpit.InsertURNData -->
-  <resultMap id="saveURNMappingDataMap" type="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
-    <result property="URNName" 	column="NAME_" 	jdbcType="VARCHAR" />
-    <result property="URNValue"   column="VALUE_" jdbcType="VARCHAR" />
-    <result property="1" 	    column="REV_" 	jdbcType="INTEGER"/>
-  </resultMap>
-  
-  <update id="persistURNData">
-  update  MSO_URN_MAPPING set
-    NAME_ = #{URNName},
-    VALUE_ = #{URNValue},
-    REV_ = 1
-    where NAME_=#{URNName}
-</update>
-</mapper>
diff --git a/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/app/dashboard.html b/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/app/dashboard.html
deleted file mode 100644
index cc794e5518..0000000000
--- a/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/app/dashboard.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<div class="form-group container">  
-	<form novalidate="novalidate" class="simple-form" name="urnMapper"> 		  
-		<div class="panel panel-default">  
-			<div class="panel-heading" style="padding:3px;background:#871020 !important;color:#fff"> <h3 style="margin:1px" class="heading">Process Engine - URN Mapping</h3></div>
-			<div class="panel-body">
-				<div class="well">
-					<div class="input-group well" style="padding:5px">					
-						<input id="new_key" class="form-control input-md"  placeholder="New URN Key"   size="25" type="text"  name="URNName"  value="" ng-blur="enableAddRowBtn()">
-						<span class="input-group-btn" style="width:0px;"></span>
-						<input type="text" class="form-control input-md" size="55" style="margin-left:-1px" id="new_value" placeholder="New URN Value"  name="URNValue" />
-						<span class="input-group-btn" style="width:0px;"></span>				
-						<span class="input-group-btn">
-							<button class="btn btn-primary" type="button" id="addRow_BTN" data-ng-click="addNewRow(); setTimeout( retrieveData(), 1000);" disabled data-original-title="" title="">Add!</button>
-						</span>
-					</div>
-					<div>
-					  <table cellpadding="0" cellspacing="0" class="table responsive" widht="100%">
-						<tbody>        
-						  <tr data-ng-repeat="urnData in UrnDataMap">       
-							 <td>
-								<div class="input-group">
-								  <input id="{{ urnData.urnname }}_key" type="text"  style="border:0px solid #bfbfbf" size="25" class="form-control input-md" ng-blur="SaveRow( urnData )" value="{{ urnData.urnName }}" data-ng-model= "urnData.urnname" data-ng-change="enableButton(urnData)"/>
-								  <span class="input-group-btn" style="width:0px;"></span>
-								  <input id="{{ urnData.urnname }}_value" type="text" style="border:0px solid #dfdfdf;border-left:1px solid #bfbfbf" size="55" class="form-control input-md" ng-blur="SaveRow( urnData )" value="{{ urnData.urnvalue }}" data-ng-model="urnData.urnvalue" data-ng-change="enableButton(urnData)"/>
-								  <span class="input-group-btn">
-									<button disabled="true" class="btn btn-primary" type="button" id="btn_{{ urnData.urnname }}_key" data-ng-click="SaveRow( urnData ); setTimeout( retrieveData(), 1000);">
-										<span class="glyphicon glyphicon-floppy-disk"></span>
-									</button>
-								  </span>
-								</div><!-- /input-group -->
-							 </td>      
-							 <!-- 
-							<td><button id="btn_{{ urnData.urnname }}_key" data-ng-click="SaveRow( urnData )" disabled>SaveRecord</button> </td>
-							 -->
-						  </tr>       
-						</tbody>
-					  </table>	
-					</div>
-				</div>
-			</div>
-		</div>
-	</form>
-</div>
diff --git a/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/app/plugin.js b/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/app/plugin.js
deleted file mode 100644
index 702f6cd3f5..0000000000
--- a/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/app/plugin.js
+++ /dev/null
@@ -1,132 +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=========================================================
- */
-
-define(['angular'], function(angular) {
-
-  var DashboardController = ["$scope", "$http", "Uri", function($scope, $http, Uri) {
-
-    $http.get(Uri.appUri("plugin://urnMap-plugin/:engine/process-instance"))
-      .success(function(data) {
-        $scope.UrnDataMap = data;
-      });
- 
-    //enable saveRow button
-    $scope.enableButton=function(urnData)
-    {
-       	document.getElementById("btn_" + urnData.urnname + "_key").disabled = false;
-    };
-    
-    $scope.enableAddRowBtn=function()
-    {
-     	if(document.getElementById("new_key").value.trim().length >0)
-    		 document.getElementById("addRow_BTN").disabled = false;
-    	else
-    		document.getElementById("addRow_BTN").disabled = true;
-    };
-    
-    
-    $scope.addNewRow = function() 
-    {
-    	var newKey = document.getElementById("new_key").value.trim();
-    	var newValue = document.getElementById("new_value").value.trim();
-    	var x;
-    	
-    	for (var i=0;i<$scope.UrnDataMap.length;i++)
-    	{
-     		var n = $scope.UrnDataMap[i].urnname.localeCompare(newKey);
-     		if(n == 0){
-    			x = "match";
-    		}
-    	}
-    	
-     	if(Boolean(x))
-    	{
-    		alert("URN Name already exists, please check the KEY!");
-    	}
-    	else
-    	{
-    		if(newKey.length >0 )
-    		{
-
-    			var temp = newKey + "|" + newValue;
-              	
-          		$http.put(Uri.appUri("plugin://urnMap-plugin/:engine/process-instance"), temp);
-         
-                document.getElementById("new_key").value = "";
-                document.getElementById("new_value").value = "";
-
-    		}
-    		
-     	}
-     	//this.enableAddRowBtn;
-     	document.getElementById("addRow_BTN").disabled = true;
-     	
-     $http.get(Uri.appUri("plugin://urnMap-plugin/:engine/process-instance"))
-        .success(function(data) {
-          $scope.UrnDataMap = data;
-        });
-        
-        
-      }
-    
-    $scope.retrieveData = function() {
-    	
-    	 $http.get(Uri.appUri("plugin://urnMap-plugin/:engine/process-instance"))
-         .success(function(data) {
-           $scope.UrnDataMap = data;
-         });
-    }
-    
-     $scope.SaveRow = function(user) 
-    {  	
-        $http.post(Uri.appUri("plugin://urnMap-plugin/:engine/process-instance"), user);
-                   
-      	document.getElementById("btn_" + user.urnname + "_key").disabled = true;
-        document.getElementById(user.urnname + "_status").style.display = "";
-        this.enableAddRowBtn;
-        
-        $http.get(Uri.appUri("plugin://urnMap-plugin/:engine/process-instance"))
-        .success(function(data) {
-          $scope.UrnDataMap = data;
-        });
-        
-        };
-  }];
-
-  var Configuration = ['ViewsProvider', function(ViewsProvider) {
-
-    ViewsProvider.registerDefaultView('cockpit.dashboard', {
-      id: 'process-definitions',
-      label: 'Deployed Processes',
-      url: 'plugin://urnMap-plugin/static/app/dashboard.html',
-      controller: DashboardController,
-       // make sure we have a higher priority than the default plugin
-      priority: 12
-    });
-  }];
-//START
-//END
-  
-  var ngModule = angular.module('cockpit.plugin.urnMap-plugin', []);
-
-  ngModule.config(Configuration);
-
-  return ngModule;
-});
diff --git a/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/info.txt b/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/info.txt
deleted file mode 100644
index 09b62620e6..0000000000
--- a/bpmn/MSOURN-plugin/src/main/resources/plugin-webapp/urnMap-plugin/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Client side assets of the urnMap-plugin
-\ No newline at end of file
diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index b878467e72..a83e85f148 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -31,11 +31,9 @@
 
   <modules>
     <module>MSOCoreBPMN</module>
-    <!--<module>MSOMockServer</module> -->
     <module>MSORESTClient</module>
     <module>MSOCommonBPMN</module>
     <module>MSOInfrastructureBPMN</module>
-    <module>MSOURN-plugin</module>
     <module>MSOCockpit</module>
   </modules>